chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.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: Moved methods from ContentBrowserClient to WebContentsDelegate; all caps constant names. Created 3 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

« chrome/browser/content_settings/mixed_content_settings.cc ('K') | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | content/browser/frame_host/mixed_content_navigation_throttle.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index 4d611575aec8e05273e034689a2c637d71d2ff10..1ac14e0e9b03b38c2e854b3b8d4135606eb066c0 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -16,6 +16,8 @@

#include "chrome/browser/content_settings/chrome_content_settings_utils.h"

#include "chrome/browser/content_settings/cookie_settings_factory.h"

#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

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

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

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

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

@@ -1049,6 +1051,12 @@ void ContentSettingMixedScriptBubbleModel::OnCustomLinkClicked() {

if (!web_contents())

return;

+ MixedContentSettings* mixed_content_settings =

+ MixedContentSettings::FromWebContents(web_contents());

+ if (mixed_content_settings) {

+ mixed_content_settings->AllowRunningOfInsecureContent();

+ }

web_contents()->SendToAllFrames(

new ChromeViewMsg_SetAllowRunningInsecureContent(MSG_ROUTING_NONE, true));

web_contents()->GetMainFrame()->Send(new ChromeViewMsg_ReloadFrame(