Merge lp:~brandonsnider/chromium-browser/chromium-browser.beta.daily into lp:~chromium-daily/chromium-browser/chromium-browser.beta.daily

Proposed by Brandon Snider on 2011-12-15
Status: Needs review
Proposed branch: lp:~brandonsnider/chromium-browser/chromium-browser.beta.daily
Merge into: lp:~chromium-daily/chromium-browser/chromium-browser.beta.daily
Diff against target: 49 lines (+8/-17)
1 file modified
debian/patches/chromium_useragent.patch.in (+8/-17)
To merge this branch: bzr merge lp:~brandonsnider/chromium-browser/chromium-browser.beta.daily
Reviewer Review Type Date Requested Status
Chromium Builds 2011-12-15 Pending
Review via email: mp+85770@code.launchpad.net

Description of the change

fixed chromium-useragent.patch.in

To post a comment you must log in.
Jes Slow (cluelesscoder) wrote :

This seems a bit stale. Can it be closed?

Unmerged revisions

533. By Brandon Snider on 2011-12-14

fixed chromium-useragent.patch.in

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/chromium_useragent.patch.in'
2--- debian/patches/chromium_useragent.patch.in 2011-08-11 19:22:20 +0000
3+++ debian/patches/chromium_useragent.patch.in 2011-12-15 00:40:29 +0000
4@@ -6,28 +6,24 @@
5 ===================================================================
6 --- src.orig/webkit/glue/user_agent.cc
7 +++ src/webkit/glue/user_agent.cc
8-@@ -127,25 +127,32 @@
9- #endif
10-
11- std::string user_agent;
12-
13- // Replace Safari's Version/X string with the product name/version passed in.
14+@@ -129,16 +129,23 @@ std::string BuildUserAgentFromProduct(co
15+
16 // This is done to expose our product name in a manner that is maximally
17 // compatible with Safari, we hope!!
18-
19 + // We want to also add Chromium
20-+ std::string realproduct = product.c_str();
21-+ size_t pos;
22-+ if ((pos = realproduct.find("/")) != std::string::npos)
23-+ realproduct.replace(0, pos, "Chromium");
24 +
25++std::string realproduct = product.c_str();
26++size_t pos;
27++if ((pos = realproduct.find("/")) != std::string::npos)
28++ realproduct.replace(0, pos, "Chromium");
29+
30 // Derived from Safari's UA string.
31 base::StringAppendF(
32 &user_agent,
33 "Mozilla/5.0 (%s%s) AppleWebKit/%d.%d"
34 - " (KHTML, like Gecko) %s Safari/%d.%d",
35 + " (KHTML, like Gecko) @BUILD_DIST_NAME@/@BUILD_DIST_VERSION@ %s %s Safari/%d.%d",
36- mimic_windows ? "Windows " : kUserAgentPlatform,
37+ kUserAgentPlatform,
38 webkit_glue::BuildOSCpuInfo().c_str(),
39 WEBKIT_VERSION_MAJOR,
40 WEBKIT_VERSION_MINOR,
41@@ -35,8 +31,3 @@
42 product.c_str(),
43 WEBKIT_VERSION_MAJOR,
44 WEBKIT_VERSION_MINOR);
45- return user_agent;
46- }
47-
48- } // namespace webkit_glue
49-

Subscribers

People subscribed via source and target branches

to all changes: