chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h - Issue 370833002: Move resource_type.* from webkit/ to content/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos fix 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

« no previous file with comments | « chrome/browser/prerender/prerender_util_unittest.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | content/public/common/resource_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h

diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h

index 65bd1f758dca34c90e10cf3a1a4d877c69da1959..f5bccc6631ae1f34da7f9e7a6c2faf1a74f91ef8 100644

--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h

+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h

@@ -43,13 +43,13 @@ class ChromeResourceDispatcherHostDelegate

int route_id,

const std::string& method,

const GURL& url,

- ResourceType::Type resource_type,

+ content::ResourceType::Type resource_type,

content::ResourceContext* resource_context) OVERRIDE;

virtual void RequestBeginning(

net::URLRequest* request,

content::ResourceContext* resource_context,

content::AppCacheService* appcache_service,

- ResourceType::Type resource_type,

+ content::ResourceType::Type resource_type,

int child_id,

int route_id,

ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;

@@ -104,7 +104,7 @@ class ChromeResourceDispatcherHostDelegate

void AppendStandardResourceThrottles(

net::URLRequest* request,

content::ResourceContext* resource_context,

- ResourceType::Type resource_type,

+ content::ResourceType::Type resource_type,

ScopedVector<content::ResourceThrottle>* throttles);

#if defined(ENABLE_ONE_CLICK_SIGNIN)