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

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

Issue 1134733004: Remove LOAD_SUB_FRAME load flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to atwilson's comments Created 5 years, 7 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 | « components/policy/core/browser/url_blacklist_manager.cc ('k') | net/base/load_flags_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d758f687987af444c94f1ed25d29cfbd25fc31d5..2db03fa722ed5fe14d6d3e05fa770f6b6635df46 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1888,11 +1888,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
int load_flags = info.begin_params.load_flags;
load_flags |= net::LOAD_VERIFY_EV_CERT;
- if (info.is_main_frame) {
+ if (info.is_main_frame)
load_flags |= net::LOAD_MAIN_FRAME;
- } else {
- load_flags |= net::LOAD_SUB_FRAME;
- }
// Add a flag to selectively bypass the data reduction proxy if the resource
// type is not an image.
load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY;
@@ -2318,8 +2315,6 @@ int ResourceDispatcherHostImpl::BuildLoadFlagsForRequest(
load_flags |= net::LOAD_VERIFY_EV_CERT;
if (request_data.resource_type == RESOURCE_TYPE_MAIN_FRAME) {
load_flags |= net::LOAD_MAIN_FRAME;
- } else if (request_data.resource_type == RESOURCE_TYPE_SUB_FRAME) {
- load_flags |= net::LOAD_SUB_FRAME;
} else if (request_data.resource_type == RESOURCE_TYPE_PREFETCH) {
load_flags |= net::LOAD_PREFETCH;
}
« no previous file with comments | « components/policy/core/browser/url_blacklist_manager.cc ('k') | net/base/load_flags_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698