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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 7670041: Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge with trunk and fix hung renderer dialog close. 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
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 2791 matching lines...) Expand 10 before | Expand all | Expand 10 after
2802 'browser/ui/gtk/browser_window_gtk.h', 2802 'browser/ui/gtk/browser_window_gtk.h',
2803 'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc', 2803 'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc',
2804 'browser/ui/gtk/bubble/bubble_accelerators_gtk.h', 2804 'browser/ui/gtk/bubble/bubble_accelerators_gtk.h',
2805 'browser/ui/gtk/bubble/bubble_gtk.cc', 2805 'browser/ui/gtk/bubble/bubble_gtk.cc',
2806 'browser/ui/gtk/bubble/bubble_gtk.h', 2806 'browser/ui/gtk/bubble/bubble_gtk.h',
2807 'browser/ui/gtk/cairo_cached_surface.cc', 2807 'browser/ui/gtk/cairo_cached_surface.cc',
2808 'browser/ui/gtk/cairo_cached_surface.h', 2808 'browser/ui/gtk/cairo_cached_surface.h',
2809 'browser/ui/gtk/certificate_dialogs.cc', 2809 'browser/ui/gtk/certificate_dialogs.cc',
2810 'browser/ui/gtk/certificate_dialogs.h', 2810 'browser/ui/gtk/certificate_dialogs.h',
2811 'browser/ui/gtk/certificate_viewer.cc', 2811 'browser/ui/gtk/certificate_viewer.cc',
2812 'browser/ui/gtk/certificate_viewer.h',
2813 'browser/ui/gtk/chrome_gtk_frame.cc', 2812 'browser/ui/gtk/chrome_gtk_frame.cc',
2814 'browser/ui/gtk/chrome_gtk_frame.h', 2813 'browser/ui/gtk/chrome_gtk_frame.h',
2815 'browser/ui/gtk/collected_cookies_gtk.cc', 2814 'browser/ui/gtk/collected_cookies_gtk.cc',
2816 'browser/ui/gtk/collected_cookies_gtk.h', 2815 'browser/ui/gtk/collected_cookies_gtk.h',
2817 'browser/ui/gtk/constrained_html_delegate_gtk.cc', 2816 'browser/ui/gtk/constrained_html_delegate_gtk.cc',
2818 'browser/ui/gtk/constrained_window_gtk.cc', 2817 'browser/ui/gtk/constrained_window_gtk.cc',
2819 'browser/ui/gtk/constrained_window_gtk.h', 2818 'browser/ui/gtk/constrained_window_gtk.h',
2820 'browser/ui/gtk/content_setting_bubble_gtk.cc', 2819 'browser/ui/gtk/content_setting_bubble_gtk.cc',
2821 'browser/ui/gtk/content_setting_bubble_gtk.h', 2820 'browser/ui/gtk/content_setting_bubble_gtk.h',
2822 'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc', 2821 'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
4065 ['exclude', '^browser/ui/views/task_manager_view.h'], 4064 ['exclude', '^browser/ui/views/task_manager_view.h'],
4066 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'], 4065 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
4067 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'], 4066 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
4068 ['include', '^browser/ui/views/simple_message_box_views.cc'], 4067 ['include', '^browser/ui/views/simple_message_box_views.cc'],
4069 ['include', '^browser/ui/views/simple_message_box_views.h'], 4068 ['include', '^browser/ui/views/simple_message_box_views.h'],
4070 ], 4069 ],
4071 'dependencies': [ 4070 'dependencies': [
4072 '../aura/aura.gyp:aura', 4071 '../aura/aura.gyp:aura',
4073 ], 4072 ],
4074 }], 4073 }],
4075 ['webui_dialogs == 1', { 4074 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
4076 'defines': [ 4075 # native certificate viewers).
4077 'WEBUI_DIALOGS', 4076 ['os_posix == 0 or OS == "mac"', {
4078 ],
4079 }],
4080 # Exclude WebUI certificate viewer if not POSIX, mac (these OS's have
4081 # native certificate viewers) or WebUI dialogs are disabled.
4082 ['webui_dialogs == 0 or os_posix == 0 or OS == "mac"', {
4083 'sources/': [ 4077 'sources/': [
4084 ['exclude', '^browser/ui/webui/certificate_viewer.cc'], 4078 ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
4085 ['exclude', '^browser/ui/webui/certificate_viewer.h'], 4079 ['exclude', '^browser/ui/webui/certificate_viewer.h'],
4086 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], 4080 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
4087 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'], 4081 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
4088 ], 4082 ],
4089 }], 4083 }],
4090 # Exclude other WebUI dialogs if WebUI dialogs are disabled.
4091 ['webui_dialogs == 0', {
4092 'sources/': [
4093 ['exclude', '^browser/ui/webui/hung_renderer_dialog.cc'],
4094 ['exclude', '^browser/ui/webui/hung_renderer_dialog.h'],
4095 ['exclude', '^browser/ui/webui/hung_renderer_dialog_ui.cc'],
4096 ['exclude', '^browser/ui/webui/hung_renderer_dialog_ui.h'],
4097 ],
4098 }],
4099 ['webui_dialogs == 1', {
4100 'sources/': [
4101 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
4102 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
4103 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
4104 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.h'],
4105 ],
4106 }],
4107 ['toolkit_uses_gtk == 1', { 4084 ['toolkit_uses_gtk == 1', {
4108 'dependencies': [ 4085 'dependencies': [
4109 '../build/linux/system.gyp:dbus-glib', 4086 '../build/linux/system.gyp:dbus-glib',
4110 '../build/linux/system.gyp:gconf', 4087 '../build/linux/system.gyp:gconf',
4111 '../build/linux/system.gyp:gtk', 4088 '../build/linux/system.gyp:gtk',
4112 '../build/linux/system.gyp:gtkprint', 4089 '../build/linux/system.gyp:gtkprint',
4113 '../build/linux/system.gyp:ssl', 4090 '../build/linux/system.gyp:ssl',
4114 '../build/linux/system.gyp:x11', 4091 '../build/linux/system.gyp:x11',
4115 '../third_party/undoview/undoview.gyp:undoview', 4092 '../third_party/undoview/undoview.gyp:undoview',
4116 ], 4093 ],
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
4419 ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'], 4396 ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'],
4420 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'], 4397 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'],
4421 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'], 4398 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'],
4422 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'], 4399 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'],
4423 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'], 4400 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'],
4424 ['include', '^browser/ui/gtk/cairo_cached_surface.cc'], 4401 ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
4425 ['include', '^browser/ui/gtk/cairo_cached_surface.h'], 4402 ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
4426 ['include', '^browser/ui/gtk/certificate_dialogs.cc'], 4403 ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
4427 ['include', '^browser/ui/gtk/certificate_dialogs.h'], 4404 ['include', '^browser/ui/gtk/certificate_dialogs.h'],
4428 ['include', '^browser/ui/gtk/certificate_viewer.cc'], 4405 ['include', '^browser/ui/gtk/certificate_viewer.cc'],
4429 ['include', '^browser/ui/gtk/certificate_viewer.h'],
4430 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'], 4406 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
4431 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'], 4407 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
4432 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'], 4408 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
4433 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'], 4409 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'],
4434 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'], 4410 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
4435 ['include', '^browser/ui/gtk/constrained_window_gtk.h'], 4411 ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
4436 ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'], 4412 ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'],
4437 ['include', '^browser/ui/gtk/download/download_started_animation _gtk.cc'], 4413 ['include', '^browser/ui/gtk/download/download_started_animation _gtk.cc'],
4438 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'], 4414 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
4439 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'], 4415 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
4729 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'], 4705 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'],
4730 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], 4706 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
4731 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], 4707 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
4732 ['exclude', '^browser/ui/browser_list_gtk.cc'], 4708 ['exclude', '^browser/ui/browser_list_gtk.cc'],
4733 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] , 4709 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] ,
4734 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'], 4710 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
4735 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'], 4711 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
4736 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'], 4712 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
4737 ], 4713 ],
4738 }], 4714 }],
4739 # Exclude the GTK versions of dialogs if webui_dialogs are enabled.
4740 ['webui_dialogs==1', {
4741 'sources/': [
4742 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
4743 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
4744 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
4745 ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc.h'],
4746 ],
4747 }],
4748 # Exclude these toolkit_views specific files again. 4715 # Exclude these toolkit_views specific files again.
4749 # (Required because of the '^browser/extensions/' include above) 4716 # (Required because of the '^browser/extensions/' include above)
4750 ['toolkit_views==0', { 4717 ['toolkit_views==0', {
4751 'sources/': [ 4718 'sources/': [
4752 ['exclude', '^browser/extensions/extension_input_api.cc'], 4719 ['exclude', '^browser/extensions/extension_input_api.cc'],
4753 ['exclude', '^browser/extensions/extension_input_api.h'], 4720 ['exclude', '^browser/extensions/extension_input_api.h'],
4754 ['exclude', '^browser/extensions/key_identifier_conversion_views .cc'], 4721 ['exclude', '^browser/extensions/key_identifier_conversion_views .cc'],
4755 ['exclude', '^browser/extensions/key_identifier_conversion_views .h'], 4722 ['exclude', '^browser/extensions/key_identifier_conversion_views .h'],
4756 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.h'], 4723 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.h'],
4757 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.cc'], 4724 ['exclude', '^browser/renderer_host/render_widget_host_view_view s_gtk.cc'],
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
5044 # weak imports in dependents, who still must #include 5011 # weak imports in dependents, who still must #include
5045 # closure_blocks_leopard_compat.h to get weak imports. 5012 # closure_blocks_leopard_compat.h to get weak imports.
5046 'type': 'none', 5013 'type': 'none',
5047 }], 5014 }],
5048 ], 5015 ],
5049 }, 5016 },
5050 ], 5017 ],
5051 }], 5018 }],
5052 ], 5019 ],
5053 } 5020 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698