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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 10214001: WebDialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi (revision 133969)
+++ chrome/chrome_browser.gypi (working copy)
@@ -2433,7 +2433,7 @@
'browser/ui/cocoa/confirm_quit.h',
'browser/ui/cocoa/confirm_quit_panel_controller.h',
'browser/ui/cocoa/confirm_quit_panel_controller.mm',
- 'browser/ui/cocoa/constrained_html_delegate_mac.mm',
+ 'browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm',
'browser/ui/cocoa/constrained_window_mac.h',
'browser/ui/cocoa/constrained_window_mac.mm',
'browser/ui/cocoa/content_settings/collected_cookies_mac.h',
@@ -2551,8 +2551,6 @@
'browser/ui/cocoa/hover_close_button.mm',
'browser/ui/cocoa/hover_image_button.h',
'browser/ui/cocoa/hover_image_button.mm',
- 'browser/ui/cocoa/html_dialog_window_controller.h',
- 'browser/ui/cocoa/html_dialog_window_controller.mm',
'browser/ui/cocoa/hung_renderer_controller.h',
'browser/ui/cocoa/hung_renderer_controller.mm',
'browser/ui/cocoa/hyperlink_button_cell.h',
@@ -2742,6 +2740,8 @@
'browser/ui/cocoa/view_id_util.h',
'browser/ui/cocoa/view_id_util.mm',
'browser/ui/cocoa/view_resizer.h',
+ 'browser/ui/cocoa/web_dialog_window_controller.h',
+ 'browser/ui/cocoa/web_dialog_window_controller.mm',
'browser/ui/cocoa/web_intent_sheet_controller.h',
'browser/ui/cocoa/web_intent_sheet_controller.mm',
'browser/ui/cocoa/web_intent_picker_cocoa.h',
@@ -2856,7 +2856,7 @@
'browser/ui/gtk/confirm_bubble_view.cc',
'browser/ui/gtk/confirm_bubble_view.h',
'browser/ui/gtk/color_chooser_gtk.cc',
- 'browser/ui/gtk/constrained_html_delegate_gtk.cc',
+ 'browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc',
'browser/ui/gtk/constrained_window_gtk.cc',
'browser/ui/gtk/constrained_window_gtk.h',
'browser/ui/gtk/content_setting_bubble_gtk.cc',
@@ -2931,8 +2931,6 @@
'browser/ui/gtk/gtk_util.h',
'browser/ui/gtk/hover_controller_gtk.cc',
'browser/ui/gtk/hover_controller_gtk.h',
- 'browser/ui/gtk/html_dialog_gtk.cc',
- 'browser/ui/gtk/html_dialog_gtk.h',
'browser/ui/gtk/hung_renderer_dialog_gtk.cc',
'browser/ui/gtk/importer/import_lock_dialog_gtk.cc',
'browser/ui/gtk/importer/import_lock_dialog_gtk.h',
@@ -3037,6 +3035,8 @@
'browser/ui/gtk/update_recommended_dialog.h',
'browser/ui/gtk/view_id_util.cc',
'browser/ui/gtk/view_id_util.h',
+ 'browser/ui/gtk/web_dialog_gtk.cc',
+ 'browser/ui/gtk/web_dialog_gtk.h',
'browser/ui/gtk/web_intent_picker_gtk.cc',
'browser/ui/gtk/web_intent_picker_gtk.h',
'browser/ui/gtk/website_settings_popup_gtk.cc',
@@ -3284,7 +3284,7 @@
'browser/ui/views/collected_cookies_views.h',
'browser/ui/views/confirm_bubble_view.cc',
'browser/ui/views/confirm_bubble_view.h',
- 'browser/ui/views/constrained_html_delegate_views.cc',
+ 'browser/ui/views/constrained_web_dialog_delegate_views.cc',
'browser/ui/views/constrained_window_views.cc',
'browser/ui/views/constrained_window_views.h',
'browser/ui/views/content_setting_bubble_contents.cc',
@@ -3390,8 +3390,6 @@
'browser/ui/views/generic_info_view.h',
'browser/ui/views/global_error_bubble_view.cc',
'browser/ui/views/global_error_bubble_view.h',
- 'browser/ui/views/html_dialog_view.cc',
- 'browser/ui/views/html_dialog_view.h',
'browser/ui/views/hung_renderer_view.cc',
'browser/ui/views/importer/import_lock_dialog_view.cc',
'browser/ui/views/importer/import_lock_dialog_view.h',
@@ -3553,6 +3551,8 @@
'browser/ui/views/update_recommended_message_box.h',
'browser/ui/views/user_data_dir_dialog.cc',
'browser/ui/views/user_data_dir_dialog.h',
+ 'browser/ui/views/web_dialog_view.cc',
+ 'browser/ui/views/web_dialog_view.h',
'browser/ui/views/web_intent_picker_views.cc',
'browser/ui/views/window.cc',
'browser/ui/views/window.h',
@@ -3624,10 +3624,10 @@
'browser/ui/webui/chromeos/system_info_ui.h',
'browser/ui/webui/chromeos/ui_account_tweaks.cc',
'browser/ui/webui/chromeos/ui_account_tweaks.h',
- 'browser/ui/webui/constrained_html_ui.cc',
- 'browser/ui/webui/constrained_html_ui.h',
- 'browser/ui/webui/constrained_html_ui_delegate_impl.cc',
- 'browser/ui/webui/constrained_html_ui_delegate_impl.h',
+ 'browser/ui/webui/constrained_web_dialog_ui.cc',
+ 'browser/ui/webui/constrained_web_dialog_ui.h',
+ 'browser/ui/webui/constrained_web_dialog_delegate_base.cc',
+ 'browser/ui/webui/constrained_web_dialog_delegate_base.h',
'browser/ui/webui/cookies_tree_model_util.cc',
'browser/ui/webui/cookies_tree_model_util.h',
'browser/ui/webui/crashes_ui.cc',
@@ -3673,12 +3673,6 @@
'browser/ui/webui/help/version_updater_unimplemented.h',
'browser/ui/webui/history_ui.cc',
'browser/ui/webui/history_ui.h',
- 'browser/ui/webui/html_dialog_controller.cc',
- 'browser/ui/webui/html_dialog_controller.h',
- 'browser/ui/webui/html_dialog_tab_contents_delegate.cc',
- 'browser/ui/webui/html_dialog_tab_contents_delegate.h',
- 'browser/ui/webui/html_dialog_ui.cc',
- 'browser/ui/webui/html_dialog_ui.h',
'browser/ui/webui/inspect_ui.cc',
'browser/ui/webui/inspect_ui.h',
'browser/ui/webui/keyboard_ui.cc',
@@ -3874,6 +3868,12 @@
'browser/ui/webui/tracing_ui.h',
'browser/ui/webui/uber/uber_ui.cc',
'browser/ui/webui/uber/uber_ui.h',
+ 'browser/ui/webui/web_dialog_controller.cc',
+ 'browser/ui/webui/web_dialog_controller.h',
+ 'browser/ui/webui/web_dialog_web_contents_delegate.cc',
+ 'browser/ui/webui/web_dialog_web_contents_delegate.h',
+ 'browser/ui/webui/web_dialog_ui.cc',
+ 'browser/ui/webui/web_dialog_ui.h',
'browser/ui/webui/web_ui_util.cc',
'browser/ui/webui/web_ui_util.h',
'browser/ui/window_sizer.cc',
@@ -4818,7 +4818,7 @@
['include', '^browser/ui/views/color_chooser_aura.cc'],
['include', '^browser/ui/views/confirm_bubble_view.cc'],
['include', '^browser/ui/views/confirm_bubble_view.h'],
- ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
+ ['include', '^browser/ui/views/constrained_web_dialog_delegate_views.cc'],
['include', '^browser/ui/views/constrained_window_views.cc'],
['include', '^browser/ui/views/content_setting_bubble_contents.cc'],
['include', '^browser/ui/views/content_setting_bubble_contents.h'],
@@ -4904,8 +4904,6 @@
['include', '^browser/ui/views/fullscreen_exit_bubble_views.h'],
['include', '^browser/ui/views/global_error_bubble_view.cc'],
['include', '^browser/ui/views/global_error_bubble_view.h'],
- ['include', '^browser/ui/views/html_dialog_view.cc'],
- ['include', '^browser/ui/views/html_dialog_view.h'],
['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
['include', '^browser/ui/views/infobars/*'],
['include', '^browser/ui/views/js_modal_dialog_views.cc'],
@@ -5001,6 +4999,8 @@
['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'],
['include', '^browser/ui/views/update_recommended_message_box.cc'],
['include', '^browser/ui/views/update_recommended_message_box.h'],
+ ['include', '^browser/ui/views/web_dialog_view.cc'],
+ ['include', '^browser/ui/views/web_dialog_view.h'],
['include', '^browser/ui/views/web_intent_picker_views.cc'],
['include', '^browser/ui/views/window.cc'],
['include', '^browser/ui/views/window.h'],
« no previous file with comments | « chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698