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

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

Issue 1163963002: Implement SecurityHandler to send the lock icon status to DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make SecurityHandler a WebContentsObserver itself and rebase onto stub CL. Created 5 years, 6 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 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 c3e2ec9c556dab330b1a0c9ef6ed2ed4f95dd76e..03d10d35c6a23f404a00444ce272064fbebeddfe 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -17,6 +17,7 @@
#include "content/browser/devtools/protocol/network_handler.h"
#include "content/browser/devtools/protocol/page_handler.h"
#include "content/browser/devtools/protocol/power_handler.h"
+#include "content/browser/devtools/protocol/security_handler.h"
#include "content/browser/devtools/protocol/service_worker_handler.h"
#include "content/browser/devtools/protocol/tracing_handler.h"
#include "content/browser/frame_host/render_frame_host_impl.h"
@@ -293,8 +294,8 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
input_handler_(new devtools::input::InputHandler()),
inspector_handler_(new devtools::inspector::InspectorHandler()),
network_handler_(new devtools::network::NetworkHandler()),
- page_handler_(nullptr),
estark 2015/06/09 05:18:55 Why did this get deleted? Mistake?
lgarron 2015/06/09 18:16:57 This was deleted in an intervening ToT commit, whi
power_handler_(new devtools::power::PowerHandler()),
+ security_handler_(new devtools::security::SecurityHandler()),
service_worker_handler_(
new devtools::service_worker::ServiceWorkerHandler()),
tracing_handler_(new devtools::tracing::TracingHandler(
@@ -311,6 +312,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
dispatcher->SetInspectorHandler(inspector_handler_.get());
dispatcher->SetNetworkHandler(network_handler_.get());
dispatcher->SetPowerHandler(power_handler_.get());
+ dispatcher->SetSecurityHandler(security_handler_.get());
dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
dispatcher->SetTracingHandler(tracing_handler_.get());
@@ -604,6 +606,8 @@ void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
if (page_handler_)
page_handler_->SetRenderFrameHost(host);
service_worker_handler_->SetRenderFrameHost(host);
+ if (security_handler_)
+ security_handler_->SetRenderFrameHost(host);
}
void RenderFrameDevToolsAgentHost::DisconnectWebContents() {

Powered by Google App Engine
This is Rietveld 408576698