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

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

Issue 2625633002: Supporting changes in preparation of browser side mixed content checking. (Closed)
Patch Set: Address code review comments. 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 | « content/browser/DEPS ('k') | content/browser/frame_host/navigation_handle_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..cc02ac49f8100c4b8a1824ffa382c0ca0f3158db 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/WebMixedContentContextType.h"
#include "url/gurl.h"
struct FrameHostMsg_DidCommitProvisionalLoad_Params;
@@ -155,6 +156,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 +227,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 +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::WebMixedContentContextType mixed_content_context_type_;
+
// This callback will be run when all throttle checks have been performed.
ThrottleChecksFinishedCallback complete_callback_;
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/frame_host/navigation_handle_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698