chrome/browser/infobars/insecure_content_infobar_delegate.cc - Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the 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: chrome/browser/infobars/insecure_content_infobar_delegate.cc

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message

Patch Set: Overall code cleanup to request reviewers to PTAL. Created 4 years, 5 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

« chrome/browser/content_settings/mixed_content_settings.cc ('K') | « chrome/browser/infobars/infobar_service.h ('k') | chrome/browser/metrics/first_web_contents_profiler.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/infobars/insecure_content_infobar_delegate.cc

diff --git a/chrome/browser/infobars/insecure_content_infobar_delegate.cc b/chrome/browser/infobars/insecure_content_infobar_delegate.cc

index 85cc4e02ba83ceb9a2f68ad64bdb72883c5ab08e..16bf9543127b6e433ad6862f6fbe8d62270a831f 100644

--- a/chrome/browser/infobars/insecure_content_infobar_delegate.cc

+++ b/chrome/browser/infobars/insecure_content_infobar_delegate.cc

@@ -8,6 +8,7 @@

#include <utility>

#include "base/metrics/histogram.h"

+#include "chrome/browser/content_settings/mixed_content_settings.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/common/render_messages.h"

#include "chrome/grit/generated_resources.h"

@@ -94,6 +95,9 @@ bool InsecureContentInfoBarDelegate::Cancel() {

content::WebContents* web_contents =

InfoBarService::WebContentsFromInfoBar(infobar());

+ MixedContentSettings* mixed_content_settings =

+ MixedContentSettings::FromWebContents(web_contents);

+ mixed_content_settings->AllowDisplayingOfInsecureContent();

carlosk 2016/07/18 14:37:13 Does it makes more sense to move this code below t

web_contents->SendToAllFrames(

new ChromeViewMsg_SetAllowDisplayingInsecureContent(

MSG_ROUTING_NONE, true));