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

Side by Side Diff: content/browser/devtools/render_view_devtools_agent_host.cc

Issue 633413002: [DevTools] Move Network domain overrides to NetworkHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 years, 2 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/devtools/render_view_devtools_agent_host.h" 5 #include "content/browser/devtools/render_view_devtools_agent_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 if (!agent_host) 104 if (!agent_host)
105 return; 105 return;
106 agent_host->DisconnectRenderViewHost(); 106 agent_host->DisconnectRenderViewHost();
107 agent_host->ConnectRenderViewHost(current); 107 agent_host->ConnectRenderViewHost(current);
108 } 108 }
109 109
110 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) 110 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
111 : render_view_host_(NULL), 111 : render_view_host_(NULL),
112 dom_handler_(new devtools::dom::DOMHandler()), 112 dom_handler_(new devtools::dom::DOMHandler()),
113 input_handler_(new devtools::input::InputHandler()), 113 input_handler_(new devtools::input::InputHandler()),
114 network_handler_(new devtools::network::NetworkHandler()),
114 page_handler_(new devtools::page::PageHandler()), 115 page_handler_(new devtools::page::PageHandler()),
115 power_handler_(new devtools::power::PowerHandler()), 116 power_handler_(new devtools::power::PowerHandler()),
116 handler_impl_(new DevToolsProtocolHandlerImpl()), 117 handler_impl_(new DevToolsProtocolHandlerImpl()),
117 overrides_handler_(new RendererOverridesHandler()), 118 overrides_handler_(new RendererOverridesHandler()),
118 tracing_handler_( 119 tracing_handler_(
119 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)), 120 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),
120 reattaching_(false) { 121 reattaching_(false) {
121 handler_impl_->SetDOMHandler(dom_handler_.get()); 122 handler_impl_->SetDOMHandler(dom_handler_.get());
122 handler_impl_->SetInputHandler(input_handler_.get()); 123 handler_impl_->SetInputHandler(input_handler_.get());
124 handler_impl_->SetNetworkHandler(network_handler_.get());
123 handler_impl_->SetPageHandler(page_handler_.get()); 125 handler_impl_->SetPageHandler(page_handler_.get());
124 handler_impl_->SetPowerHandler(power_handler_.get()); 126 handler_impl_->SetPowerHandler(power_handler_.get());
125 SetRenderViewHost(rvh); 127 SetRenderViewHost(rvh);
126 DevToolsProtocol::Notifier notifier(base::Bind( 128 DevToolsProtocol::Notifier notifier(base::Bind(
127 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend, 129 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend,
128 base::Unretained(this))); 130 base::Unretained(this)));
129 handler_impl_->SetNotifier(notifier); 131 handler_impl_->SetNotifier(notifier);
130 overrides_handler_->SetNotifier(notifier); 132 overrides_handler_->SetNotifier(notifier);
131 tracing_handler_->SetNotifier(notifier); 133 tracing_handler_->SetNotifier(notifier);
132 g_instances.Get().push_back(this); 134 g_instances.Get().push_back(this);
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 } 372 }
371 373
372 void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) { 374 void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) {
373 DCHECK(!render_view_host_); 375 DCHECK(!render_view_host_);
374 render_view_host_ = static_cast<RenderViewHostImpl*>(rvh); 376 render_view_host_ = static_cast<RenderViewHostImpl*>(rvh);
375 377
376 WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh)); 378 WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh));
377 overrides_handler_->SetRenderViewHost(render_view_host_); 379 overrides_handler_->SetRenderViewHost(render_view_host_);
378 dom_handler_->SetRenderViewHost(render_view_host_); 380 dom_handler_->SetRenderViewHost(render_view_host_);
379 input_handler_->SetRenderViewHost(render_view_host_); 381 input_handler_->SetRenderViewHost(render_view_host_);
382 network_handler_->SetRenderViewHost(render_view_host_);
380 page_handler_->SetRenderViewHost(render_view_host_); 383 page_handler_->SetRenderViewHost(render_view_host_);
381 384
382 registrar_.Add( 385 registrar_.Add(
383 this, 386 this,
384 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, 387 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
385 content::Source<RenderWidgetHost>(render_view_host_)); 388 content::Source<RenderWidgetHost>(render_view_host_));
386 } 389 }
387 390
388 void RenderViewDevToolsAgentHost::ClearRenderViewHost() { 391 void RenderViewDevToolsAgentHost::ClearRenderViewHost() {
389 DCHECK(render_view_host_); 392 DCHECK(render_view_host_);
390 registrar_.Remove( 393 registrar_.Remove(
391 this, 394 this,
392 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, 395 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
393 content::Source<RenderWidgetHost>(render_view_host_)); 396 content::Source<RenderWidgetHost>(render_view_host_));
394 render_view_host_ = nullptr; 397 render_view_host_ = nullptr;
395 overrides_handler_->ClearRenderViewHost(); 398 overrides_handler_->ClearRenderViewHost();
396 dom_handler_->SetRenderViewHost(nullptr); 399 dom_handler_->SetRenderViewHost(nullptr);
397 input_handler_->SetRenderViewHost(nullptr); 400 input_handler_->SetRenderViewHost(nullptr);
401 network_handler_->SetRenderViewHost(nullptr);
398 page_handler_->SetRenderViewHost(nullptr); 402 page_handler_->SetRenderViewHost(nullptr);
399 } 403 }
400 404
401 void RenderViewDevToolsAgentHost::DisconnectWebContents() { 405 void RenderViewDevToolsAgentHost::DisconnectWebContents() {
402 DisconnectRenderViewHost(); 406 DisconnectRenderViewHost();
403 } 407 }
404 408
405 void RenderViewDevToolsAgentHost::ConnectWebContents(WebContents* wc) { 409 void RenderViewDevToolsAgentHost::ConnectWebContents(WebContents* wc) {
406 ConnectRenderViewHost(wc->GetRenderViewHost()); 410 ConnectRenderViewHost(wc->GetRenderViewHost());
407 } 411 }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 } 502 }
499 503
500 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend( 504 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
501 const std::string& message) { 505 const std::string& message) {
502 if (!render_view_host_) 506 if (!render_view_host_)
503 return; 507 return;
504 SendMessageToClient(message); 508 SendMessageToClient(message);
505 } 509 }
506 510
507 } // namespace content 511 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/render_view_devtools_agent_host.h ('k') | content/browser/devtools/renderer_overrides_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698