diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 19:57:09 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 19:57:09 +0000 |
| commit | c7cd952c87bc265b7d7e93a499baeb8651d6bad1 (patch) | |
| tree | 3fff0b64006042d2d25d8fe97fd96cd3059d6785 /webkit/glue/webkit_glue.cc | |
| parent | 6b2ea29a5c2f790c6032f98f920cec97d795ece0 (diff) | |
| download | chromium_src-c7cd952c87bc265b7d7e93a499baeb8651d6bad1.zip chromium_src-c7cd952c87bc265b7d7e93a499baeb8651d6bad1.tar.gz chromium_src-c7cd952c87bc265b7d7e93a499baeb8651d6bad1.tar.bz2 | |
linux: wrap UA check in OS_LINUX
Otherwise we'd have a weird double-Windows UA string on Windows.
BUG=11136
Review URL: http://codereview.chromium.org/391078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 0a7d31d..80f001b 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -498,7 +498,9 @@ const std::string& GetUserAgent(const GURL& url) { if (g_user_agent->mimic_chrome1_user_agent.empty()) BuildUserAgent(true, false, &g_user_agent->mimic_chrome1_user_agent); return g_user_agent->mimic_chrome1_user_agent; - } else if (MatchPattern(url.host(), "*.mail.yahoo.com")) { + } +#if defined(OS_LINUX) + else if (MatchPattern(url.host(), "*.mail.yahoo.com")) { // mail.yahoo.com is ok with Windows Chrome but not Linux Chrome. // http://bugs.chromium.org/11136 // TODO(evanm): remove this if Yahoo fixes their sniffing. @@ -506,6 +508,7 @@ const std::string& GetUserAgent(const GURL& url) { BuildUserAgent(false, true, &g_user_agent->mimic_windows_user_agent); return g_user_agent->mimic_windows_user_agent; } +#endif } return g_user_agent->user_agent; } |