From 79bd6e8691a7ff0b1d2b66a54cd09c9b874da8f9 Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Mon, 26 Sep 2011 18:30:34 +0000 Subject: Re-land r102336 (remove webkit_glue::BuildUserAgent) w/ fix. Remove webkit_glue::BuildUserAgent(), change the contract in webkit_glue so that SetUserAgent() must be called before GetUserAgent(). This was causing a dependency inversion between webkit_support and its clients, and was needed for the content component build. For content users, calling SetContentClient() will automatically initialize the user agent (retrieved from client->GetUserAgent()). As a bonus, fixing this allowed me to re-test the "mimic_windows" code path and it looks like we no longer need it. R=jam@chromium.org,rsesek@chromium.org BUG=11136, 90442 TEST=visit yahoo! mail using Chromium on Linux, ensure that we don't get an "unsupported browser" warning. Review URL: http://codereview.chromium.org/8045005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102763 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/shell_content_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/shell/shell_content_client.h') diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h index 35b2020..d0644d4 100644 --- a/content/shell/shell_content_client.h +++ b/content/shell/shell_content_client.h @@ -21,7 +21,7 @@ class ShellContentClient : public ContentClient { std::vector* plugins) OVERRIDE; virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) OVERRIDE; virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE; - virtual std::string GetUserAgent(bool mimic_windows) const OVERRIDE; + virtual std::string GetUserAgent(bool* overriding) const OVERRIDE; virtual string16 GetLocalizedString(int message_id) const OVERRIDE; virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE; -- cgit v1.1