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

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

Issue 425653002: content: ResourceType cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 5 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_request_info_impl.cc
diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
index 8db5e3445e8e9b9219e5ceb42a6d615b7a31dc21..0e5778aa170b449712c3a3ae1b40f404f425370d 100644
--- a/content/browser/loader/resource_request_info_impl.cc
+++ b/content/browser/loader/resource_request_info_impl.cc
@@ -23,14 +23,13 @@ const ResourceRequestInfo* ResourceRequestInfo::ForRequest(
}
// static
-void ResourceRequestInfo::AllocateForTesting(
- net::URLRequest* request,
- ResourceType::Type resource_type,
- ResourceContext* context,
- int render_process_id,
- int render_view_id,
- int render_frame_id,
- bool is_async) {
+void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
+ ResourceType resource_type,
+ ResourceContext* context,
+ int render_process_id,
+ int render_view_id,
+ int render_frame_id,
+ bool is_async) {
ResourceRequestInfoImpl* info =
new ResourceRequestInfoImpl(
PROCESS_TYPE_RENDERER, // process_type
@@ -39,7 +38,7 @@ void ResourceRequestInfo::AllocateForTesting(
0, // origin_pid
0, // request_id
render_frame_id, // render_frame_id
- resource_type == ResourceType::MAIN_FRAME, // is_main_frame
+ resource_type == RESOURCE_TYPE_MAIN_FRAME, // is_main_frame
false, // parent_is_main_frame
0, // parent_render_frame_id
resource_type, // resource_type
@@ -96,7 +95,7 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
bool is_main_frame,
bool parent_is_main_frame,
int parent_render_frame_id,
- ResourceType::Type resource_type,
+ ResourceType resource_type,
PageTransition transition_type,
bool should_replace_current_entry,
bool is_download,
@@ -174,7 +173,7 @@ int ResourceRequestInfoImpl::GetParentRenderFrameID() const {
return parent_render_frame_id_;
}
-ResourceType::Type ResourceRequestInfoImpl::GetResourceType() const {
+ResourceType ResourceRequestInfoImpl::GetResourceType() const {
return resource_type_;
}
« no previous file with comments | « content/browser/loader/resource_request_info_impl.h ('k') | content/browser/loader/resource_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698