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

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: Rebase. 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 'browser/ui/search_engines/edit_search_engine_controller.h', 857 'browser/ui/search_engines/edit_search_engine_controller.h',
858 'browser/ui/search_engines/keyword_editor_controller.cc', 858 'browser/ui/search_engines/keyword_editor_controller.cc',
859 'browser/ui/search_engines/keyword_editor_controller.h', 859 'browser/ui/search_engines/keyword_editor_controller.h',
860 'browser/ui/search_engines/search_engine_tab_helper.cc', 860 'browser/ui/search_engines/search_engine_tab_helper.cc',
861 'browser/ui/search_engines/search_engine_tab_helper.h', 861 'browser/ui/search_engines/search_engine_tab_helper.h',
862 'browser/ui/search_engines/template_url_table_model.cc', 862 'browser/ui/search_engines/template_url_table_model.cc',
863 'browser/ui/search_engines/template_url_table_model.h', 863 'browser/ui/search_engines/template_url_table_model.h',
864 'browser/ui/settings_window_manager.cc', 864 'browser/ui/settings_window_manager.cc',
865 'browser/ui/settings_window_manager.h', 865 'browser/ui/settings_window_manager.h',
866 'browser/ui/settings_window_manager_observer.h', 866 'browser/ui/settings_window_manager_observer.h',
867 'browser/ui/profile_reset_bubble.h',
867 'browser/ui/simple_message_box.h', 868 'browser/ui/simple_message_box.h',
868 'browser/ui/status_bubble.h', 869 'browser/ui/status_bubble.h',
869 'browser/ui/sync/inline_login_dialog.cc', 870 'browser/ui/sync/inline_login_dialog.cc',
870 'browser/ui/sync/inline_login_dialog.h', 871 'browser/ui/sync/inline_login_dialog.h',
871 'browser/ui/sync/one_click_signin_sync_observer.cc', 872 'browser/ui/sync/one_click_signin_sync_observer.cc',
872 'browser/ui/sync/one_click_signin_sync_observer.h', 873 'browser/ui/sync/one_click_signin_sync_observer.h',
873 'browser/ui/sync/profile_signin_confirmation_helper.cc', 874 'browser/ui/sync/profile_signin_confirmation_helper.cc',
874 'browser/ui/sync/profile_signin_confirmation_helper.h', 875 'browser/ui/sync/profile_signin_confirmation_helper.h',
875 'browser/ui/sync/signin_histogram.h', 876 'browser/ui/sync/signin_histogram.h',
876 'browser/ui/sync/sync_promo_ui.cc', 877 'browser/ui/sync/sync_promo_ui.cc',
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2168 'browser/ui/views/profiles/avatar_label.cc', 2169 'browser/ui/views/profiles/avatar_label.cc',
2169 'browser/ui/views/profiles/avatar_label.h', 2170 'browser/ui/views/profiles/avatar_label.h',
2170 'browser/ui/views/profiles/avatar_menu_bubble_view.cc', 2171 'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
2171 'browser/ui/views/profiles/avatar_menu_bubble_view.h', 2172 'browser/ui/views/profiles/avatar_menu_bubble_view.h',
2172 'browser/ui/views/profiles/avatar_menu_button.cc', 2173 'browser/ui/views/profiles/avatar_menu_button.cc',
2173 'browser/ui/views/profiles/avatar_menu_button.h', 2174 'browser/ui/views/profiles/avatar_menu_button.h',
2174 'browser/ui/views/profiles/new_avatar_button.cc', 2175 'browser/ui/views/profiles/new_avatar_button.cc',
2175 'browser/ui/views/profiles/new_avatar_button.h', 2176 'browser/ui/views/profiles/new_avatar_button.h',
2176 'browser/ui/views/profiles/profile_chooser_view.cc', 2177 'browser/ui/views/profiles/profile_chooser_view.cc',
2177 'browser/ui/views/profiles/profile_chooser_view.h', 2178 'browser/ui/views/profiles/profile_chooser_view.h',
2179 'browser/ui/views/profiles/profile_reset_bubble_view.cc',
2180 'browser/ui/views/profiles/profile_reset_bubble_view.h',
2178 'browser/ui/views/profiles/user_manager_view.cc', 2181 'browser/ui/views/profiles/user_manager_view.cc',
2179 'browser/ui/views/profiles/user_manager_view.h', 2182 'browser/ui/views/profiles/user_manager_view.h',
2180 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' , 2183 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' ,
2181 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h', 2184 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
2182 'browser/ui/views/sad_tab_view.cc', 2185 'browser/ui/views/sad_tab_view.cc',
2183 'browser/ui/views/sad_tab_view.h', 2186 'browser/ui/views/sad_tab_view.h',
2184 'browser/ui/views/session_crashed_bubble_view.cc', 2187 'browser/ui/views/session_crashed_bubble_view.cc',
2185 'browser/ui/views/session_crashed_bubble_view.h', 2188 'browser/ui/views/session_crashed_bubble_view.h',
2186 'browser/ui/views/settings_api_bubble_helper_views.cc', 2189 'browser/ui/views/settings_api_bubble_helper_views.cc',
2187 'browser/ui/views/settings_api_bubble_helper_views.h', 2190 'browser/ui/views/settings_api_bubble_helper_views.h',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
2306 'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc', 2309 'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
2307 'browser/ui/aura/chrome_browser_main_extra_parts_aura.h', 2310 'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
2308 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc', 2311 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
2309 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h', 2312 'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
2310 'browser/ui/gesture_prefs_observer_factory_aura.cc', 2313 'browser/ui/gesture_prefs_observer_factory_aura.cc',
2311 'browser/ui/gesture_prefs_observer_factory_aura.h', 2314 'browser/ui/gesture_prefs_observer_factory_aura.h',
2312 'browser/ui/webui/gesture_config_ui.cc', 2315 'browser/ui/webui/gesture_config_ui.cc',
2313 'browser/ui/webui/gesture_config_ui.h', 2316 'browser/ui/webui/gesture_config_ui.h',
2314 'browser/ui/window_sizer/window_sizer_aura.cc', 2317 'browser/ui/window_sizer/window_sizer_aura.cc',
2315 ], 2318 ],
2319 'chrome_browser_ui_non_aura_sources': [
2320 'browser/ui/profile_reset_bubble_stub.cc',
2321 ],
2316 # Aura but not ChromeOS. 2322 # Aura but not ChromeOS.
2317 'chrome_browser_ui_aura_non_chromeos': [ 2323 'chrome_browser_ui_aura_non_chromeos': [
2318 'browser/ui/aura/active_desktop_monitor.cc', 2324 'browser/ui/aura/active_desktop_monitor.cc',
2319 'browser/ui/aura/active_desktop_monitor.h', 2325 'browser/ui/aura/active_desktop_monitor.h',
2320 ], 2326 ],
2321 # Cross-platform ash sources. 2327 # Cross-platform ash sources.
2322 'chrome_browser_ui_ash_sources': [ 2328 'chrome_browser_ui_ash_sources': [
2323 'browser/ui/ash/accessibility/automation_manager_ash.cc', 2329 'browser/ui/ash/accessibility/automation_manager_ash.cc',
2324 'browser/ui/ash/accessibility/automation_manager_ash.h', 2330 'browser/ui/ash/accessibility/automation_manager_ash.h',
2325 'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc', 2331 'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc',
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 '../ui/aura/aura.gyp:aura', 2765 '../ui/aura/aura.gyp:aura',
2760 '../ui/keyboard/keyboard.gyp:keyboard', 2766 '../ui/keyboard/keyboard.gyp:keyboard',
2761 '../ui/keyboard/keyboard.gyp:keyboard_resources', 2767 '../ui/keyboard/keyboard.gyp:keyboard_resources',
2762 '../ui/wm/wm.gyp:wm', 2768 '../ui/wm/wm.gyp:wm',
2763 ], 2769 ],
2764 'conditions': [ 2770 'conditions': [
2765 ['chromeos == 0', { 2771 ['chromeos == 0', {
2766 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ], 2772 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ],
2767 }], 2773 }],
2768 ], 2774 ],
2775 }, { # else: use_aura==0
2776 'sources': [ '<@(chrome_browser_ui_non_aura_sources)' ],
2769 }], 2777 }],
2770 ['ui_compositor_image_transport==1', { 2778 ['ui_compositor_image_transport==1', {
2771 'dependencies': [ 2779 'dependencies': [
2772 '../ui/gl/gl.gyp:gl', 2780 '../ui/gl/gl.gyp:gl',
2773 ], 2781 ],
2774 }], 2782 }],
2775 ['use_nss==1', { 2783 ['use_nss==1', {
2776 'sources': [ '<@(chrome_browser_ui_nss_sources)' ], 2784 'sources': [ '<@(chrome_browser_ui_nss_sources)' ],
2777 }], 2785 }],
2778 ['enable_themes==0', { 2786 ['enable_themes==0', {
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
2976 }], 2984 }],
2977 ['OS!="android" and OS!="ios"', { 2985 ['OS!="android" and OS!="ios"', {
2978 'dependencies': [ 2986 'dependencies': [
2979 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 2987 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
2980 ], 2988 ],
2981 }], 2989 }],
2982 ], 2990 ],
2983 }, 2991 },
2984 ], 2992 ],
2985 } 2993 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698