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

Unified Diff: chrome/browser/prerender/prerender_resource_throttle.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: chrome/browser/prerender/prerender_resource_throttle.cc
diff --git a/chrome/browser/prerender/prerender_resource_throttle.cc b/chrome/browser/prerender/prerender_resource_throttle.cc
index d578f4f9a06dc382d62fb53290cee7b99b426c83..70e1aeefcae471fec122a3e321d7fe71cb7ce56b 100644
--- a/chrome/browser/prerender/prerender_resource_throttle.cc
+++ b/chrome/browser/prerender/prerender_resource_throttle.cc
@@ -78,7 +78,7 @@ void PrerenderResourceThrottle::Cancel() {
void PrerenderResourceThrottle::WillStartRequestOnUI(
const base::WeakPtr<PrerenderResourceThrottle>& throttle,
const std::string& method,
- ResourceType::Type resource_type,
+ ResourceType resource_type,
int render_process_id,
int render_frame_id,
const GURL& url) {
@@ -96,7 +96,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI(
ReportUnsupportedPrerenderScheme(url);
cancel = true;
#if defined(OS_ANDROID)
- } else if (resource_type == ResourceType::FAVICON) {
+ } else if (resource_type == content::RESOURCE_TYPE_FAVICON) {
// Delay icon fetching until the contents are getting swapped in
// to conserve network usage in mobile devices.
prerender_contents->AddResourceThrottle(throttle);
@@ -115,7 +115,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI(
void PrerenderResourceThrottle::WillRedirectRequestOnUI(
const base::WeakPtr<PrerenderResourceThrottle>& throttle,
const std::string& follow_only_when_prerender_shown_header,
- ResourceType::Type resource_type,
+ ResourceType resource_type,
bool async,
int render_process_id,
int render_frame_id,
@@ -130,7 +130,7 @@ void PrerenderResourceThrottle::WillRedirectRequestOnUI(
ReportUnsupportedPrerenderScheme(new_url);
cancel = true;
} else if (follow_only_when_prerender_shown_header == "1" &&
- resource_type != ResourceType::MAIN_FRAME) {
+ resource_type != content::RESOURCE_TYPE_MAIN_FRAME) {
// Only defer redirects with the Follow-Only-When-Prerender-Shown
// header. Do not defer redirects on main frame loads.
if (!async) {
« no previous file with comments | « chrome/browser/prerender/prerender_resource_throttle.h ('k') | chrome/browser/prerender/prerender_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698