Index: chrome/chrome_browser_ui.gypi |
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi |
index 431728bd5d7454e988e46bb7a3e4c04f10f865ea..07e15ff151111a6a5d0c963060543b1d7908b45d 100644 |
--- a/chrome/chrome_browser_ui.gypi |
+++ b/chrome/chrome_browser_ui.gypi |
@@ -116,8 +116,6 @@ |
'browser/ui/autofill/password_generation_popup_view.h', |
'browser/ui/autofill/popup_controller_common.cc', |
'browser/ui/autofill/popup_controller_common.h', |
- 'browser/ui/blocked_content/app_modal_dialog_helper.cc', |
- 'browser/ui/blocked_content/app_modal_dialog_helper.h', |
'browser/ui/blocked_content/blocked_window_params.cc', |
'browser/ui/blocked_content/blocked_window_params.h', |
'browser/ui/blocked_content/popup_blocker_tab_helper.cc', |
@@ -129,8 +127,6 @@ |
'browser/ui/bookmarks/bookmark_bubble_observer.h', |
'browser/ui/bookmarks/bookmark_editor.cc', |
'browser/ui/bookmarks/bookmark_editor.h', |
- 'browser/ui/bookmarks/bookmark_tab_helper.cc', |
- 'browser/ui/bookmarks/bookmark_tab_helper.h', |
'browser/ui/bookmarks/bookmark_utils.cc', |
'browser/ui/bookmarks/bookmark_utils.h', |
'browser/ui/bookmarks/recently_used_folders_combo_model.cc', |
@@ -231,17 +227,10 @@ |
'browser/ui/search_engines/search_engine_tab_helper.h', |
'browser/ui/search_engines/template_url_table_model.cc', |
'browser/ui/search_engines/template_url_table_model.h', |
- 'browser/ui/settings_window_manager.cc', |
- 'browser/ui/settings_window_manager.h', |
- 'browser/ui/settings_window_manager_observer.h', |
'browser/ui/simple_message_box.h', |
'browser/ui/simple_message_box_internal.cc', |
'browser/ui/simple_message_box_internal.h', |
'browser/ui/status_bubble.h', |
- 'browser/ui/sync/browser_synced_window_delegates_getter.cc', |
- 'browser/ui/sync/browser_synced_window_delegates_getter.h', |
- 'browser/ui/sync/inline_login_dialog.cc', |
- 'browser/ui/sync/inline_login_dialog.h', |
'browser/ui/sync/profile_signin_confirmation_helper.cc', |
'browser/ui/sync/profile_signin_confirmation_helper.h', |
'browser/ui/sync/tab_contents_synced_tab_delegate.cc', |
@@ -258,16 +247,12 @@ |
'browser/ui/tab_modal_confirm_dialog.h', |
'browser/ui/translate/language_combobox_model.cc', |
'browser/ui/translate/language_combobox_model.h', |
- 'browser/ui/translate/translate_bubble_factory.cc', |
- 'browser/ui/translate/translate_bubble_factory.h', |
'browser/ui/translate/translate_bubble_model.h', |
'browser/ui/translate/translate_bubble_model_impl.cc', |
'browser/ui/translate/translate_bubble_model_impl.h', |
'browser/ui/translate/translate_bubble_view_state_transition.cc', |
'browser/ui/translate/translate_bubble_view_state_transition.h', |
'browser/ui/uninstall_browser_prompt.h', |
- 'browser/ui/user_manager.cc', |
- 'browser/ui/user_manager.h', |
'browser/ui/validation_message_bubble.h', |
'browser/ui/view_ids.h', |
'browser/ui/views/platform_keys_certificate_selector_chromeos.cc', |
@@ -408,8 +393,6 @@ |
'browser/ui/webui/chromeos/ui_account_tweaks.h', |
'browser/ui/webui/components_ui.cc', |
'browser/ui/webui/components_ui.h', |
- 'browser/ui/webui/constrained_web_dialog_delegate_base.cc', |
- 'browser/ui/webui/constrained_web_dialog_delegate_base.h', |
'browser/ui/webui/constrained_web_dialog_ui.cc', |
'browser/ui/webui/constrained_web_dialog_ui.h', |
'browser/ui/webui/cookies_tree_model_util.cc', |
@@ -728,12 +711,6 @@ |
'browser/ui/webui/chromeos/emulator/device_emulator_ui.cc', |
'browser/ui/webui/chromeos/emulator/device_emulator_ui.h', |
], |
- # Used everywhere but ChromeOS. |
- 'chrome_browser_ui_non_chromeos_sources': [ |
- 'browser/ui/external_protocol_dialog_delegate.cc', |
- 'browser/ui/external_protocol_dialog_delegate.h', |
- 'browser/ui/startup/default_browser_prompt.cc', |
- ], |
# Mac sources, except when mac_views_browser==1 |
'chrome_browser_ui_cocoa_sources': [ |
'browser/ui/cocoa/animatable_image.h', |
@@ -1298,6 +1275,9 @@ |
], |
# Files used only on desktop systems (not iOS, Android, ChromeOS). |
'chrome_browser_ui_desktop_sources': [ |
+ 'browser/ui/startup/default_browser_prompt.cc', |
+ 'browser/ui/startup/default_browser_prompt.h', |
+ 'browser/ui/startup/default_browser_prompt_win.cc', |
'browser/ui/sync/one_click_signin_bubble_delegate.h', |
'browser/ui/sync/one_click_signin_bubble_links_delegate.cc', |
'browser/ui/sync/one_click_signin_bubble_links_delegate.h', |
@@ -1495,12 +1475,16 @@ |
'browser/ui/autofill/new_credit_card_bubble_controller.h', |
'browser/ui/autofill/new_credit_card_bubble_view.cc', |
'browser/ui/autofill/new_credit_card_bubble_view.h', |
+ 'browser/ui/blocked_content/app_modal_dialog_helper.cc', |
+ 'browser/ui/blocked_content/app_modal_dialog_helper.h', |
'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc', |
'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h', |
'browser/ui/bookmarks/bookmark_context_menu_controller.cc', |
'browser/ui/bookmarks/bookmark_context_menu_controller.h', |
'browser/ui/bookmarks/bookmark_drag_drop.cc', |
'browser/ui/bookmarks/bookmark_drag_drop.h', |
+ 'browser/ui/bookmarks/bookmark_tab_helper.cc', |
+ 'browser/ui/bookmarks/bookmark_tab_helper.h', |
'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc', |
'browser/ui/bookmarks/bookmark_tab_helper_delegate.h', |
'browser/ui/bookmarks/enhanced_bookmark_key_service.cc', |
@@ -1651,14 +1635,15 @@ |
'browser/ui/search/search_ui.h', |
'browser/ui/search_engines/search_engine_tab_helper_delegate.cc', |
'browser/ui/search_engines/search_engine_tab_helper_delegate.h', |
+ 'browser/ui/settings_window_manager.cc', |
+ 'browser/ui/settings_window_manager.h', |
+ 'browser/ui/settings_window_manager_observer.h', |
'browser/ui/singleton_tabs.cc', |
'browser/ui/singleton_tabs.h', |
'browser/ui/startup/autolaunch_prompt.h', |
'browser/ui/startup/autolaunch_prompt_win.cc', |
'browser/ui/startup/bad_flags_prompt.cc', |
'browser/ui/startup/bad_flags_prompt.h', |
- 'browser/ui/startup/default_browser_prompt.h', |
- 'browser/ui/startup/default_browser_prompt_win.cc', |
'browser/ui/startup/google_api_keys_infobar_delegate.cc', |
'browser/ui/startup/google_api_keys_infobar_delegate.h', |
'browser/ui/startup/obsolete_system_infobar_delegate.cc', |
@@ -1674,6 +1659,10 @@ |
'browser/ui/startup/startup_types.h', |
'browser/ui/sync/browser_synced_window_delegate.cc', |
'browser/ui/sync/browser_synced_window_delegate.h', |
+ 'browser/ui/sync/browser_synced_window_delegates_getter.cc', |
+ 'browser/ui/sync/browser_synced_window_delegates_getter.h', |
+ 'browser/ui/sync/inline_login_dialog.cc', |
+ 'browser/ui/sync/inline_login_dialog.h', |
'browser/ui/sync/sync_promo_ui.cc', |
'browser/ui/sync/sync_promo_ui.h', |
'browser/ui/tab_contents/tab_contents_iterator.cc', |
@@ -1731,10 +1720,14 @@ |
'browser/ui/toolbar/wrench_menu_badge_controller.h', |
'browser/ui/toolbar/wrench_menu_model.cc', |
'browser/ui/toolbar/wrench_menu_model.h', |
+ 'browser/ui/translate/translate_bubble_factory.cc', |
+ 'browser/ui/translate/translate_bubble_factory.h', |
'browser/ui/uma_browsing_activity_observer.cc', |
'browser/ui/uma_browsing_activity_observer.h', |
'browser/ui/unload_controller.cc', |
'browser/ui/unload_controller.h', |
+ 'browser/ui/user_manager.cc', |
+ 'browser/ui/user_manager.h', |
'browser/ui/website_settings/permission_menu_model.cc', |
'browser/ui/website_settings/permission_menu_model.h', |
'browser/ui/website_settings/website_settings_infobar_delegate.cc', |
@@ -1747,6 +1740,8 @@ |
'browser/ui/webui/bookmarks_ui.h', |
'browser/ui/webui/chrome_web_contents_handler.cc', |
'browser/ui/webui/chrome_web_contents_handler.h', |
+ 'browser/ui/webui/constrained_web_dialog_delegate_base.cc', |
+ 'browser/ui/webui/constrained_web_dialog_delegate_base.h', |
'browser/ui/webui/copresence_ui.cc', |
'browser/ui/webui/copresence_ui.h', |
'browser/ui/webui/copresence_ui_handler.cc', |
@@ -2024,6 +2019,8 @@ |
], |
# Views files for everywhere but ChromeOS. |
'chrome_browser_ui_views_non_chromeos_sources': [ |
+ 'browser/ui/external_protocol_dialog_delegate.cc', |
+ 'browser/ui/external_protocol_dialog_delegate.h', |
'browser/ui/views/external_protocol_dialog.cc', |
'browser/ui/views/external_protocol_dialog.h', |
'browser/ui/views/frame/opaque_browser_frame_view.cc', |
@@ -2833,7 +2830,6 @@ |
], |
'sources!': [ |
'browser/ui/external_protocol_dialog_delegate.cc', |
- 'browser/ui/startup/default_browser_prompt.cc', |
], |
'dependencies': [ |
'../net/net.gyp:net', |
@@ -2887,8 +2883,6 @@ |
'../ui/chromeos/ui_chromeos.gyp:ui_chromeos', |
'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', |
], |
- }, { |
- 'sources': [ '<@(chrome_browser_ui_non_chromeos_sources)' ], |
}], |
['use_cups==1', { |
'dependencies': [ |