Index: content/common/navigation_params.cc |
diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc |
index 51220c03b9bc75dbb97da4af9bb69047ec2d23d0..f879c97baa5c0d342a5120706611adfbbf723fa2 100644 |
--- a/content/common/navigation_params.cc |
+++ b/content/common/navigation_params.cc |
@@ -10,6 +10,7 @@ |
#include "content/public/common/appcache_info.h" |
#include "content/public/common/browser_side_navigation_policy.h" |
#include "content/public/common/url_constants.h" |
+#include "third_party/WebKit/public/platform/WebMixedContentContextType.h" |
#include "url/gurl.h" |
#include "url/url_constants.h" |
@@ -84,7 +85,9 @@ BeginNavigationParams::BeginNavigationParams() |
: load_flags(0), |
has_user_gesture(false), |
skip_service_worker(false), |
- request_context_type(REQUEST_CONTEXT_TYPE_LOCATION) {} |
+ request_context_type(REQUEST_CONTEXT_TYPE_LOCATION), |
+ mixed_content_context_type(blink::WebMixedContentContextType::Blockable) { |
+} |
BeginNavigationParams::BeginNavigationParams( |
std::string headers, |
@@ -92,12 +95,14 @@ BeginNavigationParams::BeginNavigationParams( |
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) |
: headers(headers), |
load_flags(load_flags), |
has_user_gesture(has_user_gesture), |
skip_service_worker(skip_service_worker), |
request_context_type(request_context_type), |
+ mixed_content_context_type(mixed_content_context_type), |
initiator_origin(initiator_origin) {} |
BeginNavigationParams::BeginNavigationParams( |