content/browser/frame_host/navigation_handle_impl.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/browser/frame_host/navigation_handle_impl.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: Rebase after 3 spin off CLs landed. Created 4 years 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/browser/frame_host/mixed_content_navigation_throttle_unittest.cc ('k') | content/browser/frame_host/render_frame_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_handle_impl.cc

diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc

index 829ab711cf79ad10ed0b0030d9d537cae1c81b7d..4564a719b65f6e01f60c6005ac881d382ae1a49e 100644

--- a/content/browser/frame_host/navigation_handle_impl.cc

+++ b/content/browser/frame_host/navigation_handle_impl.cc

@@ -13,6 +13,7 @@

#include "content/browser/devtools/render_frame_devtools_agent_host.h"

#include "content/browser/frame_host/debug_urls.h"

#include "content/browser/frame_host/frame_tree_node.h"

+#include "content/browser/frame_host/mixed_content_navigation_throttle.h"

#include "content/browser/frame_host/navigator.h"

#include "content/browser/frame_host/navigator_delegate.h"

#include "content/browser/loader/resource_dispatcher_host_impl.h"

@@ -768,6 +769,10 @@ void NavigationHandleImpl::RegisterNavigationThrottles() {

// GetNavigationThrottles is not assigned to throttles_ directly because it

// would overwrite any throttle previously added with

// RegisterThrottleForTesting.

+ if (IsBrowserSideNavigationEnabled()) {

+ throttles_.insert(throttles_.end(),

+ new MixedContentNavigationThrottle(this));

+ }

ScopedVector<NavigationThrottle> throttles_to_register =

GetDelegate()->CreateThrottlesForNavigation(this);

std::unique_ptr<NavigationThrottle> devtools_throttle =