chrome/browser/chromeos/login/signin/merge_session_throttle.cc - 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/chromeos/login/signin/merge_session_throttle.cc

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/chromeos/login/signin/merge_session_throttle.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc

index e92ff9967ff7644b92e36205a8ed03271bcb49b6..259e84bddeb2149107e9be5fbdf594378aa49809 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc

@@ -34,6 +34,7 @@

using content::BrowserThread;

using content::RenderViewHost;

+using content::ResourceType;

using content::WebContents;

namespace {