diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 20:50:22 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 20:50:22 +0000 |
| commit | 6444576f29eba3eb674a7809c00cd9b586ddc575 (patch) | |
| tree | a45bf9577da6b999ad79b2f30bfd17811d83dcf2 /content/shell | |
| parent | 6f03db06811b7bc1ff33427c834a52e29f4e57b8 (diff) | |
| download | chromium_src-6444576f29eba3eb674a7809c00cd9b586ddc575.zip chromium_src-6444576f29eba3eb674a7809c00cd9b586ddc575.tar.gz chromium_src-6444576f29eba3eb674a7809c00cd9b586ddc575.tar.bz2 | |
Revert "Remove webkit_glue::BuildUserAgent(), change the contract in webkit_glue"
TBR=jam@chromium.org
BUG=90442
TEST=none
Review URL: http://codereview.chromium.org/8002003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_content_client.cc | 5 | ||||
| -rw-r--r-- | content/shell/shell_content_client.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc index 5caaef0..644fd98 100644 --- a/content/shell/shell_content_client.cc +++ b/content/shell/shell_content_client.cc @@ -30,9 +30,8 @@ bool ShellContentClient::CanHandleWhileSwappedOut(const IPC::Message& msg) { return false; } -std::string ShellContentClient::GetUserAgent(bool* overriding) const { - *overriding = false; - return std::string("Chrome/15.16.17.18"); +std::string ShellContentClient::GetUserAgent(bool mimic_windows) const { + return webkit_glue::BuildUserAgentHelper(mimic_windows, "Chrome/15.16.17.18"); } string16 ShellContentClient::GetLocalizedString(int message_id) const { diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h index d0644d4..35b2020 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* overriding) const OVERRIDE; + virtual std::string GetUserAgent(bool mimic_windows) const OVERRIDE; virtual string16 GetLocalizedString(int message_id) const OVERRIDE; virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE; |