Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_chromeos.gypi

Issue 12335051: Merge 182894 - 3rd attempt (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/chromeos/merge_session_load.html ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_chromeos.gypi
===================================================================
--- chrome/chrome_browser_chromeos.gypi (revision 184220)
+++ chrome/chrome_browser_chromeos.gypi (working copy)
@@ -414,6 +414,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',
« no previous file with comments | « chrome/browser/resources/chromeos/merge_session_load.html ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698