| 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 da20a1ee15fb52f76dc45c63fd26058e4f232110..29e4670aa9e4e3872c03aa83a0cce7f296ee4a0a 100644
|
| --- a/content/browser/frame_host/navigation_handle_impl.cc
|
| +++ b/content/browser/frame_host/navigation_handle_impl.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/logging.h"
|
| #include "content/browser/devtools/render_frame_devtools_agent_host.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/service_worker/service_worker_context_wrapper.h"
|
| @@ -270,6 +271,7 @@ NavigationHandleImpl::CallWillStartRequestForTesting(
|
|
|
| WillStartRequest(method, resource_request_body, sanitized_referrer,
|
| has_user_gesture, transition, is_external_protocol,
|
| + REQUEST_CONTEXT_TYPE_LOCATION,
|
| base::Bind(&UpdateThrottleCheckResult, &result));
|
|
|
| // Reset the callback to ensure it will not be called later.
|
| @@ -305,6 +307,7 @@ void NavigationHandleImpl::WillStartRequest(
|
| bool has_user_gesture,
|
| ui::PageTransition transition,
|
| bool is_external_protocol,
|
| + RequestContextType fetch_request_context_type,
|
| const ThrottleChecksFinishedCallback& callback) {
|
| // |method != "POST"| should imply absence of |resource_request_body|.
|
| if (method != "POST" && resource_request_body) {
|
| @@ -320,7 +323,7 @@ void NavigationHandleImpl::WillStartRequest(
|
| has_user_gesture_ = has_user_gesture;
|
| transition_ = transition;
|
| is_external_protocol_ = is_external_protocol;
|
| -
|
| + fetch_request_context_type_ = fetch_request_context_type;
|
| state_ = WILL_SEND_REQUEST;
|
| complete_callback_ = callback;
|
|
|
| @@ -529,6 +532,7 @@ void NavigationHandleImpl::RegisterNavigationThrottles() {
|
| // GetNavigationThrottles is not assigned to throttles_ directly because it
|
| // would overwrite any throttle previously added with
|
| // RegisterThrottleForTesting.
|
| + throttles_.insert(throttles_.end(), new MixedContentNavigationThrottle(this));
|
| ScopedVector<NavigationThrottle> throttles_to_register =
|
| GetContentClient()->browser()->CreateThrottlesForNavigation(this);
|
| if (throttles_to_register.size() > 0) {
|
|
|