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

[Brandon Snider]

fixed chromium-useragent.patch.in

[Jes Slow (cluelesscoder)]

This seems a bit stale. Can it be closed?

Unmerged revisions

533. By Brandon Snider on 2011-12-14

fixed chromium-useragent.patch.in

=== 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 00:40:29 +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
-