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

DevToolsHttpHandler::GetFrontendResourceId is removed.

Browse source
This commit is contained in:
Haojian Wu 2015-07-23 15:03:55 +08:00 committed by Cheng Zhao
parent c5ae2926e1
commit dd11ad8db3
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
brightray/browser/devtools_ui.cc
View file

@ -11,11 +11,10 @@
#include "base/memory/ref_counted_memory.h" #include "base/memory/ref_counted_memory.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "content/public/browser/devtools_http_handler.h" #include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/url_data_source.h" #include "content/public/browser/url_data_source.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui.h"
#include "ui/base/resource/resource_bundle.h"
using content::WebContents; using content::WebContents;
@ -64,17 +63,10 @@ class BundledDataSource : public content::URLDataSource {
int render_view_id, int render_view_id,
const GotDataCallback& callback) override { const GotDataCallback& callback) override {
std::string filename = PathWithoutParams(path); std::string filename = PathWithoutParams(path);
base::StringPiece resource =
int resource_id = content::DevToolsFrontendHost::GetFrontendResource(filename);
content::DevToolsHttpHandler::GetFrontendResourceId(filename); scoped_refptr<base::RefCountedStaticMemory> bytes(
new base::RefCountedStaticMemory(resource.data(), resource.length()));
DLOG_IF(WARNING, resource_id == -1)
<< "Unable to find dev tool resource: " << filename
<< ". If you compiled with debug_devtools=1, try running with "
"--debug-devtools.";
const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
scoped_refptr<base::RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes(
resource_id));
callback.Run(bytes.get()); callback.Run(bytes.get());
} }