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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 7919028: Revert 101581 - Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/hung_renderer_dialog.cc ('k') | chrome/common/chrome_switches.h » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 2801 matching lines...) Expand 10 before | Expand all | Expand 10 after
2812 'browser/ui/gtk/browser_window_gtk.h', 2812 'browser/ui/gtk/browser_window_gtk.h',
2813 'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc', 2813 'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc',
2814 'browser/ui/gtk/bubble/bubble_accelerators_gtk.h', 2814 'browser/ui/gtk/bubble/bubble_accelerators_gtk.h',
2815 'browser/ui/gtk/bubble/bubble_gtk.cc', 2815 'browser/ui/gtk/bubble/bubble_gtk.cc',
2816 'browser/ui/gtk/bubble/bubble_gtk.h', 2816 'browser/ui/gtk/bubble/bubble_gtk.h',
2817 'browser/ui/gtk/cairo_cached_surface.cc', 2817 'browser/ui/gtk/cairo_cached_surface.cc',
2818 'browser/ui/gtk/cairo_cached_surface.h', 2818 'browser/ui/gtk/cairo_cached_surface.h',
2819 'browser/ui/gtk/certificate_dialogs.cc', 2819 'browser/ui/gtk/certificate_dialogs.cc',
2820 'browser/ui/gtk/certificate_dialogs.h', 2820 'browser/ui/gtk/certificate_dialogs.h',
2821 'browser/ui/gtk/certificate_viewer.cc', 2821 'browser/ui/gtk/certificate_viewer.cc',
2822 'browser/ui/gtk/certificate_viewer.h',
2822 'browser/ui/gtk/chrome_gtk_frame.cc', 2823 'browser/ui/gtk/chrome_gtk_frame.cc',
2823 'browser/ui/gtk/chrome_gtk_frame.h', 2824 'browser/ui/gtk/chrome_gtk_frame.h',
2824 'browser/ui/gtk/collected_cookies_gtk.cc', 2825 'browser/ui/gtk/collected_cookies_gtk.cc',
2825 'browser/ui/gtk/collected_cookies_gtk.h', 2826 'browser/ui/gtk/collected_cookies_gtk.h',
2826 'browser/ui/gtk/constrained_html_delegate_gtk.cc', 2827 'browser/ui/gtk/constrained_html_delegate_gtk.cc',
2827 'browser/ui/gtk/constrained_window_gtk.cc', 2828 'browser/ui/gtk/constrained_window_gtk.cc',
2828 'browser/ui/gtk/constrained_window_gtk.h', 2829 'browser/ui/gtk/constrained_window_gtk.h',
2829 'browser/ui/gtk/content_setting_bubble_gtk.cc', 2830 'browser/ui/gtk/content_setting_bubble_gtk.cc',
2830 'browser/ui/gtk/content_setting_bubble_gtk.h', 2831 'browser/ui/gtk/content_setting_bubble_gtk.h',
2831 'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc', 2832 'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
4105 ['exclude', '^browser/ui/views/task_manager_view.h'], 4106 ['exclude', '^browser/ui/views/task_manager_view.h'],
4106 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'], 4107 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
4107 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'], 4108 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
4108 ['include', '^browser/ui/views/simple_message_box_views.cc'], 4109 ['include', '^browser/ui/views/simple_message_box_views.cc'],
4109 ['include', '^browser/ui/views/simple_message_box_views.h'], 4110 ['include', '^browser/ui/views/simple_message_box_views.h'],
4110 ], 4111 ],
4111 'dependencies': [ 4112 'dependencies': [
4112 '../ui/aura/aura.gyp:aura', 4113 '../ui/aura/aura.gyp:aura',
4113 ], 4114 ],
4114 }], 4115 }],
4115 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have 4116 ['webui_dialogs == 1', {
4116 # native certificate viewers). 4117 'defines': [
4117 ['os_posix == 0 or OS == "mac"', { 4118 'WEBUI_DIALOGS',
4119 ],
4120 }],
4121 # Exclude WebUI certificate viewer if not POSIX, mac (these OS's have
4122 # native certificate viewers) or WebUI dialogs are disabled.
4123 ['webui_dialogs == 0 or os_posix == 0 or OS == "mac"', {
4118 'sources/': [ 4124 'sources/': [
4119 ['exclude', '^browser/ui/webui/certificate_viewer.cc'], 4125 ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
4120 ['exclude', '^browser/ui/webui/certificate_viewer.h'], 4126 ['exclude', '^browser/ui/webui/certificate_viewer.h'],
4121 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], 4127 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
4122 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'], 4128 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
4123 ], 4129 ],
4124 }], 4130 }],
4131 # Exclude other WebUI dialogs if WebUI dialogs are disabled.
4132 ['webui_dialogs == 0', {
4133 'sources/': [
4134 ['exclude', '^browser/ui/webui/hung_renderer_dialog.cc'],
4135 ['exclude', '^browser/ui/webui/hung_renderer_dialog.h'],
4136 ['exclude', '^browser/ui/webui/hung_renderer_dialog_ui.cc'],
4137 ['exclude', '^browser/ui/webui/hung_renderer_dialog_ui.h'],
4138 ],
4139 }],
4140 ['webui_dialogs == 1', {
4141 'sources/': [
4142 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
4143 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
4144 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
4145 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.h'],
4146 ],
4147 }],
4125 ['toolkit_uses_gtk == 1', { 4148 ['toolkit_uses_gtk == 1', {
4126 'dependencies': [ 4149 'dependencies': [
4127 '../build/linux/system.gyp:dbus', 4150 '../build/linux/system.gyp:dbus',
4128 '../build/linux/system.gyp:gconf', 4151 '../build/linux/system.gyp:gconf',
4129 '../build/linux/system.gyp:gtk', 4152 '../build/linux/system.gyp:gtk',
4130 '../build/linux/system.gyp:gtkprint', 4153 '../build/linux/system.gyp:gtkprint',
4131 '../build/linux/system.gyp:ssl', 4154 '../build/linux/system.gyp:ssl',
4132 '../build/linux/system.gyp:x11', 4155 '../build/linux/system.gyp:x11',
4133 '../dbus/dbus.gyp:dbus', 4156 '../dbus/dbus.gyp:dbus',
4134 '../third_party/undoview/undoview.gyp:undoview', 4157 '../third_party/undoview/undoview.gyp:undoview',
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
4439 ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'], 4462 ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'],
4440 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'], 4463 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'],
4441 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'], 4464 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'],
4442 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'], 4465 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'],
4443 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'], 4466 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'],
4444 ['include', '^browser/ui/gtk/cairo_cached_surface.cc'], 4467 ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
4445 ['include', '^browser/ui/gtk/cairo_cached_surface.h'], 4468 ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
4446 ['include', '^browser/ui/gtk/certificate_dialogs.cc'], 4469 ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
4447 ['include', '^browser/ui/gtk/certificate_dialogs.h'], 4470 ['include', '^browser/ui/gtk/certificate_dialogs.h'],
4448 ['include', '^browser/ui/gtk/certificate_viewer.cc'], 4471 ['include', '^browser/ui/gtk/certificate_viewer.cc'],
4472 ['include', '^browser/ui/gtk/certificate_viewer.h'],
4449 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'], 4473 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
4450 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'], 4474 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
4451 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'], 4475 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
4452 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'], 4476 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'],
4453 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'], 4477 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
4454 ['include', '^browser/ui/gtk/constrained_window_gtk.h'], 4478 ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
4455 ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'], 4479 ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'],
4456 ['include', '^browser/ui/gtk/download/download_started_animation _gtk.cc'], 4480 ['include', '^browser/ui/gtk/download/download_started_animation _gtk.cc'],
4457 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'], 4481 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
4458 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'], 4482 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
4751 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], 4775 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
4752 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], 4776 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
4753 ['exclude', '^browser/ui/browser_list_gtk.cc'], 4777 ['exclude', '^browser/ui/browser_list_gtk.cc'],
4754 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] , 4778 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] ,
4755 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'], 4779 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
4756 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'], 4780 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
4757 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'], 4781 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
4758 ['exclude', '^browser/ui/panels/panel_mouse_watcher_gtk.cc'], 4782 ['exclude', '^browser/ui/panels/panel_mouse_watcher_gtk.cc'],
4759 ], 4783 ],
4760 }], 4784 }],
4785 # Exclude the GTK versions of dialogs if webui_dialogs are enabled.
4786 ['webui_dialogs==1', {
4787 'sources/': [
4788 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
4789 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
4790 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
4791 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc.h'],
4792 ],
4793 }],
4761 # Exclude these toolkit_views specific files again. 4794 # Exclude these toolkit_views specific files again.
4762 # (Required because of the '^browser/extensions/' include above) 4795 # (Required because of the '^browser/extensions/' include above)
4763 ['toolkit_views==0', { 4796 ['toolkit_views==0', {
4764 'sources/': [ 4797 'sources/': [
4765 ['exclude', '^browser/extensions/extension_input_api.cc'], 4798 ['exclude', '^browser/extensions/extension_input_api.cc'],
4766 ['exclude', '^browser/extensions/extension_input_api.h'], 4799 ['exclude', '^browser/extensions/extension_input_api.h'],
4767 ['exclude', '^browser/extensions/key_identifier_conversion_views .cc'], 4800 ['exclude', '^browser/extensions/key_identifier_conversion_views .cc'],
4768 ['exclude', '^browser/extensions/key_identifier_conversion_views .h'], 4801 ['exclude', '^browser/extensions/key_identifier_conversion_views .h'],
4769 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.h'], 4802 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.h'],
4770 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.cc'], 4803 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.cc'],
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
5063 # weak imports in dependents, who still must #include 5096 # weak imports in dependents, who still must #include
5064 # closure_blocks_leopard_compat.h to get weak imports. 5097 # closure_blocks_leopard_compat.h to get weak imports.
5065 'type': 'none', 5098 'type': 'none',
5066 }], 5099 }],
5067 ], 5100 ],
5068 }, 5101 },
5069 ], 5102 ],
5070 }], 5103 }],
5071 ], 5104 ],
5072 } 5105 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/hung_renderer_dialog.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698