chrome/chrome_browser_chromeos.gypi - Issue 12256046: Added interstitial page for merge session.

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 12256046: Added interstitial page for merge session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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

diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi

index 5af5f918f7316fcc64a121cc1ab626c1d74d7b99..e62642fb3ae7434045bf227889fb77c878803c42 100644

--- a/chrome/chrome_browser_chromeos.gypi

+++ b/chrome/chrome_browser_chromeos.gypi

@@ -410,6 +410,10 @@

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

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

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

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

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

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

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

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

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

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