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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1550233002: Move mixed content settings histograms into browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo fix Created 4 years, 11 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/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1834494ead535676362949f0cf7c26ba5d421c80..2814b11335cd58815cf446c683d41b001daa3cf0 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -501,6 +501,10 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole)
IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach)
IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_TriedDisplayingInsecureContent,
+ OnTriedDisplayingInsecureContent)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_TriedRunningInsecureContent,
+ OnTriedRunningInsecureContent)
IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoad,
OnDidStartProvisionalLoad)
IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError,
@@ -823,6 +827,16 @@ void RenderFrameHostImpl::OnFrameFocused() {
frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance());
}
+void RenderFrameHostImpl::OnTriedDisplayingInsecureContent(const GURL& origin,
+ const GURL& url) {
+ delegate_->TriedDisplayingInsecureContent(this, origin, url);
+}
+
+void RenderFrameHostImpl::OnTriedRunningInsecureContent(const GURL& origin,
+ const GURL& url) {
+ delegate_->TriedRunningInsecureContent(this, origin, url);
+}
+
void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) {
if (params.is_history_navigation_in_new_child) {
DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries());

Powered by Google App Engine
This is Rietveld 408576698