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

Proposed by Brandon Snider
Status: Merged
Merged at revision: 526
Proposed branch: lp:~brandonsnider/chromium-browser/chromium-browser.beta.daily
Merge into: lp:~chromium-team/chromium-browser/chromium-browser.beta
Diff against target: 68 lines (+10/-19)
2 files modified
debian/changelog (+2/-2)
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 team Pending
Review via email: mp+85777@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-21 19:50:08 +0000
3+++ debian/changelog 2011-12-15 01:53:00 +0000
4@@ -1,4 +1,4 @@
5-chromium-browser (14.0.835.35~r96116-0ubuntu1) UNRELEASED; urgency=low
6+chromium-browser (16.0.912.63~r113337-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Fabien Tassin ]
9 * New upstream release from the Beta channel
10@@ -27,7 +27,7 @@
11 - update debian/rules
12 - update debian/cdbs/tarball.mk
13
14- -- Chris Coulson <chris.coulson@canonical.com> Fri, 21 Oct 2011 20:49:29 +0100
15+ -- Chris Coulson <chrisccoulson@chinstrap.canonical.com> Thu, 08 Dec 2011 08:24:42 +0000
16
17 chromium-browser (13.0.782.215~r97094-0ubuntu1) oneiric; urgency=high
18
19
20=== modified file 'debian/patches/chromium_useragent.patch.in'
21--- debian/patches/chromium_useragent.patch.in 2011-08-11 19:22:20 +0000
22+++ debian/patches/chromium_useragent.patch.in 2011-12-15 01:53:00 +0000
23@@ -6,28 +6,24 @@
24 ===================================================================
25 --- src.orig/webkit/glue/user_agent.cc
26 +++ src/webkit/glue/user_agent.cc
27-@@ -127,25 +127,32 @@
28- #endif
29-
30- std::string user_agent;
31-
32- // Replace Safari's Version/X string with the product name/version passed in.
33+@@ -129,16 +129,23 @@ std::string BuildUserAgentFromProduct(co
34+
35 // This is done to expose our product name in a manner that is maximally
36 // compatible with Safari, we hope!!
37-
38 + // We want to also add Chromium
39-+ std::string realproduct = product.c_str();
40-+ size_t pos;
41-+ if ((pos = realproduct.find("/")) != std::string::npos)
42-+ realproduct.replace(0, pos, "Chromium");
43 +
44++std::string realproduct = product.c_str();
45++size_t pos;
46++if ((pos = realproduct.find("/")) != std::string::npos)
47++ realproduct.replace(0, pos, "Chromium");
48+
49 // Derived from Safari's UA string.
50 base::StringAppendF(
51 &user_agent,
52 "Mozilla/5.0 (%s%s) AppleWebKit/%d.%d"
53 - " (KHTML, like Gecko) %s Safari/%d.%d",
54 + " (KHTML, like Gecko) @BUILD_DIST_NAME@/@BUILD_DIST_VERSION@ %s %s Safari/%d.%d",
55- mimic_windows ? "Windows " : kUserAgentPlatform,
56+ kUserAgentPlatform,
57 webkit_glue::BuildOSCpuInfo().c_str(),
58 WEBKIT_VERSION_MAJOR,
59 WEBKIT_VERSION_MINOR,
60@@ -35,8 +31,3 @@
61 product.c_str(),
62 WEBKIT_VERSION_MAJOR,
63 WEBKIT_VERSION_MINOR);
64- return user_agent;
65- }
66-
67- } // namespace webkit_glue
68-

Subscribers

People subscribed via source and target branches