From cb604026d6f1a7f736e67a8001731e3053672669 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Wed, 4 Apr 2018 15:15:04 +0200 Subject: [PATCH] DevTools: move remote debugging hosted URL to single location. https://chromium-review.googlesource.com/905983 --- brightray/browser/devtools_manager_delegate.cc | 7 +++---- brightray/browser/devtools_manager_delegate.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index cf3566e543..8d36862135 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -84,7 +84,7 @@ std::unique_ptr CreateSocketFactory() { // static void DevToolsManagerDelegate::StartHttpHandler() { content::DevToolsAgentHost::StartRemoteDebuggingServer( - CreateSocketFactory(), std::string(), base::FilePath(), base::FilePath()); + CreateSocketFactory(), base::FilePath(), base::FilePath()); } DevToolsManagerDelegate::DevToolsManagerDelegate() {} @@ -111,9 +111,8 @@ std::string DevToolsManagerDelegate::GetDiscoveryPageHTML() { .as_string(); } -std::string DevToolsManagerDelegate::GetFrontendResource( - const std::string& path) { - return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); +bool DevToolsManagerDelegate::HasBundledFrontendResources() { + return true; } } // namespace brightray diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index 5d75d2b001..80ba8f06e5 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -28,7 +28,7 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate { scoped_refptr CreateNewTarget( const GURL& url) override; std::string GetDiscoveryPageHTML() override; - std::string GetFrontendResource(const std::string& path) override; + bool HasBundledFrontendResources() override; private: DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegate);