Index: chrome/chrome_browser_ui.gypi |
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi |
index 177befbfb585357a64deb124123c630e8a22bce0..b828c20570a788807ffed0b32d60037d621c9584 100644 |
--- a/chrome/chrome_browser_ui.gypi |
+++ b/chrome/chrome_browser_ui.gypi |
@@ -18,9 +18,8 @@ |
'browser/ui/app_list/app_list_util.cc', |
'browser/ui/app_list/app_list_util.h', |
# All other browser/ui/app_list files go in chrome_browser_ui_app_list_sources. |
- 'browser/ui/app_modal/chrome_javascript_native_dialog_factory.h', |
- 'browser/ui/autofill/autofill_dialog_models.h', |
'browser/ui/autofill/autofill_dialog_models.cc', |
+ 'browser/ui/autofill/autofill_dialog_models.h', |
'browser/ui/autofill/autofill_popup_controller.h', |
'browser/ui/autofill/autofill_popup_controller_impl.cc', |
'browser/ui/autofill/autofill_popup_controller_impl.h', |
@@ -85,6 +84,7 @@ |
'browser/ui/find_bar/find_notification_details.h', |
'browser/ui/find_bar/find_tab_helper.cc', |
'browser/ui/find_bar/find_tab_helper.h', |
+ 'browser/ui/javascript_dialogs/chrome_javascript_native_dialog_factory.h', |
'browser/ui/login/login_handler.cc', |
'browser/ui/login/login_handler.h', |
'browser/ui/login/login_interstitial_delegate.cc', |
@@ -1325,11 +1325,11 @@ |
'browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac.mm', |
'browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h', |
'browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm', |
- 'browser/ui/cocoa/website_settings/permission_bubble_view_cocoa_views.mm', |
'browser/ui/cocoa/website_settings/permission_bubble_cocoa.h', |
'browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm', |
'browser/ui/cocoa/website_settings/permission_bubble_controller.h', |
'browser/ui/cocoa/website_settings/permission_bubble_controller.mm', |
+ 'browser/ui/cocoa/website_settings/permission_bubble_view_cocoa_views.mm', |
'browser/ui/cocoa/website_settings/permission_selector_button.h', |
'browser/ui/cocoa/website_settings/permission_selector_button.mm', |
'browser/ui/cocoa/website_settings/split_block_button.h', |
@@ -1500,10 +1500,10 @@ |
'browser/ui/cocoa/media_picker/desktop_media_picker_bridge.mm', |
'browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h', |
'browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm', |
- 'browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h', |
- 'browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm', |
'browser/ui/cocoa/media_picker/desktop_media_picker_controller.h', |
'browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm', |
+ 'browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h', |
+ 'browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm', |
'browser/ui/cocoa/media_picker/desktop_media_picker_item.h', |
'browser/ui/cocoa/media_picker/desktop_media_picker_item.mm', |
'browser/ui/cocoa/native_window_tracker_cocoa.h', |
@@ -2044,8 +2044,6 @@ |
'browser/ui/webui/settings/chromeos/device_pointer_handler.h', |
'browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc', |
'browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h', |
- 'browser/ui/webui/settings/settings_cookies_view_handler.cc', |
- 'browser/ui/webui/settings/settings_cookies_view_handler.h', |
'browser/ui/webui/settings/downloads_handler.cc', |
'browser/ui/webui/settings/downloads_handler.h', |
'browser/ui/webui/settings/font_handler.cc', |
@@ -2068,6 +2066,8 @@ |
'browser/ui/webui/settings/search_engines_handler.h', |
'browser/ui/webui/settings/settings_clear_browsing_data_handler.cc', |
'browser/ui/webui/settings/settings_clear_browsing_data_handler.h', |
+ 'browser/ui/webui/settings/settings_cookies_view_handler.cc', |
+ 'browser/ui/webui/settings/settings_cookies_view_handler.h', |
'browser/ui/webui/settings/settings_manage_profile_handler.cc', |
'browser/ui/webui/settings/settings_manage_profile_handler.h', |
'browser/ui/webui/settings/settings_media_devices_selection_handler.cc', |
@@ -2197,11 +2197,11 @@ |
'browser/ui/views/sync/bubble_sync_promo_view.h', |
'browser/ui/views/website_settings/chosen_object_view.cc', |
'browser/ui/views/website_settings/chosen_object_view.h', |
- 'browser/ui/views/website_settings/permissions_bubble_view.cc', |
- 'browser/ui/views/website_settings/permissions_bubble_view.h', |
'browser/ui/views/website_settings/permission_selector_view.cc', |
'browser/ui/views/website_settings/permission_selector_view.h', |
'browser/ui/views/website_settings/permission_selector_view_observer.h', |
+ 'browser/ui/views/website_settings/permissions_bubble_view.cc', |
+ 'browser/ui/views/website_settings/permissions_bubble_view.h', |
'browser/ui/views/website_settings/website_settings_popup_view.cc', |
'browser/ui/views/website_settings/website_settings_popup_view.h', |
], |
@@ -2230,10 +2230,10 @@ |
'browser/ui/views/profiles/profile_chooser_view.cc', |
'browser/ui/views/profiles/profile_chooser_view.h', |
'browser/ui/views/screen_capture_notification_ui_views.cc', |
- 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc', |
- 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h', |
'browser/ui/views/sync/one_click_signin_dialog_view.cc', |
'browser/ui/views/sync/one_click_signin_dialog_view.h', |
+ 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc', |
+ 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h', |
], |
# Cross-platform (except Mac) views sources. |
'chrome_browser_ui_views_non_mac_sources': [ |
@@ -2403,6 +2403,8 @@ |
'browser/ui/views/location_bar/zoom_bubble_view.h', |
'browser/ui/views/location_bar/zoom_view.cc', |
'browser/ui/views/location_bar/zoom_view.h', |
+ 'browser/ui/views/native_web_contents_modal_dialog_manager_views.cc', |
+ 'browser/ui/views/native_web_contents_modal_dialog_manager_views.h', |
'browser/ui/views/omnibox/omnibox_popup_contents_view.cc', |
'browser/ui/views/omnibox/omnibox_popup_contents_view.h', |
'browser/ui/views/omnibox/omnibox_result_view.cc', |
@@ -2520,8 +2522,6 @@ |
'browser/ui/views/update_recommended_message_box.h', |
'browser/ui/views/validation_message_bubble_view.cc', |
'browser/ui/views/validation_message_bubble_view.h', |
- 'browser/ui/views/native_web_contents_modal_dialog_manager_views.cc', |
- 'browser/ui/views/native_web_contents_modal_dialog_manager_views.h', |
'browser/ui/views/web_contents_modal_dialog_manager_views.cc', |
'browser/ui/views/website_settings/chooser_bubble_ui_view.cc', |
'browser/ui/views/website_settings/chooser_bubble_ui_view.h', |
@@ -2619,11 +2619,11 @@ |
'browser/ui/app_list/app_list_prefs.h', |
'browser/ui/app_list/app_list_prefs_factory.cc', |
'browser/ui/app_list/app_list_prefs_factory.h', |
+ 'browser/ui/app_list/app_list_presenter_delegate.h', |
'browser/ui/app_list/app_list_service.cc', |
'browser/ui/app_list/app_list_service.h', |
'browser/ui/app_list/app_list_service_impl.cc', |
'browser/ui/app_list/app_list_service_impl.h', |
- 'browser/ui/app_list/app_list_presenter_delegate.h', |
'browser/ui/app_list/app_list_syncable_service.cc', |
'browser/ui/app_list/app_list_syncable_service.h', |
'browser/ui/app_list/app_list_syncable_service_factory.cc', |