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..3fac576309de1b705f9d02517e8afa8bd3456187 100644 |
--- a/content/browser/frame_host/navigation_handle_impl.h |
+++ b/content/browser/frame_host/navigation_handle_impl.h |
@@ -26,6 +26,7 @@ |
#include "content/public/browser/navigation_throttle.h" |
#include "content/public/browser/ssl_status.h" |
#include "content/public/common/request_context_type.h" |
+#include "third_party/WebKit/public/platform/WebMixedContent.h" |
#include "url/gurl.h" |
struct FrameHostMsg_DidCommitProvisionalLoad_Params; |
@@ -155,6 +156,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
return request_context_type_; |
} |
+ blink::WebMixedContent::ContextType 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 +227,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
ui::PageTransition transition, |
bool is_external_protocol, |
RequestContextType request_context_type, |
+ blink::WebMixedContent::ContextType mixed_content_context_type, |
const ThrottleChecksFinishedCallback& callback); |
// Called when the URLRequest will be redirected in the network stack. |
@@ -398,6 +405,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::WebMixedContent::ContextType mixed_content_context_type_; |
+ |
// This callback will be run when all throttle checks have been performed. |
ThrottleChecksFinishedCallback complete_callback_; |