content/common/navigation_params.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: content/common/navigation_params.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: MixedContent::ContextType comes from the renderer; lessen Blink public code; fixed build. 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

« content/browser/frame_host/mixed_content_navigation_throttle.cc ('K') | « content/common/navigation_params.h ('k') | content/common/origin_util.cc » ('j') | third_party/WebKit/public/platform/WebMixedContent.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/navigation_params.cc

diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc

index 51220c03b9bc75dbb97da4af9bb69047ec2d23d0..059e266013d07e07d75607b1559fe9fceb4c7516 100644

--- a/content/common/navigation_params.cc

+++ b/content/common/navigation_params.cc

@@ -84,7 +84,9 @@ BeginNavigationParams::BeginNavigationParams()

: load_flags(0),

has_user_gesture(false),

skip_service_worker(false),

- request_context_type(REQUEST_CONTEXT_TYPE_LOCATION) {}

+ request_context_type(REQUEST_CONTEXT_TYPE_LOCATION),

+ mixed_content_context_type(

+ blink::WebMixedContent::ContextType::Blockable) {}

BeginNavigationParams::BeginNavigationParams(

std::string headers,

@@ -92,12 +94,14 @@ BeginNavigationParams::BeginNavigationParams(

bool has_user_gesture,

bool skip_service_worker,

RequestContextType request_context_type,

+ blink::WebMixedContent::ContextType mixed_content_context_type,

const base::Optional<url::Origin>& initiator_origin)

: headers(headers),

load_flags(load_flags),

has_user_gesture(has_user_gesture),

skip_service_worker(skip_service_worker),

request_context_type(request_context_type),

+ mixed_content_context_type(mixed_content_context_type),

initiator_origin(initiator_origin) {}

BeginNavigationParams::BeginNavigationParams(