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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 841163002: MacViews: Fix duplicate ShowSessionCrashBubble and ShowProfileResetBubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keybinding
Patch Set: Created 5 years, 11 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 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 'browser/ui/search_engines/edit_search_engine_controller.h', 831 'browser/ui/search_engines/edit_search_engine_controller.h',
832 'browser/ui/search_engines/keyword_editor_controller.cc', 832 'browser/ui/search_engines/keyword_editor_controller.cc',
833 'browser/ui/search_engines/keyword_editor_controller.h', 833 'browser/ui/search_engines/keyword_editor_controller.h',
834 'browser/ui/search_engines/search_engine_tab_helper.cc', 834 'browser/ui/search_engines/search_engine_tab_helper.cc',
835 'browser/ui/search_engines/search_engine_tab_helper.h', 835 'browser/ui/search_engines/search_engine_tab_helper.h',
836 'browser/ui/search_engines/template_url_table_model.cc', 836 'browser/ui/search_engines/template_url_table_model.cc',
837 'browser/ui/search_engines/template_url_table_model.h', 837 'browser/ui/search_engines/template_url_table_model.h',
838 'browser/ui/settings_window_manager.cc', 838 'browser/ui/settings_window_manager.cc',
839 'browser/ui/settings_window_manager.h', 839 'browser/ui/settings_window_manager.h',
840 'browser/ui/settings_window_manager_observer.h', 840 'browser/ui/settings_window_manager_observer.h',
841 'browser/ui/profile_reset_bubble.h',
842 'browser/ui/simple_message_box.h', 841 'browser/ui/simple_message_box.h',
843 'browser/ui/status_bubble.h', 842 'browser/ui/status_bubble.h',
844 'browser/ui/sync/inline_login_dialog.cc', 843 'browser/ui/sync/inline_login_dialog.cc',
845 'browser/ui/sync/inline_login_dialog.h', 844 'browser/ui/sync/inline_login_dialog.h',
846 'browser/ui/sync/profile_signin_confirmation_helper.cc', 845 'browser/ui/sync/profile_signin_confirmation_helper.cc',
847 'browser/ui/sync/profile_signin_confirmation_helper.h', 846 'browser/ui/sync/profile_signin_confirmation_helper.h',
848 'browser/ui/sync/tab_contents_synced_tab_delegate.cc', 847 'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
849 'browser/ui/sync/tab_contents_synced_tab_delegate.h', 848 'browser/ui/sync/tab_contents_synced_tab_delegate.h',
850 'browser/ui/tab_contents/chrome_web_contents_view_delegate.h', 849 'browser/ui/tab_contents/chrome_web_contents_view_delegate.h',
851 'browser/ui/tab_contents/core_tab_helper.cc', 850 'browser/ui/tab_contents/core_tab_helper.cc',
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 'browser/ui/views/link_disambiguation/link_disambiguation_popup.h', 1293 'browser/ui/views/link_disambiguation/link_disambiguation_popup.h',
1295 'browser/ui/webui/gesture_config_ui.cc', 1294 'browser/ui/webui/gesture_config_ui.cc',
1296 'browser/ui/webui/gesture_config_ui.h', 1295 'browser/ui/webui/gesture_config_ui.h',
1297 'browser/ui/window_sizer/window_sizer_aura.cc', 1296 'browser/ui/window_sizer/window_sizer_aura.cc',
1298 ], 1297 ],
1299 # Aura but not ChromeOS. 1298 # Aura but not ChromeOS.
1300 'chrome_browser_ui_aura_non_chromeos': [ 1299 'chrome_browser_ui_aura_non_chromeos': [
1301 'browser/ui/aura/active_desktop_monitor.cc', 1300 'browser/ui/aura/active_desktop_monitor.cc',
1302 'browser/ui/aura/active_desktop_monitor.h', 1301 'browser/ui/aura/active_desktop_monitor.h',
1303 ], 1302 ],
1304 'chrome_browser_ui_non_aura_sources': [
1305 'browser/ui/profile_reset_bubble_stub.cc',
1306 ],
1307 # ChromeOS-only sources that don't end in _chromeos or live in a chromeos 1303 # ChromeOS-only sources that don't end in _chromeos or live in a chromeos
1308 # directory. 1304 # directory.
1309 'chrome_browser_ui_chromeos_sources': [ 1305 'chrome_browser_ui_chromeos_sources': [
1310 # On chromeos, file manager extension handles the file open/save dialog. 1306 # On chromeos, file manager extension handles the file open/save dialog.
1311 'browser/ui/views/select_file_dialog_extension.cc', 1307 'browser/ui/views/select_file_dialog_extension.cc',
1312 'browser/ui/views/select_file_dialog_extension.h', 1308 'browser/ui/views/select_file_dialog_extension.h',
1313 'browser/ui/views/select_file_dialog_extension_factory.cc', 1309 'browser/ui/views/select_file_dialog_extension_factory.cc',
1314 'browser/ui/views/select_file_dialog_extension_factory.h', 1310 'browser/ui/views/select_file_dialog_extension_factory.h',
1315 ], 1311 ],
1316 # Used everwhere but ChromeOS. 1312 # Used everwhere but ChromeOS.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 'chrome_browser_ui_linux_sources': [ 1354 'chrome_browser_ui_linux_sources': [
1359 'browser/ui/startup/autolaunch_prompt.cc', 1355 'browser/ui/startup/autolaunch_prompt.cc',
1360 'browser/ui/views/apps/chrome_apps_client_views.cc', 1356 'browser/ui/views/apps/chrome_apps_client_views.cc',
1361 'browser/ui/views/apps/keyboard_hook_handler.cc', 1357 'browser/ui/views/apps/keyboard_hook_handler.cc',
1362 'browser/ui/webui/certificate_viewer_ui.cc', 1358 'browser/ui/webui/certificate_viewer_ui.cc',
1363 'browser/ui/webui/certificate_viewer_ui.h', 1359 'browser/ui/webui/certificate_viewer_ui.h',
1364 'browser/ui/webui/certificate_viewer_webui.cc', 1360 'browser/ui/webui/certificate_viewer_webui.cc',
1365 'browser/ui/webui/certificate_viewer_webui.h', 1361 'browser/ui/webui/certificate_viewer_webui.h',
1366 ], 1362 ],
1367 'chrome_browser_ui_mac_sources': [ 1363 'chrome_browser_ui_mac_sources': [
1368 'browser/ui/startup/session_crashed_bubble.cc',
1369 'browser/ui/startup/autolaunch_prompt.cc', 1364 'browser/ui/startup/autolaunch_prompt.cc',
1370 'browser/ui/web_contents_sizer.mm', 1365 'browser/ui/web_contents_sizer.mm',
1371 ], 1366 ],
1372 'chrome_browser_ui_non_mac_sources': [ 1367 'chrome_browser_ui_non_mac_sources': [
1373 'browser/ui/web_contents_sizer.cc', 1368 'browser/ui/web_contents_sizer.cc',
1374 ], 1369 ],
1375 'chrome_browser_ui_non_mobile_sources': [ 1370 'chrome_browser_ui_non_mobile_sources': [
1376 'browser/ui/apps/app_info_dialog.h', 1371 'browser/ui/apps/app_info_dialog.h',
1377 'browser/ui/apps/apps_metro_handler_win.cc', 1372 'browser/ui/apps/apps_metro_handler_win.cc',
1378 'browser/ui/apps/apps_metro_handler_win.h', 1373 'browser/ui/apps/apps_metro_handler_win.h',
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 'browser/ui/startup/autolaunch_prompt.h', 1527 'browser/ui/startup/autolaunch_prompt.h',
1533 'browser/ui/startup/autolaunch_prompt_win.cc', 1528 'browser/ui/startup/autolaunch_prompt_win.cc',
1534 'browser/ui/startup/bad_flags_prompt.cc', 1529 'browser/ui/startup/bad_flags_prompt.cc',
1535 'browser/ui/startup/bad_flags_prompt.h', 1530 'browser/ui/startup/bad_flags_prompt.h',
1536 'browser/ui/startup/default_browser_prompt.h', 1531 'browser/ui/startup/default_browser_prompt.h',
1537 'browser/ui/startup/default_browser_prompt_win.cc', 1532 'browser/ui/startup/default_browser_prompt_win.cc',
1538 'browser/ui/startup/google_api_keys_infobar_delegate.cc', 1533 'browser/ui/startup/google_api_keys_infobar_delegate.cc',
1539 'browser/ui/startup/google_api_keys_infobar_delegate.h', 1534 'browser/ui/startup/google_api_keys_infobar_delegate.h',
1540 'browser/ui/startup/obsolete_system_infobar_delegate.cc', 1535 'browser/ui/startup/obsolete_system_infobar_delegate.cc',
1541 'browser/ui/startup/obsolete_system_infobar_delegate.h', 1536 'browser/ui/startup/obsolete_system_infobar_delegate.h',
1542 'browser/ui/startup/session_crashed_bubble.h',
1543 'browser/ui/startup/session_crashed_infobar_delegate.cc', 1537 'browser/ui/startup/session_crashed_infobar_delegate.cc',
1544 'browser/ui/startup/session_crashed_infobar_delegate.h', 1538 'browser/ui/startup/session_crashed_infobar_delegate.h',
1545 'browser/ui/startup/startup_browser_creator.cc', 1539 'browser/ui/startup/startup_browser_creator.cc',
1546 'browser/ui/startup/startup_browser_creator.h', 1540 'browser/ui/startup/startup_browser_creator.h',
1547 'browser/ui/startup/startup_browser_creator_impl.cc', 1541 'browser/ui/startup/startup_browser_creator_impl.cc',
1548 'browser/ui/startup/startup_browser_creator_impl.h', 1542 'browser/ui/startup/startup_browser_creator_impl.h',
1549 'browser/ui/startup/startup_tab.cc', 1543 'browser/ui/startup/startup_tab.cc',
1550 'browser/ui/startup/startup_tab.h', 1544 'browser/ui/startup/startup_tab.h',
1551 'browser/ui/startup/startup_types.h', 1545 'browser/ui/startup/startup_types.h',
1552 'browser/ui/sync/browser_synced_window_delegate.cc', 1546 'browser/ui/sync/browser_synced_window_delegate.cc',
(...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after
2952 '../ui/aura/aura.gyp:aura', 2946 '../ui/aura/aura.gyp:aura',
2953 '../ui/keyboard/keyboard.gyp:keyboard', 2947 '../ui/keyboard/keyboard.gyp:keyboard',
2954 '../ui/keyboard/keyboard.gyp:keyboard_resources', 2948 '../ui/keyboard/keyboard.gyp:keyboard_resources',
2955 '../ui/wm/wm.gyp:wm', 2949 '../ui/wm/wm.gyp:wm',
2956 ], 2950 ],
2957 'conditions': [ 2951 'conditions': [
2958 ['chromeos == 0', { 2952 ['chromeos == 0', {
2959 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ], 2953 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ],
2960 }], 2954 }],
2961 ], 2955 ],
2962 }, { # else: use_aura==0
2963 'sources': [ '<@(chrome_browser_ui_non_aura_sources)' ],
2964 }], 2956 }],
2965 ['ui_compositor_image_transport==1', { 2957 ['ui_compositor_image_transport==1', {
2966 'dependencies': [ 2958 'dependencies': [
2967 '../ui/gl/gl.gyp:gl', 2959 '../ui/gl/gl.gyp:gl',
2968 ], 2960 ],
2969 }], 2961 }],
2970 ['use_nss==1', { 2962 ['use_nss==1', {
2971 'sources': [ '<@(chrome_browser_ui_nss_sources)' ], 2963 'sources': [ '<@(chrome_browser_ui_nss_sources)' ],
2972 }], 2964 }],
2973 ['enable_themes==0', { 2965 ['enable_themes==0', {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
3189 ], 3181 ],
3190 'sources': [ 3182 'sources': [
3191 '<@(chrome_browser_ui_non_mobile_sources)', 3183 '<@(chrome_browser_ui_non_mobile_sources)',
3192 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3184 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3193 ], 3185 ],
3194 }], 3186 }],
3195 ], 3187 ],
3196 }, 3188 },
3197 ], 3189 ],
3198 } 3190 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/session_crashed_bubble_view.cc ('k') | chrome/test/base/test_browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698