| Index: chrome/chrome_browser.gypi
|
| ===================================================================
|
| --- chrome/chrome_browser.gypi (revision 124627)
|
| +++ chrome/chrome_browser.gypi (working copy)
|
| @@ -2993,6 +2993,7 @@
|
| 'browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm',
|
| 'browser/ui/cocoa/omnibox/omnibox_view_mac.h',
|
| 'browser/ui/cocoa/omnibox/omnibox_view_mac.mm',
|
| + 'browser/ui/cocoa/one_click_signin_dialog_mac.mm',
|
| 'browser/ui/cocoa/page_info_bubble_controller.h',
|
| 'browser/ui/cocoa/page_info_bubble_controller.mm',
|
| 'browser/ui/cocoa/presentation_mode_controller.h',
|
| @@ -3305,6 +3306,7 @@
|
| 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h',
|
| 'browser/ui/gtk/omnibox/omnibox_view_gtk.cc',
|
| 'browser/ui/gtk/omnibox/omnibox_view_gtk.h',
|
| + 'browser/ui/gtk/one_click_signin_dialog_gtk.cc',
|
| 'browser/ui/gtk/overflow_button.cc',
|
| 'browser/ui/gtk/overflow_button.h',
|
| 'browser/ui/gtk/page_info_bubble_gtk.cc',
|
| @@ -3468,6 +3470,11 @@
|
| 'browser/ui/status_bubble.h',
|
| 'browser/ui/sync/browser_synced_window_delegate.h',
|
| 'browser/ui/sync/browser_synced_window_delegate.cc',
|
| + 'browser/ui/sync/one_click_signin_dialog.h',
|
| + 'browser/ui/sync/one_click_signin_helper.cc',
|
| + 'browser/ui/sync/one_click_signin_helper.h',
|
| + 'browser/ui/sync/one_click_signin_sync_starter.cc',
|
| + 'browser/ui/sync/one_click_signin_sync_starter.h',
|
| 'browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc',
|
| 'browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h',
|
| 'browser/ui/tab_contents/core_tab_helper.cc',
|
| @@ -3789,6 +3796,7 @@
|
| 'browser/ui/views/omnibox/omnibox_view_views.h',
|
| 'browser/ui/views/omnibox/omnibox_view_win.cc',
|
| 'browser/ui/views/omnibox/omnibox_view_win.h',
|
| + 'browser/ui/views/one_click_signin_dialog_views.cc',
|
| 'browser/ui/views/page_info_bubble_view.cc',
|
| 'browser/ui/views/page_info_bubble_view.h',
|
| 'browser/ui/views/reload_button.cc',
|
| @@ -4493,6 +4501,12 @@
|
| 'browser/printing/print_dialog_gtk.h',
|
| 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
|
| 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
|
| + 'browser/ui/sync/one_click_signin_dialog.h',
|
| + 'browser/ui/sync/one_click_signin_helper.cc',
|
| + 'browser/ui/sync/one_click_signin_helper.h',
|
| + 'browser/ui/sync/one_click_signin_sync_starter.cc',
|
| + 'browser/ui/sync/one_click_signin_sync_starter.h',
|
| + 'browser/ui/views/one_click_signin_dialog_views.cc',
|
| 'browser/ui/webui/help/version_updater_unimplemented.cc',
|
| 'browser/ui/webui/help/version_updater_unimplemented.h',
|
| 'browser/upgrade_detector_impl.cc',
|
| @@ -4738,7 +4752,14 @@
|
| 'sources!': [
|
| 'browser/bookmarks/bookmark_context_menu_controller.cc',
|
| 'browser/jankometer.cc',
|
| + 'browser/signin/one_click_signin.cc',
|
| + 'browser/signin/one_click_signin.h',
|
| 'browser/ui/sad_tab_observer.cc',
|
| + 'browser/ui/sync/one_click_signin_dialog.h',
|
| + 'browser/ui/sync/one_click_signin_helper.cc',
|
| + 'browser/ui/sync/one_click_signin_helper.h',
|
| + 'browser/ui/sync/one_click_signin_sync_starter.cc',
|
| + 'browser/ui/sync/one_click_signin_sync_starter.h',
|
| 'browser/ui/webui/certificate_viewer_webui.cc',
|
| 'browser/ui/window_sizer.cc',
|
| 'browser/ui/window_sizer.h',
|
| @@ -4948,6 +4969,12 @@
|
| 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc',
|
| 'browser/ui/webui/tab_modal_confirm_dialog_webui.h',
|
| ],
|
| + # For now, only the windows platform has the one-click signin
|
| + # dialog fully implemented, so this is enabled here. Eventually
|
| + # this needs to be enabled on mac and linux too.
|
| + 'defines': [
|
| + 'ENABLE_ONE_CLICK_SIGNIN',
|
| + ],
|
| 'conditions': [
|
| ['win_use_allocator_shim==1', {
|
| 'dependencies': [
|
|
|