chrome/browser/ui/tab_helpers.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/tab_helpers.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: Minor changes to code and commenst Created 3 years, 10 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 | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/renderer/content_settings_observer.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/tab_helpers.cc

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

index 03e625b4016a256047c8673a5d48898280994306..e3e01517ddb4a59228198bbd412651d39c73ee74 100644

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -11,6 +11,7 @@

#include "build/build_config.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/browser_process.h"

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

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

#include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h"

#include "chrome/browser/engagement/site_engagement_helper.h"

@@ -61,6 +62,7 @@

#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"

#include "components/tracing/common/tracing_switches.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/common/browser_side_navigation_policy.h"

#include "extensions/features/features.h"

#include "printing/features/features.h"

@@ -200,6 +202,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

// TODO(vabr): Remove TabSpecificContentSettings from here once their function

// is taken over by ChromeContentSettingsClient. http://crbug.com/387075

TabSpecificContentSettings::CreateForWebContents(web_contents);

+ if (content::IsBrowserSideNavigationEnabled())

+ MixedContentSettingsTabHelper::CreateForWebContents(web_contents);

// --- Platform-specific tab helpers ---