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

Unified Diff: content/browser/devtools/devtools_frontend_host_impl.cc

Issue 2755973003: DevTools: android shouldn't depend on devtools frontend (Closed)
Patch Set: back out dmitry changes 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/browser/devtools/BUILD.gn ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/devtools/devtools_frontend_host_impl.cc
diff --git a/content/browser/devtools/devtools_frontend_host_impl.cc b/content/browser/devtools/devtools_frontend_host_impl.cc
index 9f8a1b44c68d130b976404c92f1321675b0d4dd0..7795aa5266f1333a4105b1db63518719c09b35cc 100644
--- a/content/browser/devtools/devtools_frontend_host_impl.cc
+++ b/content/browser/devtools/devtools_frontend_host_impl.cc
@@ -7,13 +7,16 @@
#include <stddef.h>
#include "content/browser/bad_message.h"
-#include "content/browser/devtools/grit/devtools_resources_map.h"
#include "content/common/devtools_messages.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_client.h"
+#if !defined(OS_ANDROID)
+#include "content/browser/devtools/grit/devtools_resources_map.h" // nogncheck
chenwilliam 2017/03/16 23:08:13 gn complains when cross-compiling (Linux compiling
dgozman 2017/03/16 23:09:39 That means we should not compile this file on andr
+#endif
+
namespace content {
namespace {
@@ -32,6 +35,7 @@ DevToolsFrontendHost* DevToolsFrontendHost::Create(
}
// static
+#if !defined(OS_ANDROID)
base::StringPiece DevToolsFrontendHost::GetFrontendResource(
const std::string& path) {
for (size_t i = 0; i < kDevtoolsResourcesSize; ++i) {
@@ -42,6 +46,15 @@ base::StringPiece DevToolsFrontendHost::GetFrontendResource(
}
return std::string();
}
+#endif
+
+// static
+#if defined(OS_ANDROID)
+base::StringPiece DevToolsFrontendHost::GetFrontendResource(
+ const std::string& path) {
+ return std::string();
+}
+#endif
DevToolsFrontendHostImpl::DevToolsFrontendHostImpl(
RenderFrameHost* frontend_main_frame,
« no previous file with comments | « content/browser/devtools/BUILD.gn ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698