Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2280)

Unified Diff: content/shell/browser/shell_devtools_delegate.cc

Issue 186883002: Move user_agent code from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm build directory Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_devtools_delegate.cc
diff --git a/content/shell/browser/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc
index fe7f9a93a29b2f6a966a60b1cbced9f09ddec277..01dca2b4024d81386c1dcfa1168cc39651144eba 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);
« no previous file with comments | « content/renderer/pepper/pepper_url_request_unittest.cc ('k') | content/shell/common/shell_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698