Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: content/browser/frame_host/navigation_handle_impl.cc

Issue 2630043002: IGNORE: This will not be landed. Uploaded just to run trybots.
Patch Set: Changed throttle registration order. 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 49028c2804dba1168b2d86e40aefef7a32d92cac..46b290ca649492e0c589d2cf07e9792ce4a02512 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -821,11 +821,6 @@ void NavigationHandleImpl::RegisterNavigationThrottles() {
std::vector<std::unique_ptr<NavigationThrottle>> throttles_to_register =
GetDelegate()->CreateThrottlesForNavigation(this);
- std::unique_ptr<NavigationThrottle> mixed_content_throttle =
- MixedContentNavigationThrottle::CreateThrottleForNavigation(this);
- if (mixed_content_throttle)
- throttles_to_register.push_back(std::move(mixed_content_throttle));
-
std::unique_ptr<NavigationThrottle> devtools_throttle =
RenderFrameDevToolsAgentHost::CreateThrottleForNavigation(this);
if (devtools_throttle)
@@ -841,6 +836,11 @@ void NavigationHandleImpl::RegisterNavigationThrottles() {
if (ancestor_throttle)
throttles_.push_back(std::move(ancestor_throttle));
+ std::unique_ptr<NavigationThrottle> mixed_content_throttle =
+ MixedContentNavigationThrottle::CreateThrottleForNavigation(this);
+ if (mixed_content_throttle)
+ throttles_to_register.push_back(std::move(mixed_content_throttle));
+
throttles_.insert(throttles_.begin(),
std::make_move_iterator(throttles_to_register.begin()),
std::make_move_iterator(throttles_to_register.end()));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698