| 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..18ac9adea5fa532973d897f5b6ef98652c82d3bd 100644
|
| --- a/android_webview/browser/aw_devtools_delegate.cc
|
| +++ b/android_webview/browser/aw_devtools_delegate.cc
|
| @@ -11,13 +11,14 @@
|
| #include "base/values.h"
|
| #include "content/public/browser/android/devtools_auth.h"
|
| #include "content/public/browser/devtools_http_handler.h"
|
| +#include "content/public/browser/devtools_remote_frontend_util.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "net/socket/unix_domain_socket_posix.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| namespace {
|
| -const char kSocketNameFormat[] = "webview_devtools_remote_%d";
|
| +const char kSocketNameFormat[] = "%s_%d";
|
| }
|
|
|
| namespace android_webview {
|
| @@ -26,10 +27,13 @@ AwDevToolsDelegate::AwDevToolsDelegate(content::BrowserContext* browser_context)
|
| : browser_context_(browser_context) {
|
| devtools_http_handler_ = content::DevToolsHttpHandler::Start(
|
| new net::UnixDomainSocketWithAbstractNamespaceFactory(
|
| - base::StringPrintf(kSocketNameFormat, getpid()),
|
| + base::StringPrintf(
|
| + kSocketNameFormat,
|
| + content::GetDevToolsServerSocketName("webview").c_str(),
|
| + getpid()),
|
| "",
|
| base::Bind(&content::CanUserConnectToDevTools)),
|
| - "",
|
| + content::GetDevToolsFrontendMainResourceURL(),
|
| this);
|
| }
|
|
|
| @@ -189,7 +193,7 @@ std::string AwDevToolsDelegate::GetDiscoveryPageHTML() {
|
| }
|
|
|
| bool AwDevToolsDelegate::BundlesFrontendResources() {
|
| - return true;
|
| + return false;
|
| }
|
|
|
| base::FilePath AwDevToolsDelegate::GetDebugFrontendDir() {
|
|
|