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

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

Issue 2767513002: Revert of DevTools: android shouldn't depend on devtools frontend (Closed)
Patch Set: Created 3 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
« no previous file with comments | « content/shell/browser/shell_devtools_frontend.cc ('k') | headless/lib/browser/headless_devtools.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_devtools_manager_delegate.cc
diff --git a/content/shell/browser/shell_devtools_manager_delegate.cc b/content/shell/browser/shell_devtools_manager_delegate.cc
index db7bd746debc2adb5b5a09ace4584d117497e682..ea2549c4fa5dc4105afff5865dcb8f84cf2ba264 100644
--- a/content/shell/browser/shell_devtools_manager_delegate.cc
+++ b/content/shell/browser/shell_devtools_manager_delegate.cc
@@ -20,6 +20,7 @@
#include "build/build_config.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/devtools_socket_factory.h"
#include "content/public/browser/favicon_status.h"
#include "content/public/browser/navigation_entry.h"
@@ -35,10 +36,6 @@
#include "net/log/net_log_source.h"
#include "net/socket/tcp_server_socket.h"
#include "ui/base/resource/resource_bundle.h"
-
-#if !defined(OS_ANDROID)
-#include "content/public/browser/devtools_frontend_host.h"
-#endif
#if defined(OS_ANDROID)
#include "content/public/browser/android/devtools_auth.h"
@@ -207,11 +204,7 @@
std::string ShellDevToolsManagerDelegate::GetFrontendResource(
const std::string& path) {
-#if defined(OS_ANDROID)
- return std::string();
-#else
return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
-#endif
}
} // namespace content
« no previous file with comments | « content/shell/browser/shell_devtools_frontend.cc ('k') | headless/lib/browser/headless_devtools.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698