diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 09:57:25 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 09:57:25 +0000 |
| commit | efd2c3fbfa6413cdf042e5cb088bfe586085ae77 (patch) | |
| tree | 371376c746ac2b28d3b607f6936f4d564d1e4feb /content/shell | |
| parent | 3f656b692188627413e41b49c593664225d758af (diff) | |
| download | chromium_src-efd2c3fbfa6413cdf042e5cb088bfe586085ae77.zip chromium_src-efd2c3fbfa6413cdf042e5cb088bfe586085ae77.tar.gz chromium_src-efd2c3fbfa6413cdf042e5cb088bfe586085ae77.tar.bz2 | |
Move user_agent code from webkit/ to content/.
BUG=265753, 338338, 237249
TEST=content_unittests
R=jam@chromium.org
TBR=darin
Review URL: https://codereview.chromium.org/186883002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/browser/shell_devtools_delegate.cc | 5 | ||||
| -rw-r--r-- | content/shell/common/shell_content_client.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/content/shell/browser/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc index fe7f9a9..01dca2b 100644 --- a/content/shell/browser/shell_devtools_delegate.cc +++ b/content/shell/browser/shell_devtools_delegate.cc @@ -20,11 +20,11 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/public/common/user_agent.h" #include "content/shell/browser/shell.h" #include "grit/shell_resources.h" #include "net/socket/tcp_listen_socket.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/common/user_agent/user_agent_util.h" #if defined(OS_ANDROID) #include "content/public/browser/android/devtools_auth.h" @@ -143,8 +143,7 @@ ShellDevToolsDelegate::ShellDevToolsDelegate(BrowserContext* browser_context) : browser_context_(browser_context) { std::string frontend_url; #if defined(OS_ANDROID) - frontend_url = base::StringPrintf(kFrontEndURL, - webkit_glue::GetWebKitRevision().c_str()); + frontend_url = base::StringPrintf(kFrontEndURL, GetWebKitRevision().c_str()); #endif devtools_http_handler_ = DevToolsHttpHandler::Start(CreateSocketFactory(), frontend_url, this); diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc index 55f62dd..f3bfc52 100644 --- a/content/shell/common/shell_content_client.cc +++ b/content/shell/common/shell_content_client.cc @@ -8,13 +8,13 @@ #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" +#include "content/public/common/user_agent.h" #include "content/shell/common/shell_switches.h" #include "grit/shell_resources.h" #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/common/user_agent/user_agent_util.h" namespace content { @@ -26,7 +26,7 @@ std::string ShellContentClient::GetUserAgent() const { CommandLine* command_line = CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kUseMobileUserAgent)) product += " Mobile"; - return webkit_glue::BuildUserAgentFromProduct(product); + return BuildUserAgentFromProduct(product); } base::string16 ShellContentClient::GetLocalizedString(int message_id) const { |