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

[Brandon Snider]

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-21 19:50:08 +0000
+++ debian/changelog	2011-12-15 01:53:00 +0000
@@ -1,4 +1,4 @@
-chromium-browser (14.0.835.35~r96116-0ubuntu1) UNRELEASED; urgency=low
+chromium-browser (16.0.912.63~r113337-0ubuntu1) UNRELEASED; urgency=low
 
   [ Fabien Tassin ]
   * New upstream release from the Beta channel
@@ -27,7 +27,7 @@
     - update debian/rules
     - update debian/cdbs/tarball.mk
 
- -- Chris Coulson <[e-mail]>  Fri, 21 Oct 2011 20:49:29 +0100
+ -- Chris Coulson <[e-mail]>  Thu, 08 Dec 2011 08:24:42 +0000
 
 chromium-browser (13.0.782.215~r97094-0ubuntu1) oneiric; urgency=high
 
 
=== modified file 'debian/patches/chromium_useragent.patch.in'
--- debian/patches/chromium_useragent.patch.in	2011-08-11 19:22:20 +0000
+++ debian/patches/chromium_useragent.patch.in	2011-12-15 01:53:00 +0000
@@ -6,28 +6,24 @@
 ===================================================================
 --- src.orig/webkit/glue/user_agent.cc
 +++ src/webkit/glue/user_agent.cc
-@@ -127,25 +127,32 @@
- #endif
- 
-   std::string user_agent;
- 
-   // Replace Safari's Version/X string with the product name/version passed in.
+@@ -129,16 +129,23 @@ std::string BuildUserAgentFromProduct(co
+ 
    // This is done to expose our product name in a manner that is maximally
    // compatible with Safari, we hope!!
- 
 +  // We want to also add Chromium
-+  std::string realproduct = product.c_str();
-+  size_t pos;
-+  if ((pos = realproduct.find("/")) != std::string::npos)
-+      realproduct.replace(0, pos, "Chromium");
 +
++std::string realproduct = product.c_str();
++size_t pos;
++if ((pos = realproduct.find("/")) != std::string::npos)
++ realproduct.replace(0, pos, "Chromium");
+ 
    // Derived from Safari's UA string.
    base::StringAppendF(
        &user_agent,
        "Mozilla/5.0 (%s%s) AppleWebKit/%d.%d"
 -      " (KHTML, like Gecko) %s Safari/%d.%d",
 +      " (KHTML, like Gecko) @BUILD_DIST_NAME@/@BUILD_DIST_VERSION@ %s %s Safari/%d.%d",
-       mimic_windows ? "Windows " : kUserAgentPlatform,
+       kUserAgentPlatform,
        webkit_glue::BuildOSCpuInfo().c_str(),
        WEBKIT_VERSION_MAJOR,
        WEBKIT_VERSION_MINOR,
@@ -35,8 +31,3 @@
        product.c_str(),
        WEBKIT_VERSION_MAJOR,
        WEBKIT_VERSION_MINOR);
-   return user_agent;
- }
- 
- }  // namespace webkit_glue
-