| Index: chrome/chrome_browser.gypi
|
| ===================================================================
|
| --- chrome/chrome_browser.gypi (revision 124588)
|
| +++ chrome/chrome_browser.gypi (working copy)
|
| @@ -2307,6 +2307,8 @@
|
| 'browser/shell_integration_linux.cc',
|
| 'browser/shell_integration_mac.mm',
|
| 'browser/shell_integration_win.cc',
|
| + 'browser/signin/one_click_signin.cc',
|
| + 'browser/signin/one_click_signin.h',
|
| 'browser/signin/signin_manager.cc',
|
| 'browser/signin/signin_manager.h',
|
| 'browser/signin/signin_manager_factory.cc',
|
| @@ -2999,6 +3001,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',
|
| @@ -3311,6 +3314,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',
|
| @@ -3393,6 +3397,7 @@
|
| 'browser/ui/omnibox/location_bar_util.h',
|
| 'browser/ui/omnibox/omnibox_view.cc',
|
| 'browser/ui/omnibox/omnibox_view.h',
|
| + 'browser/ui/one_click_signin_dialog.h',
|
| 'browser/ui/options/options_util.cc',
|
| 'browser/ui/options/options_util.h',
|
| 'browser/ui/page_info_bubble.h',
|
| @@ -3795,6 +3800,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',
|
| @@ -4497,8 +4503,12 @@
|
| 'browser/platform_util_linux.cc',
|
| 'browser/printing/print_dialog_gtk.cc',
|
| 'browser/printing/print_dialog_gtk.h',
|
| + 'browser/signin/one_click_signin.cc',
|
| + 'browser/signin/one_click_signin.h',
|
| 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
|
| 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
|
| + 'browser/ui/one_click_signin_dialog.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',
|
| @@ -4746,6 +4756,9 @@
|
| '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/one_click_signin_dialog.h',
|
| 'browser/ui/sad_tab_observer.cc',
|
| 'browser/ui/webui/certificate_viewer_webui.cc',
|
| 'browser/ui/window_sizer.cc',
|
| @@ -4956,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': [
|
|
|