mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #184 from deepak1556/idr_value_patch

Browse source 
fix value of IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE
This commit is contained in:
Cheng Zhao 2015-12-14 18:10:41 +08:00
commit 30cebb491f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
brightray/browser/devtools_manager_delegate.cc
View file

@ -18,6 +18,7 @@
#include "components/devtools_discovery/basic_target_descriptor.h" #include "components/devtools_discovery/basic_target_descriptor.h"
#include "components/devtools_discovery/devtools_discovery_manager.h" #include "components/devtools_discovery/devtools_discovery_manager.h"
#include "components/devtools_http_handler/devtools_http_handler.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_agent_host.h"
#include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/favicon_status.h" #include "content/public/browser/favicon_status.h"
@ -35,11 +36,6 @@ namespace brightray {
namespace { 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;
class TCPServerSocketFactory class TCPServerSocketFactory
: public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory { : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory {
public: public:
@ -113,8 +109,9 @@ DevToolsDelegate::~DevToolsDelegate() {
} }
std::string DevToolsDelegate::GetDiscoveryPageHTML() { std::string DevToolsDelegate::GetDiscoveryPageHTML() {
LOG(WARNING) << IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE;
return ResourceBundle::GetSharedInstance().GetRawDataResource( return ResourceBundle::GetSharedInstance().GetRawDataResource(
kIDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();
} }