From a3f85a93a0480677d547c7ea5f343018ee0fb03a Mon Sep 17 00:00:00 2001 From: Robo Date: Sat, 12 Dec 2015 10:56:47 +0530 Subject: [PATCH 1/2] fix value of IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE --- brightray/browser/devtools_manager_delegate.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index 4e36d204bf..fdd0a0225f 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -38,7 +38,7 @@ namespace { // A hack here: // Copy from grit/shell_resources.h of chromium repository // since libcontentchromium doesn't expose content_shell resources. -const int kIDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE = 25500; +const int kIDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE = 25150; class TCPServerSocketFactory : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory { From d12787303ca114af8f92dd9be05d4839f90c4ebd Mon Sep 17 00:00:00 2001 From: Robo Date: Sat, 12 Dec 2015 23:31:00 +0530 Subject: [PATCH 2/2] use value from shell_resources.h --- brightray/browser/devtools_manager_delegate.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index fdd0a0225f..ca8f1cf2d8 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -18,6 +18,7 @@ #include "components/devtools_discovery/basic_target_descriptor.h" #include "components/devtools_discovery/devtools_discovery_manager.h" #include "components/devtools_http_handler/devtools_http_handler.h" +#include "content/grit/shell_resources.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/favicon_status.h" @@ -35,11 +36,6 @@ namespace brightray { namespace { -// A hack here: -// Copy from grit/shell_resources.h of chromium repository -// since libcontentchromium doesn't expose content_shell resources. -const int kIDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE = 25150; - class TCPServerSocketFactory : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory { public: @@ -113,8 +109,9 @@ DevToolsDelegate::~DevToolsDelegate() { } std::string DevToolsDelegate::GetDiscoveryPageHTML() { + LOG(WARNING) << IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE; return ResourceBundle::GetSharedInstance().GetRawDataResource( - kIDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); + IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); }