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

Unified Diff: android_webview/browser/aw_devtools_delegate.cc

Issue 17389005: [Android] Abandon bundling DevTools frontends for mobile apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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: android_webview/browser/aw_devtools_delegate.cc
diff --git a/android_webview/browser/aw_devtools_delegate.cc b/android_webview/browser/aw_devtools_delegate.cc
index 49a5ff443ab75982c3ef855313bd39e2ac745144..099631de4fc39f07a59be7d57369fdd1349de554 100644
--- a/android_webview/browser/aw_devtools_delegate.cc
+++ b/android_webview/browser/aw_devtools_delegate.cc
@@ -9,7 +9,8 @@
#include "base/json/json_writer.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
-#include "content/public/browser/android/devtools_auth.h"
+#include "components/devtools_remote_frontend/devtools_auth_android.h"
+#include "components/devtools_remote_frontend/devtools_remote_frontend_util.h"
#include "content/public/browser/devtools_http_handler.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
@@ -17,19 +18,23 @@
#include "ui/base/resource/resource_bundle.h"
namespace {
-const char kSocketNameFormat[] = "webview_devtools_remote_%d";
+const char kSocketNameFormat[] = "%s_%d";
}
namespace android_webview {
AwDevToolsDelegate::AwDevToolsDelegate(content::BrowserContext* browser_context)
: browser_context_(browser_context) {
+ const std::string socket_name =
+ devtools_remote_frontend::GetDevToolsServerSocketName("webview");
pfeldman 2013/06/20 12:37:11 This only makes sense for android, just hardcode i
mnaganov (inactive) 2013/06/20 16:48:08 Done.
devtools_http_handler_ = content::DevToolsHttpHandler::Start(
new net::UnixDomainSocketWithAbstractNamespaceFactory(
- base::StringPrintf(kSocketNameFormat, getpid()),
+ base::StringPrintf(kSocketNameFormat,
+ socket_name.c_str(),
+ getpid()),
"",
- base::Bind(&content::CanUserConnectToDevTools)),
- "",
+ base::Bind(&devtools_remote_frontend::CanUserConnectToDevTools)),
+ devtools_remote_frontend::GetDevToolsFrontendMainResourceURL(),
pfeldman 2013/06/20 12:37:11 ditto
mnaganov (inactive) 2013/06/20 16:48:08 Done.
this);
}
@@ -189,7 +194,7 @@ std::string AwDevToolsDelegate::GetDiscoveryPageHTML() {
}
bool AwDevToolsDelegate::BundlesFrontendResources() {
- return true;
+ return false;
}
base::FilePath AwDevToolsDelegate::GetDebugFrontendDir() {

Powered by Google App Engine
This is Rietveld 408576698