Chromium Code Reviews| Index: content/browser/frame_host/navigation_handle_impl.h |
| diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h |
| index 20a159af380b79c8a118d88c4fd31c9f2f599a1d..ca0ccd171e431f3d6e6d5b0e0ca136f25768ba3b 100644 |
| --- a/content/browser/frame_host/navigation_handle_impl.h |
| +++ b/content/browser/frame_host/navigation_handle_impl.h |
| @@ -30,6 +30,9 @@ |
| struct FrameHostMsg_DidCommitProvisionalLoad_Params; |
| +namespace blink { |
|
jam
2017/01/10 07:08:04
nit: curious why you're forward declaring instead
|
| +enum class WebMixedContentContextType; |
| +} |
| namespace content { |
| class AppCacheNavigationHandle; |
| @@ -155,6 +158,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
| return request_context_type_; |
| } |
| + blink::WebMixedContentContextType mixed_content_context_type() const { |
| + DCHECK_GE(state_, WILL_SEND_REQUEST); |
| + return mixed_content_context_type_; |
| + } |
| + |
| // Get the unique id from the NavigationEntry associated with this |
| // NavigationHandle. Note that a synchronous, renderer-initiated navigation |
| // will not have a NavigationEntry associated with it, and this will return 0. |
| @@ -221,6 +229,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
| ui::PageTransition transition, |
| bool is_external_protocol, |
| RequestContextType request_context_type, |
| + blink::WebMixedContentContextType mixed_content_context_type, |
| const ThrottleChecksFinishedCallback& callback); |
| // Called when the URLRequest will be redirected in the network stack. |
| @@ -398,6 +407,9 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
| // The fetch request context type. |
| RequestContextType request_context_type_; |
| + // The mixed content context type for potential mixed content checks. |
| + blink::WebMixedContentContextType mixed_content_context_type_; |
| + |
| // This callback will be run when all throttle checks have been performed. |
| ThrottleChecksFinishedCallback complete_callback_; |