chrome/chrome_browser_chromeos.gypi - Issue 11991002: Merge 176800

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/chrome_browser_chromeos.gypi

Issue 11991002: Merge 176800 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 11 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/chrome_browser_chromeos.gypi

===================================================================

--- chrome/chrome_browser_chromeos.gypi (revision 177312)

+++ chrome/chrome_browser_chromeos.gypi (working copy)

@@ -413,10 +413,22 @@

'browser/chromeos/login/network_screen.cc',

'browser/chromeos/login/network_screen.h',

'browser/chromeos/login/network_screen_actor.h',

+ 'browser/chromeos/login/oauth1_login_manager.cc',

+ 'browser/chromeos/login/oauth1_login_manager.h',

+ 'browser/chromeos/login/oauth2_login_manager.cc',

+ 'browser/chromeos/login/oauth2_login_manager.h',

+ 'browser/chromeos/login/oauth_login_manager.cc',

+ 'browser/chromeos/login/oauth_login_manager.h',

+ 'browser/chromeos/login/oauth1_login_verifier.cc',

'browser/chromeos/login/oauth1_token_fetcher.cc',

'browser/chromeos/login/oauth1_token_fetcher.h',

- 'browser/chromeos/login/oauth_login_verifier.cc',

- 'browser/chromeos/login/oauth_login_verifier.h',

+ 'browser/chromeos/login/oauth2_login_verifier.cc',

+ 'browser/chromeos/login/oauth2_login_verifier.h',

+ 'browser/chromeos/login/oauth2_policy_fetcher.cc',

+ 'browser/chromeos/login/oauth2_policy_fetcher.h',

+ 'browser/chromeos/login/oauth2_token_fetcher.cc',

+ 'browser/chromeos/login/oauth2_token_fetcher.h',

'browser/chromeos/login/online_attempt.cc',

'browser/chromeos/login/online_attempt.h',

'browser/chromeos/login/online_attempt_host.cc',

« no previous file with comments | « chrome/browser/signin/token_service.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »