From c7cd952c87bc265b7d7e93a499baeb8651d6bad1 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Mon, 16 Nov 2009 19:57:09 +0000 Subject: 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 --- webkit/glue/webkit_glue.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'webkit/glue') 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; } -- cgit v1.1