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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed next set of comments from gab@. Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chrome_browser_ui_non_ios_sources': [ 7 'chrome_browser_ui_non_ios_sources': [
8 'browser/ui/accelerator_utils.h', 8 'browser/ui/accelerator_utils.h',
9 'browser/ui/android/android_about_app_info.cc', 9 'browser/ui/android/android_about_app_info.cc',
10 'browser/ui/android/android_about_app_info.h', 10 'browser/ui/android/android_about_app_info.h',
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 'browser/ui/search_engines/edit_search_engine_controller.h', 863 'browser/ui/search_engines/edit_search_engine_controller.h',
864 'browser/ui/search_engines/keyword_editor_controller.cc', 864 'browser/ui/search_engines/keyword_editor_controller.cc',
865 'browser/ui/search_engines/keyword_editor_controller.h', 865 'browser/ui/search_engines/keyword_editor_controller.h',
866 'browser/ui/search_engines/search_engine_tab_helper.cc', 866 'browser/ui/search_engines/search_engine_tab_helper.cc',
867 'browser/ui/search_engines/search_engine_tab_helper.h', 867 'browser/ui/search_engines/search_engine_tab_helper.h',
868 'browser/ui/search_engines/template_url_table_model.cc', 868 'browser/ui/search_engines/template_url_table_model.cc',
869 'browser/ui/search_engines/template_url_table_model.h', 869 'browser/ui/search_engines/template_url_table_model.h',
870 'browser/ui/settings_window_manager.cc', 870 'browser/ui/settings_window_manager.cc',
871 'browser/ui/settings_window_manager.h', 871 'browser/ui/settings_window_manager.h',
872 'browser/ui/settings_window_manager_observer.h', 872 'browser/ui/settings_window_manager_observer.h',
873 'browser/ui/profile_reset_bubble.h',
873 'browser/ui/simple_message_box.h', 874 'browser/ui/simple_message_box.h',
874 'browser/ui/status_bubble.h', 875 'browser/ui/status_bubble.h',
875 'browser/ui/sync/inline_login_dialog.cc', 876 'browser/ui/sync/inline_login_dialog.cc',
876 'browser/ui/sync/inline_login_dialog.h', 877 'browser/ui/sync/inline_login_dialog.h',
877 'browser/ui/sync/one_click_signin_sync_observer.cc', 878 'browser/ui/sync/one_click_signin_sync_observer.cc',
878 'browser/ui/sync/one_click_signin_sync_observer.h', 879 'browser/ui/sync/one_click_signin_sync_observer.h',
879 'browser/ui/sync/profile_signin_confirmation_helper.cc', 880 'browser/ui/sync/profile_signin_confirmation_helper.cc',
880 'browser/ui/sync/profile_signin_confirmation_helper.h', 881 'browser/ui/sync/profile_signin_confirmation_helper.h',
881 'browser/ui/sync/signin_histogram.h', 882 'browser/ui/sync/signin_histogram.h',
882 'browser/ui/sync/sync_promo_ui.cc', 883 'browser/ui/sync/sync_promo_ui.cc',
(...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
2187 'browser/ui/views/profiles/avatar_label.cc', 2188 'browser/ui/views/profiles/avatar_label.cc',
2188 'browser/ui/views/profiles/avatar_label.h', 2189 'browser/ui/views/profiles/avatar_label.h',
2189 'browser/ui/views/profiles/avatar_menu_bubble_view.cc', 2190 'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
2190 'browser/ui/views/profiles/avatar_menu_bubble_view.h', 2191 'browser/ui/views/profiles/avatar_menu_bubble_view.h',
2191 'browser/ui/views/profiles/avatar_menu_button.cc', 2192 'browser/ui/views/profiles/avatar_menu_button.cc',
2192 'browser/ui/views/profiles/avatar_menu_button.h', 2193 'browser/ui/views/profiles/avatar_menu_button.h',
2193 'browser/ui/views/profiles/new_avatar_button.cc', 2194 'browser/ui/views/profiles/new_avatar_button.cc',
2194 'browser/ui/views/profiles/new_avatar_button.h', 2195 'browser/ui/views/profiles/new_avatar_button.h',
2195 'browser/ui/views/profiles/profile_chooser_view.cc', 2196 'browser/ui/views/profiles/profile_chooser_view.cc',
2196 'browser/ui/views/profiles/profile_chooser_view.h', 2197 'browser/ui/views/profiles/profile_chooser_view.h',
2198 'browser/ui/views/profiles/profile_reset_bubble_view.cc',
2199 'browser/ui/views/profiles/profile_reset_bubble_view.h',
2197 'browser/ui/views/profiles/user_manager_view.cc', 2200 'browser/ui/views/profiles/user_manager_view.cc',
2198 'browser/ui/views/profiles/user_manager_view.h', 2201 'browser/ui/views/profiles/user_manager_view.h',
2199 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' , 2202 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' ,
2200 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h', 2203 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
2201 'browser/ui/views/sad_tab_view.cc', 2204 'browser/ui/views/sad_tab_view.cc',
2202 'browser/ui/views/sad_tab_view.h', 2205 'browser/ui/views/sad_tab_view.h',
2203 'browser/ui/views/session_crashed_bubble_view.cc', 2206 'browser/ui/views/session_crashed_bubble_view.cc',
2204 'browser/ui/views/session_crashed_bubble_view.h', 2207 'browser/ui/views/session_crashed_bubble_view.h',
2205 'browser/ui/views/settings_api_bubble_helper_views.cc', 2208 'browser/ui/views/settings_api_bubble_helper_views.cc',
2206 'browser/ui/views/settings_api_bubble_helper_views.h', 2209 'browser/ui/views/settings_api_bubble_helper_views.h',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
2325 'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc', 2328 'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
2326 'browser/ui/aura/chrome_browser_main_extra_parts_aura.h', 2329 'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
2327 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc', 2330 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
2328 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h', 2331 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
2329 'browser/ui/gesture_prefs_observer_factory_aura.cc', 2332 'browser/ui/gesture_prefs_observer_factory_aura.cc',
2330 'browser/ui/gesture_prefs_observer_factory_aura.h', 2333 'browser/ui/gesture_prefs_observer_factory_aura.h',
2331 'browser/ui/webui/gesture_config_ui.cc', 2334 'browser/ui/webui/gesture_config_ui.cc',
2332 'browser/ui/webui/gesture_config_ui.h', 2335 'browser/ui/webui/gesture_config_ui.h',
2333 'browser/ui/window_sizer/window_sizer_aura.cc', 2336 'browser/ui/window_sizer/window_sizer_aura.cc',
2334 ], 2337 ],
2338 'chrome_browser_ui_non_aura_sources': [
2339 'browser/ui/profile_reset_bubble_stub.cc',
2340 ],
2335 # Aura but not ChromeOS. 2341 # Aura but not ChromeOS.
2336 'chrome_browser_ui_aura_non_chromeos': [ 2342 'chrome_browser_ui_aura_non_chromeos': [
2337 'browser/ui/aura/active_desktop_monitor.cc', 2343 'browser/ui/aura/active_desktop_monitor.cc',
2338 'browser/ui/aura/active_desktop_monitor.h', 2344 'browser/ui/aura/active_desktop_monitor.h',
2339 ], 2345 ],
2340 # Cross-platform ash sources. 2346 # Cross-platform ash sources.
2341 'chrome_browser_ui_ash_sources': [ 2347 'chrome_browser_ui_ash_sources': [
2342 'browser/ui/ash/accessibility/automation_manager_ash.cc', 2348 'browser/ui/ash/accessibility/automation_manager_ash.cc',
2343 'browser/ui/ash/accessibility/automation_manager_ash.h', 2349 'browser/ui/ash/accessibility/automation_manager_ash.h',
2344 'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc', 2350 'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc',
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
2764 '../ui/aura/aura.gyp:aura', 2770 '../ui/aura/aura.gyp:aura',
2765 '../ui/keyboard/keyboard.gyp:keyboard', 2771 '../ui/keyboard/keyboard.gyp:keyboard',
2766 '../ui/keyboard/keyboard.gyp:keyboard_resources', 2772 '../ui/keyboard/keyboard.gyp:keyboard_resources',
2767 '../ui/wm/wm.gyp:wm', 2773 '../ui/wm/wm.gyp:wm',
2768 ], 2774 ],
2769 'conditions': [ 2775 'conditions': [
2770 ['chromeos == 0', { 2776 ['chromeos == 0', {
2771 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ], 2777 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ],
2772 }], 2778 }],
2773 ], 2779 ],
2780 }, { # else: use_aura==0
2781 'sources': [ '<@(chrome_browser_ui_non_aura_sources)' ],
2774 }], 2782 }],
2775 ['ui_compositor_image_transport==1', { 2783 ['ui_compositor_image_transport==1', {
2776 'dependencies': [ 2784 'dependencies': [
2777 '../ui/gl/gl.gyp:gl', 2785 '../ui/gl/gl.gyp:gl',
2778 ], 2786 ],
2779 }], 2787 }],
2780 ['use_nss==1', { 2788 ['use_nss==1', {
2781 'sources': [ '<@(chrome_browser_ui_nss_sources)' ], 2789 'sources': [ '<@(chrome_browser_ui_nss_sources)' ],
2782 }], 2790 }],
2783 ['enable_themes==0', { 2791 ['enable_themes==0', {
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
2981 }], 2989 }],
2982 ['OS!="android" and OS!="ios"', { 2990 ['OS!="android" and OS!="ios"', {
2983 'dependencies': [ 2991 'dependencies': [
2984 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 2992 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
2985 ], 2993 ],
2986 }], 2994 }],
2987 ], 2995 ],
2988 }, 2996 },
2989 ], 2997 ],
2990 } 2998 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698