third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp - Issue 1583813003: Remove obsolete histogram values from SSL.InsecureContent

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 1583813003: Remove obsolete histogram values from SSL.InsecureContent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mpearson comment 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

« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/public/web/WebContentSettingsClient.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 a954edf5bf42f080c9da7b9dc9fccdc2685f55f1..ffe5e93dafde63cdbc55cb4acdc360f085acd382 100644

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

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

@@ -264,10 +264,10 @@ bool FrameLoaderClientImpl::allowMedia(const KURL& mediaURL)

return true;

}

-bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* context, const KURL& url)

+bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettings, const KURL& url)

{

if (m_webFrame->contentSettingsClient())

- return m_webFrame->contentSettingsClient()->allowDisplayingInsecureContent(enabledPerSettings, WebSecurityOrigin(context), WebURL(url));

+ return m_webFrame->contentSettingsClient()->allowDisplayingInsecureContent(enabledPerSettings, WebURL(url));

return enabledPerSettings;

}

« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/public/web/WebContentSettingsClient.h » ('j') | no next file with comments »