third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp - Issue 1550233002: Move mixed content settings histograms into browser

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

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

« third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('K') | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/RemoteFrameClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

index caaf4e7f5a13a4bf076989d0a6b3cf23241d3e5c..044ebcc3c0c344e91533e98998ff11e056371a45 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -875,6 +875,18 @@ void FrameLoaderClientImpl::frameFocused() const

m_webFrame->client()->frameFocused();

}

+void FrameLoaderClientImpl::triedDisplayingInsecureContent(SecurityOrigin* origin, const KURL& url) const

+ if (m_webFrame->client())

+ return m_webFrame->client()->triedDisplayingInsecureContent(WebSecurityOrigin(origin), WebURL(url));

+void FrameLoaderClientImpl::triedRunningInsecureContent(SecurityOrigin* origin, const KURL& url) const

+ if (m_webFrame->client())

+ return m_webFrame->client()->triedRunningInsecureContent(WebSecurityOrigin(origin), WebURL(url));

void FrameLoaderClientImpl::didChangeName(const String& name)

{

if (!m_webFrame->client())