Chromium Code Reviews| Index: content/common/navigation_params.h |
| diff --git a/content/common/navigation_params.h b/content/common/navigation_params.h |
| index 86a5e7e4f6fefd42ce29a05c54d744214e80c0c1..f502e54e90032ee42d7980913c3de481ff3c72e8 100644 |
| --- a/content/common/navigation_params.h |
| +++ b/content/common/navigation_params.h |
| @@ -25,6 +25,10 @@ |
| #include "url/gurl.h" |
| #include "url/origin.h" |
| +namespace blink { |
| +enum class WebMixedContentContextType; |
|
jam
2017/01/09 21:15:46
nit: why not just include the header here?
carlosk
2017/01/10 19:13:11
Done. Agreed... Here and in all other places where
|
| +} |
| + |
| namespace content { |
| // The LoFi state which determines whether to add the Lo-Fi header. |
| @@ -144,12 +148,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 +174,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; |