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

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

Issue 2572653003: [DevTools] Migrate security handler to new generator. (Closed)
Patch Set: no protocol changes Created 4 years 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
« no previous file with comments | « content/browser/devtools/render_frame_devtools_agent_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b36ae175ab986fbfaa701752f89648803eda904c..c7693a56efbea27884057ad5358cd491d87b172f 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -395,7 +395,6 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
RenderFrameHostImpl* host)
: DevToolsAgentHostImpl(base::GenerateGUID()),
input_handler_(new devtools::input::InputHandler()),
- security_handler_(nullptr),
service_worker_handler_(
new devtools::service_worker::ServiceWorkerHandler()),
storage_handler_(new devtools::storage::StorageHandler()),
@@ -412,11 +411,6 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
dispatcher->SetStorageHandler(storage_handler_.get());
dispatcher->SetTargetHandler(target_handler_.get());
- if (!host->GetParent()) {
- security_handler_.reset(new devtools::security::SecurityHandler());
- dispatcher->SetSecurityHandler(security_handler_.get());
- }
-
SetPending(host);
CommitPending();
WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host));
@@ -511,6 +505,12 @@ void RenderFrameDevToolsAgentHost::Attach() {
schema_handler_.reset(new protocol::SchemaHandler());
schema_handler_->Wire(session()->dispatcher());
+ if (!frame_tree_node_->parent()) {
+ security_handler_.reset(new protocol::SecurityHandler());
+ security_handler_->Wire(session()->dispatcher());
+ security_handler_->SetRenderFrameHost(handlers_frame_host_);
+ }
+
tracing_handler_.reset(new protocol::TracingHandler(
protocol::TracingHandler::Renderer,
frame_tree_node_->frame_tree_node_id(),
@@ -543,6 +543,10 @@ void RenderFrameDevToolsAgentHost::Detach() {
}
schema_handler_->Disable();
schema_handler_.reset();
+ if (security_handler_) {
+ security_handler_->Disable();
+ security_handler_.reset();
+ }
tracing_handler_->Disable();
tracing_handler_.reset();
« no previous file with comments | « content/browser/devtools/render_frame_devtools_agent_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698