Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 2521153002: [DevTools] Move Inspector domains to new generator. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/render_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index 8975be6473baf109fbe26ae0f6134f63f202d379..60fbd4d60a1d2044c70ce2b17e3e9d8b39604aac 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -397,7 +397,6 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
: DevToolsAgentHostImpl(base::GenerateGUID()),
dom_handler_(new devtools::dom::DOMHandler()),
input_handler_(new devtools::input::InputHandler()),
- inspector_handler_(new devtools::inspector::InspectorHandler()),
network_handler_(new devtools::network::NetworkHandler()),
page_handler_(nullptr),
schema_handler_(new devtools::schema::SchemaHandler()),
@@ -416,7 +415,6 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
dispatcher->SetDOMHandler(dom_handler_.get());
dispatcher->SetInputHandler(input_handler_.get());
- dispatcher->SetInspectorHandler(inspector_handler_.get());
dispatcher->SetNetworkHandler(network_handler_.get());
dispatcher->SetSchemaHandler(schema_handler_.get());
dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
@@ -497,6 +495,10 @@ WebContents* RenderFrameDevToolsAgentHost::GetWebContents() {
void RenderFrameDevToolsAgentHost::Attach() {
session()->dispatcher()->setFallThroughForNotFound(true);
+ inspector_handler_.reset(new protocol::InspectorHandler());
+ inspector_handler_->Wire(session()->dispatcher());
+ inspector_handler_->SetRenderFrameHost(handlers_frame_host_);
+
io_handler_.reset(new protocol::IOHandler(GetIOContext()));
io_handler_->Wire(session()->dispatcher());
@@ -514,6 +516,8 @@ void RenderFrameDevToolsAgentHost::Attach() {
}
void RenderFrameDevToolsAgentHost::Detach() {
+ inspector_handler_->Disable();
+ inspector_handler_.reset();
io_handler_->Disable();
io_handler_.reset();
tracing_handler_->Disable();
@@ -918,7 +922,8 @@ void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
emulation_handler_->SetRenderFrameHost(host);
input_handler_->SetRenderWidgetHost(
host ? host->GetRenderWidgetHost() : nullptr);
- inspector_handler_->SetRenderFrameHost(host);
+ if (inspector_handler_)
+ inspector_handler_->SetRenderFrameHost(host);
network_handler_->SetRenderFrameHost(host);
if (page_handler_)
page_handler_->SetRenderFrameHost(host);
« no previous file with comments | « content/browser/devtools/render_frame_devtools_agent_host.h ('k') | content/browser/devtools/worker_devtools_agent_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698