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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Addressed all jam@ latest 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
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 6cd99e8f9fcebe11be63a288316d1deeefa0859b..b55a69fa23d3df4dccaeff718c8edd333c4e0c7e 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -118,6 +118,7 @@
#include "storage/browser/blob/shareable_file_reference.h"
#include "storage/browser/fileapi/file_permission_policy.h"
#include "storage/browser/fileapi/file_system_context.h"
+#include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
#include "url/third_party/mozilla/url_parse.h"
#include "url/url_constants.h"
@@ -1684,6 +1685,7 @@ ResourceDispatcherHostImpl::CreateResourceHandler(
return AddStandardHandlers(request, request_data.resource_type,
resource_context,
request_data.fetch_request_context_type,
+ request_data.fetch_mixed_content_context_type,
requester_info->appcache_service(), child_id,
route_id, std::move(handler));
}
@@ -1694,6 +1696,7 @@ ResourceDispatcherHostImpl::AddStandardHandlers(
ResourceType resource_type,
ResourceContext* resource_context,
RequestContextType fetch_request_context_type,
+ blink::WebMixedContentContextType fetch_mixed_content_context_type,
AppCacheService* appcache_service,
int child_id,
int route_id,
@@ -1712,7 +1715,8 @@ ResourceDispatcherHostImpl::AddStandardHandlers(
// thread is handled by the NavigationURLloader.
if (!IsBrowserSideNavigationEnabled() && IsResourceTypeFrame(resource_type)) {
throttles.push_back(base::MakeUnique<NavigationResourceThrottle>(
- request, delegate_, fetch_request_context_type));
+ request, delegate_, fetch_request_context_type,
+ fetch_mixed_content_context_type));
}
if (delegate_) {
@@ -2286,6 +2290,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
handler = AddStandardHandlers(
new_request.get(), resource_type, resource_context,
info.begin_params.request_context_type,
+ info.begin_params.mixed_content_context_type,
appcache_handle_core ? appcache_handle_core->GetAppCacheService()
: nullptr,
-1, // child_id

Powered by Google App Engine
This is Rietveld 408576698