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

Unified Diff: content/common/navigation_params.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/common/frame_messages.h ('k') | content/common/navigation_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/navigation_params.h
diff --git a/content/common/navigation_params.h b/content/common/navigation_params.h
index 86a5e7e4f6fefd42ce29a05c54d744214e80c0c1..81e3229c2cc63743a5e30ecc332471e5409f0f91 100644
--- a/content/common/navigation_params.h
+++ b/content/common/navigation_params.h
@@ -21,6 +21,7 @@
#include "content/public/common/referrer.h"
#include "content/public/common/request_context_type.h"
#include "content/public/common/resource_response.h"
+#include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
#include "ui/base/page_transition_types.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -144,12 +145,14 @@ struct CONTENT_EXPORT BeginNavigationParams {
// TODO(clamy): See if it is possible to reuse this in
// ResourceMsg_Request_Params.
BeginNavigationParams();
- BeginNavigationParams(std::string headers,
- int load_flags,
- bool has_user_gesture,
- bool skip_service_worker,
- RequestContextType request_context_type,
- const base::Optional<url::Origin>& initiator_origin);
+ BeginNavigationParams(
+ std::string headers,
+ int load_flags,
+ bool has_user_gesture,
+ bool skip_service_worker,
+ RequestContextType request_context_type,
+ blink::WebMixedContentContextType mixed_content_context_type,
+ const base::Optional<url::Origin>& initiator_origin);
BeginNavigationParams(const BeginNavigationParams& other);
~BeginNavigationParams();
@@ -168,6 +171,9 @@ struct CONTENT_EXPORT BeginNavigationParams {
// Indicates the request context type.
RequestContextType request_context_type;
+ // The mixed content context type for potential mixed content checks.
+ blink::WebMixedContentContextType mixed_content_context_type;
+
// See WebSearchableFormData for a description of these.
GURL searchable_form_url;
std::string searchable_form_encoding;
« no previous file with comments | « content/common/frame_messages.h ('k') | content/common/navigation_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698