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

Cleanup unused headers, data members and functions.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-14 15:36:40 +08:00 • committed by Adam Roben
commit f623ddf7fc
5 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_main_parts.cc
View file

@ -7,8 +7,6 @@
#include "browser/browser_context.h" #include "browser/browser_context.h"
#include "browser/web_ui_controller_factory.h" #include "browser/web_ui_controller_factory.h"
#include "net/socket/tcp_listen_socket.h"
namespace brightray { namespace brightray {
BrowserMainParts::BrowserMainParts() { BrowserMainParts::BrowserMainParts() {

5
brightray/browser/devtools_ui.cc
View file

@ -93,10 +93,9 @@ class BundledDataSource : public content::URLDataSource {
} }
DevToolsUI::DevToolsUI(BrowserContext* browser_context, content::WebUI* web_ui) DevToolsUI::DevToolsUI(BrowserContext* browser_context, content::WebUI* web_ui)
: WebUIController(web_ui), : WebUIController(web_ui) {
browser_context_(browser_context) {
web_ui->SetBindings(0); web_ui->SetBindings(0);
content::URLDataSource::Add(browser_context_, new BundledDataSource()); content::URLDataSource::Add(browser_context, new BundledDataSource());
} }
} }

3
brightray/browser/devtools_ui.h
View file

@ -17,9 +17,6 @@ class DevToolsUI : public content::WebUIController {
explicit DevToolsUI(BrowserContext* browser_context, content::WebUI* web_ui); explicit DevToolsUI(BrowserContext* browser_context, content::WebUI* web_ui);
private: private:
// Weak reference to the browser context.
BrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(DevToolsUI); DISALLOW_COPY_AND_ASSIGN(DevToolsUI);
}; };

10
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -28,10 +28,6 @@ namespace {
const char kChromeUIDevToolsURL[] = "chrome-devtools://devtools/devtools.html"; const char kChromeUIDevToolsURL[] = "chrome-devtools://devtools/devtools.html";
const char kDockSidePref[] = "brightray.devtools.dockside"; const char kDockSidePref[] = "brightray.devtools.dockside";
GURL GetDevToolsURL() {
return GURL(kChromeUIDevToolsURL);
}
} }
// Implemented separately on each platform. // Implemented separately on each platform.
@ -76,7 +72,8 @@ void InspectableWebContentsImpl::ShowDevTools() {
frontend_host_.reset(content::DevToolsClientHost::CreateDevToolsFrontendHost(devtools_web_contents_.get(), this)); frontend_host_.reset(content::DevToolsClientHost::CreateDevToolsFrontendHost(devtools_web_contents_.get(), this));
content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(agent_host_, frontend_host_.get()); content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(agent_host_, frontend_host_.get());
devtools_web_contents_->GetController().LoadURL(GetDevToolsURL(), content::Referrer(), content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); GURL devtools_url(kChromeUIDevToolsURL);
devtools_web_contents_->GetController().LoadURL(devtools_url, content::Referrer(), content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
} }
view_->SetDockSide(dock_side_); view_->SetDockSide(dock_side_);
@ -145,9 +142,6 @@ void InspectableWebContentsImpl::SearchInPath(int request_id, const std::string&
void InspectableWebContentsImpl::InspectedContentsClosing() { void InspectableWebContentsImpl::InspectedContentsClosing() {
} }
void InspectableWebContentsImpl::RenderViewCreated(content::RenderViewHost* render_view_host) {
}
void InspectableWebContentsImpl::AboutToNavigateRenderView(content::RenderViewHost* render_view_host) { void InspectableWebContentsImpl::AboutToNavigateRenderView(content::RenderViewHost* render_view_host) {
content::DevToolsClientHost::SetupDevToolsFrontendClient(web_contents()->GetRenderViewHost()); content::DevToolsClientHost::SetupDevToolsFrontendClient(web_contents()->GetRenderViewHost());
} }

1
brightray/browser/inspectable_web_contents_impl.h
View file

@ -69,7 +69,6 @@ private:
// content::WebContentsObserver // content::WebContentsObserver
virtual void RenderViewCreated(content::RenderViewHost*) OVERRIDE;
virtual void AboutToNavigateRenderView(content::RenderViewHost* render_view_host) OVERRIDE; virtual void AboutToNavigateRenderView(content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DidFinishLoad(int64 frame_id, virtual void DidFinishLoad(int64 frame_id,
const GURL& validated_url, const GURL& validated_url,