chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.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:

Index: chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index c53e0f596f023eaa2962c533907b7cbd3a80caa0..e42664bafe8a06e0e877a3d132c3d2c82b8e8c0c 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -167,7 +167,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

int cert_error,

const net::SSLInfo& ssl_info,

const GURL& request_url,

- ResourceType::Type resource_type,

+ content::ResourceType::Type resource_type,

bool overridable,

bool strict_enforcement,

const base::Callback<void(bool)>& callback,