diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 18:30:34 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 18:30:34 +0000 |
| commit | 79bd6e8691a7ff0b1d2b66a54cd09c9b874da8f9 (patch) | |
| tree | 2c8c644bbe31800f3053156f73fb44cb3ef7a291 /content/shell/shell_content_client.h | |
| parent | 0b91391a2054c836e6710eb19d00342164791a0f (diff) | |
| download | chromium_src-79bd6e8691a7ff0b1d2b66a54cd09c9b874da8f9.zip chromium_src-79bd6e8691a7ff0b1d2b66a54cd09c9b874da8f9.tar.gz chromium_src-79bd6e8691a7ff0b1d2b66a54cd09c9b874da8f9.tar.bz2 | |
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
Diffstat (limited to 'content/shell/shell_content_client.h')
| -rw-r--r-- | content/shell/shell_content_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<PepperPluginInfo>* 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; |