Separate out file lists in browser_ui.gypi

This mostly works on getting rid of the Android exclusion lists.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/358043002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280347 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 388 insertions, 523 deletions

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 3ef5ece..43ef67a 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -84,8 +84,6 @@
       'browser/ui/apps/app_info_dialog.h',
       'browser/ui/apps/apps_metro_handler_win.cc',
       'browser/ui/apps/apps_metro_handler_win.h',
-      'browser/ui/apps/chrome_app_window_delegate.cc',
-      'browser/ui/apps/chrome_app_window_delegate.h',
       'browser/ui/apps/directory_access_confirmation_dialog.cc',
       'browser/ui/apps/directory_access_confirmation_dialog.h',
       'browser/ui/ash/accessibility/automation_manager_ash.cc',
@@ -135,6 +133,8 @@
       'browser/ui/ash/launcher/browser_status_monitor.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item.cc',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item.h',
+      'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc',
+      'browser/ui/bookmarks/bookmark_tab_helper_delegate.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc',
@@ -204,14 +204,10 @@
       'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
       'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
       'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
-      'browser/ui/autofill/account_chooser_model.cc',
-      'browser/ui/autofill/account_chooser_model.h',
       'browser/ui/autofill/autofill_dialog_controller.cc',
       'browser/ui/autofill/autofill_dialog_controller.h',
       'browser/ui/autofill/autofill_dialog_models.cc',
       'browser/ui/autofill/autofill_dialog_models.h',
-      'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
-      'browser/ui/autofill/autofill_dialog_sign_in_delegate.h',
       'browser/ui/autofill/autofill_dialog_types.cc',
       'browser/ui/autofill/autofill_dialog_types.h',
       'browser/ui/autofill/autofill_popup_controller.h',
@@ -222,18 +218,8 @@
       'browser/ui/autofill/chrome_autofill_client.cc',
       'browser/ui/autofill/chrome_autofill_client.h',
       'browser/ui/autofill/chrome_autofill_client_mac.mm',
-      'browser/ui/autofill/country_combobox_model.cc',
-      'browser/ui/autofill/country_combobox_model.h',
-      'browser/ui/autofill/generated_credit_card_bubble_view.cc',
-      'browser/ui/autofill/generated_credit_card_bubble_view.h',
-      'browser/ui/autofill/generated_credit_card_bubble_controller.cc',
-      'browser/ui/autofill/generated_credit_card_bubble_controller.h',
       'browser/ui/autofill/loading_animation.cc',
       'browser/ui/autofill/loading_animation.h',
-      'browser/ui/autofill/new_credit_card_bubble_view.cc',
-      'browser/ui/autofill/new_credit_card_bubble_view.h',
-      'browser/ui/autofill/new_credit_card_bubble_controller.cc',
-      'browser/ui/autofill/new_credit_card_bubble_controller.h',
       'browser/ui/autofill/password_generation_popup_controller_impl.cc',
       'browser/ui/autofill/password_generation_popup_controller_impl.h',
       'browser/ui/autofill/password_generation_popup_controller.h',
@@ -250,78 +236,38 @@
       'browser/ui/bookmarks/bookmark_bar_constants.h',
       'browser/ui/bookmarks/bookmark_bar_instructions_delegate.h',
       'browser/ui/bookmarks/bookmark_bubble_delegate.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_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_tab_helper_delegate.cc',
-      'browser/ui/bookmarks/bookmark_tab_helper_delegate.h',
       'browser/ui/bookmarks/bookmark_utils.cc',
       'browser/ui/bookmarks/bookmark_utils.h',
       'browser/ui/bookmarks/recently_used_folders_combo_model.cc',
       'browser/ui/bookmarks/recently_used_folders_combo_model.h',
-      'browser/ui/browser.cc',
-      'browser/ui/browser.h',
       'browser/ui/browser_commands.cc',
       'browser/ui/browser_commands.h',
       'browser/ui/browser_commands_chromeos.cc',
       'browser/ui/browser_commands_chromeos.h',
       'browser/ui/browser_commands_mac.cc',
       'browser/ui/browser_commands_mac.h',
-      'browser/ui/browser_command_controller.cc',
-      'browser/ui/browser_command_controller.h',
-      'browser/ui/browser_content_setting_bubble_model_delegate.cc',
-      'browser/ui/browser_content_setting_bubble_model_delegate.h',
       'browser/ui/browser_content_translate_driver_observer.cc',
       'browser/ui/browser_content_translate_driver_observer.h',
       'browser/ui/browser_dialogs.h',
-      'browser/ui/browser_finder.cc',
-      'browser/ui/browser_finder.h',
       'browser/ui/browser_instant_controller.cc',
       'browser/ui/browser_instant_controller.h',
-      'browser/ui/browser_iterator.cc',
-      'browser/ui/browser_iterator.h',
-      'browser/ui/browser_list.cc',
-      'browser/ui/browser_list.h',
       'browser/ui/browser_mac.cc',
       'browser/ui/browser_mac.h',
       'browser/ui/browser_navigator.cc',
       'browser/ui/browser_navigator.h',
       'browser/ui/browser_otr_state_android.cc',
-      'browser/ui/browser_otr_state.cc',
-      'browser/ui/browser_otr_state.h',
       'browser/ui/browser_ui_prefs.cc',
       'browser/ui/browser_ui_prefs.h',
-      'browser/ui/browser_tab_restore_service_delegate.cc',
-      'browser/ui/browser_tab_restore_service_delegate.h',
-      'browser/ui/browser_tab_strip_model_delegate.cc',
-      'browser/ui/browser_tab_strip_model_delegate.h',
-      'browser/ui/browser_tabrestore.cc',
-      'browser/ui/browser_tabrestore.h',
-      'browser/ui/browser_tabstrip.cc',
-      'browser/ui/browser_tabstrip.h',
-      'browser/ui/browser_toolbar_model_delegate.cc',
-      'browser/ui/browser_toolbar_model_delegate.h',
-      'browser/ui/browser_view_prefs.cc',
-      'browser/ui/browser_view_prefs.h',
       'browser/ui/browser_win.cc',
       'browser/ui/browser_window.h',
       'browser/ui/browser_window_state.cc',
       'browser/ui/browser_window_state.h',
-      'browser/ui/chrome_pages.cc',
-      'browser/ui/chrome_pages.h',
       'browser/ui/chrome_select_file_policy.cc',
       'browser/ui/chrome_select_file_policy.h',
-      'browser/ui/chrome_style.cc',
-      'browser/ui/chrome_style.h',
-      'browser/ui/chrome_web_modal_dialog_manager_delegate.cc',
-      'browser/ui/chrome_web_modal_dialog_manager_delegate.h',
       'browser/ui/cocoa/accelerator_utils_cocoa.mm',
       'browser/ui/cocoa/about_ipc_controller.h',
       'browser/ui/cocoa/about_ipc_controller.mm',
@@ -931,51 +877,24 @@
       'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm',
       'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
       'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
-      'browser/ui/collected_cookies_infobar_delegate.cc',
-      'browser/ui/collected_cookies_infobar_delegate.h',
       'browser/ui/confirm_bubble.h',
-      'browser/ui/confirm_bubble_model.cc',
-      'browser/ui/confirm_bubble_model.h',
-      'browser/ui/content_settings/content_setting_bubble_model.cc',
-      'browser/ui/content_settings/content_setting_bubble_model.h',
-      'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
-      'browser/ui/content_settings/content_setting_image_model.cc',
-      'browser/ui/content_settings/content_setting_image_model.h',
-      'browser/ui/content_settings/content_setting_media_menu_model.cc',
-      'browser/ui/content_settings/content_setting_media_menu_model.h',
-      'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
-      'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
       'browser/ui/crypto_module_password_dialog.h',
-      'browser/ui/elide_url.cc',
-      'browser/ui/elide_url.h',
-      'browser/ui/extensions/application_launch.cc',
-      'browser/ui/extensions/application_launch.h',
       'browser/ui/extensions/extension_installed_bubble.cc',
       'browser/ui/extensions/extension_installed_bubble.h',
-      'browser/ui/extensions/extension_install_ui_default.cc',
-      'browser/ui/extensions/extension_install_ui_default.h',
       'browser/ui/extensions/extension_enable_flow.cc',
       'browser/ui/extensions/extension_enable_flow.h',
       'browser/ui/extensions/extension_enable_flow_delegate.h',
       'browser/ui/external_protocol_dialog_delegate.cc',
       'browser/ui/external_protocol_dialog_delegate.h',
-      'browser/ui/fast_unload_controller.cc',
-      'browser/ui/fast_unload_controller.h',
       'browser/ui/find_bar/find_bar.h',
-      'browser/ui/find_bar/find_bar_controller.cc',
-      'browser/ui/find_bar/find_bar_controller.h',
       'browser/ui/find_bar/find_bar_state.h',
       'browser/ui/find_bar/find_bar_state_factory.cc',
       'browser/ui/find_bar/find_bar_state_factory.h',
       '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/fullscreen/fullscreen_controller.cc',
-      'browser/ui/fullscreen/fullscreen_controller.h',
       'browser/ui/fullscreen/fullscreen_exit_bubble.cc',
       'browser/ui/fullscreen/fullscreen_exit_bubble.h',
-      'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc',
-      'browser/ui/fullscreen/fullscreen_exit_bubble_type.h',
       'browser/ui/fullscreen/fullscreen_within_tab_helper.cc',
       'browser/ui/fullscreen/fullscreen_within_tab_helper.h',
       'browser/ui/gesture_prefs_observer_factory_aura.cc',
@@ -1001,68 +920,8 @@
       'browser/ui/navigation_correction_tab_observer.h',
       'browser/ui/metro_pin_tab_helper_win.cc',
       'browser/ui/metro_pin_tab_helper_win.h',
-      'browser/ui/ntp_background_util.cc',
-      'browser/ui/ntp_background_util.h',
-      'browser/ui/omnibox/alternate_nav_infobar_delegate.cc',
-      'browser/ui/omnibox/alternate_nav_infobar_delegate.h',
-      'browser/ui/omnibox/location_bar.cc',
-      'browser/ui/omnibox/location_bar.h',
-      'browser/ui/omnibox/location_bar_util.cc',
-      'browser/ui/omnibox/location_bar_util.h',
-      'browser/ui/omnibox/omnibox_controller.h',
-      'browser/ui/omnibox/omnibox_controller.cc',
-      'browser/ui/omnibox/omnibox_current_page_delegate.h',
-      'browser/ui/omnibox/omnibox_current_page_delegate_impl.cc',
-      'browser/ui/omnibox/omnibox_current_page_delegate_impl.h',
-      'browser/ui/omnibox/omnibox_edit_controller.cc',
-      'browser/ui/omnibox/omnibox_edit_controller.h',
-      'browser/ui/omnibox/omnibox_edit_model.cc',
-      'browser/ui/omnibox/omnibox_edit_model.h',
-      'browser/ui/omnibox/omnibox_navigation_observer.cc',
-      'browser/ui/omnibox/omnibox_navigation_observer.h',
-      'browser/ui/omnibox/omnibox_popup_model.cc',
-      'browser/ui/omnibox/omnibox_popup_model.h',
-      'browser/ui/omnibox/omnibox_popup_model_observer.h',
-      'browser/ui/omnibox/omnibox_popup_view.h',
       'browser/ui/omnibox/omnibox_view.cc',
       'browser/ui/omnibox/omnibox_view.h',
-      'browser/ui/options/options_util.cc',
-      'browser/ui/options/options_util.h',
-      'browser/ui/panels/detached_panel_collection.cc',
-      'browser/ui/panels/detached_panel_collection.h',
-      'browser/ui/panels/detached_panel_drag_handler.cc',
-      'browser/ui/panels/detached_panel_drag_handler.h',
-      'browser/ui/panels/display_settings_provider.cc',
-      'browser/ui/panels/display_settings_provider.h',
-      'browser/ui/panels/docked_panel_collection.cc',
-      'browser/ui/panels/docked_panel_collection.h',
-      'browser/ui/panels/docked_panel_drag_handler.cc',
-      'browser/ui/panels/docked_panel_drag_handler.h',
-      'browser/ui/panels/native_panel.h',
-      'browser/ui/panels/native_panel_stack_window.h',
-      'browser/ui/panels/panel.cc',
-      'browser/ui/panels/panel.h',
-      'browser/ui/panels/panel_bounds_animation.cc',
-      'browser/ui/panels/panel_bounds_animation.h',
-      'browser/ui/panels/panel_collection.cc',
-      'browser/ui/panels/panel_collection.h',
-      'browser/ui/panels/panel_constants.h',
-      'browser/ui/panels/panel_drag_controller.cc',
-      'browser/ui/panels/panel_drag_controller.h',
-      'browser/ui/panels/panel_host.cc',
-      'browser/ui/panels/panel_host.h',
-      'browser/ui/panels/panel_resize_controller.cc',
-      'browser/ui/panels/panel_resize_controller.h',
-      'browser/ui/panels/panel_manager.cc',
-      'browser/ui/panels/panel_manager.h',
-      'browser/ui/panels/panel_mouse_watcher.cc',
-      'browser/ui/panels/panel_mouse_watcher.h',
-      'browser/ui/panels/panel_mouse_watcher_observer.h',
-      'browser/ui/panels/panel_mouse_watcher_timer.cc',
-      'browser/ui/panels/stacked_panel_collection.cc',
-      'browser/ui/panels/stacked_panel_collection.h',
-      'browser/ui/panels/stacked_panel_drag_handler.cc',
-      'browser/ui/panels/stacked_panel_drag_handler.h',
       'browser/ui/passwords/manage_passwords_bubble.cc',
       'browser/ui/passwords/manage_passwords_bubble.h',
       'browser/ui/passwords/manage_passwords_bubble_model.cc',
@@ -1074,11 +933,6 @@
       'browser/ui/passwords/password_manager_presenter.cc',
       'browser/ui/passwords/password_manager_presenter.h',
       'browser/ui/passwords/password_ui_view.h',
-      'browser/ui/pdf/open_pdf_in_reader_prompt_delegate.h',
-      'browser/ui/pdf/pdf_tab_helper.cc',
-      'browser/ui/pdf/pdf_tab_helper.h',
-      'browser/ui/pdf/pdf_unsupported_feature.cc',
-      'browser/ui/pdf/pdf_unsupported_feature.h',
       'browser/ui/prefs/prefs_tab_helper.cc',
       'browser/ui/prefs/prefs_tab_helper.h',
       'browser/ui/process_singleton_dialog_linux.h',
@@ -1086,11 +940,6 @@
       'browser/ui/profile_error_dialog.cc',
       'browser/ui/profile_error_dialog.h',
       'browser/ui/protocol_dialog_delegate.h',
-      'browser/ui/sad_tab.cc',
-      'browser/ui/sad_tab.h',
-      'browser/ui/sad_tab_helper.cc',
-      'browser/ui/sad_tab_helper.h',
-      'browser/ui/sad_tab_types.h',
       'browser/ui/scoped_tabbed_browser_displayer.cc',
       'browser/ui/scoped_tabbed_browser_displayer.h',
       'browser/ui/screen_capture_notification_ui.h',
@@ -1102,8 +951,6 @@
       'browser/ui/search/instant_search_prerenderer.h',
       'browser/ui/search/instant_tab.cc',
       'browser/ui/search/instant_tab.h',
-      'browser/ui/search/search_delegate.cc',
-      'browser/ui/search/search_delegate.h',
       'browser/ui/search/search_ipc_router.cc',
       'browser/ui/search/search_ipc_router.h',
       'browser/ui/search/search_ipc_router_policy_impl.cc',
@@ -1115,18 +962,12 @@
       'browser/ui/search/search_tab_helper.h',
       'browser/ui/search/search_tab_helper_delegate.cc',
       'browser/ui/search/search_tab_helper_delegate.h',
-      'browser/ui/search/search_ui.cc',
-      'browser/ui/search/search_ui.h',
       'browser/ui/search_engines/edit_search_engine_controller.cc',
       'browser/ui/search_engines/edit_search_engine_controller.h',
       'browser/ui/search_engines/keyword_editor_controller.cc',
       'browser/ui/search_engines/keyword_editor_controller.h',
       'browser/ui/search_engines/search_engine_tab_helper.cc',
       'browser/ui/search_engines/search_engine_tab_helper.h',
-      'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
-      'browser/ui/search_engines/search_engine_tab_helper_delegate.h',
-      'browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc',
-      'browser/ui/search_engines/template_url_fetcher_ui_callbacks.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',
@@ -1134,32 +975,7 @@
       'browser/ui/settings_window_manager_observer.h',
       'browser/ui/profile_reset_bubble.h',
       'browser/ui/simple_message_box.h',
-      'browser/ui/singleton_tabs.cc',
-      'browser/ui/singleton_tabs.h',
-      'browser/ui/startup/autolaunch_prompt_win.cc',
-      'browser/ui/startup/autolaunch_prompt.h',
-      'browser/ui/startup/bad_flags_prompt.cc',
-      'browser/ui/startup/bad_flags_prompt.h',
-      'browser/ui/startup/default_browser_prompt.cc',
-      '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',
-      'browser/ui/startup/obsolete_system_infobar_delegate.h',
-      'browser/ui/startup/session_crashed_infobar_delegate.cc',
-      'browser/ui/startup/session_crashed_infobar_delegate.h',
-      'browser/ui/startup/session_crashed_bubble.h',
-      'browser/ui/startup/startup_browser_creator.cc',
-      'browser/ui/startup/startup_browser_creator.h',
-      'browser/ui/startup/startup_browser_creator_impl.cc',
-      'browser/ui/startup/startup_browser_creator_impl.h',
-      'browser/ui/startup/startup_tab.cc',
-      'browser/ui/startup/startup_tab.h',
-      'browser/ui/startup/startup_types.h',
       'browser/ui/status_bubble.h',
-      'browser/ui/sync/browser_synced_window_delegate.h',
-      'browser/ui/sync/browser_synced_window_delegate.cc',
       'browser/ui/sync/inline_login_dialog.cc',
       'browser/ui/sync/inline_login_dialog.h',
       'browser/ui/sync/one_click_signin_sync_observer.cc',
@@ -1176,54 +992,17 @@
       'browser/ui/tab_contents/core_tab_helper.h',
       'browser/ui/tab_contents/core_tab_helper_delegate.cc',
       'browser/ui/tab_contents/core_tab_helper_delegate.h',
-      'browser/ui/tab_contents/tab_contents_iterator.cc',
-      'browser/ui/tab_contents/tab_contents_iterator.h',
       'browser/ui/tab_helpers.cc',
       'browser/ui/tab_helpers.h',
       'browser/ui/tab_modal_confirm_dialog.h',
-      'browser/ui/tab_modal_confirm_dialog_delegate.cc',
-      'browser/ui/tab_modal_confirm_dialog_delegate.h',
-      'browser/ui/tabs/hover_tab_selector.cc',
-      'browser/ui/tabs/hover_tab_selector.h',
-      'browser/ui/tabs/pinned_tab_codec.cc',
-      'browser/ui/tabs/pinned_tab_codec.h',
-      'browser/ui/tabs/pinned_tab_service.cc',
-      'browser/ui/tabs/pinned_tab_service.h',
-      'browser/ui/tabs/pinned_tab_service_factory.cc',
-      'browser/ui/tabs/pinned_tab_service_factory.h',
-      'browser/ui/tabs/tab_menu_model.cc',
-      'browser/ui/tabs/tab_menu_model.h',
-      'browser/ui/tabs/tab_strip_model.cc',
-      'browser/ui/tabs/tab_strip_model.h',
-      'browser/ui/tabs/tab_strip_model_delegate.h',
-      'browser/ui/tabs/tab_strip_model_observer.cc',
-      'browser/ui/tabs/tab_strip_model_observer.h',
-      'browser/ui/tabs/tab_strip_model_order_controller.cc',
-      'browser/ui/tabs/tab_strip_model_order_controller.h',
-      'browser/ui/tabs/tab_strip_model_utils.cc',
-      'browser/ui/tabs/tab_strip_model_utils.h',
       'browser/ui/tabs/tab_utils.cc',
       'browser/ui/tabs/tab_utils.h',
-      'browser/ui/toolbar/back_forward_menu_model.cc',
-      'browser/ui/toolbar/back_forward_menu_model.h',
-      'browser/ui/toolbar/bookmark_sub_menu_model.cc',
-      'browser/ui/toolbar/bookmark_sub_menu_model.h',
-      'browser/ui/toolbar/encoding_menu_controller.cc',
-      'browser/ui/toolbar/encoding_menu_controller.h',
-      'browser/ui/toolbar/origin_chip_info.cc',
-      'browser/ui/toolbar/origin_chip_info.h',
-      'browser/ui/toolbar/recent_tabs_sub_menu_model.cc',
-      'browser/ui/toolbar/recent_tabs_sub_menu_model.h',
       'browser/ui/toolbar/toolbar_model.cc',
       'browser/ui/toolbar/toolbar_model.h',
+      'browser/ui/toolbar/toolbar_model_delegate.h',
       'browser/ui/toolbar/toolbar_model_impl.cc',
       'browser/ui/toolbar/toolbar_model_impl.h',
-      'browser/ui/toolbar/toolbar_model_delegate.h',
       'browser/ui/toolbar/toolbar_model_security_level_list.h',
-      'browser/ui/toolbar/wrench_icon_painter.cc',
-      'browser/ui/toolbar/wrench_icon_painter.h',
-      'browser/ui/toolbar/wrench_menu_model.cc',
-      'browser/ui/toolbar/wrench_menu_model.h',
       'browser/ui/top_level_widget.h',
       'browser/ui/translate/language_combobox_model.cc',
       'browser/ui/translate/language_combobox_model.h',
@@ -1234,11 +1013,7 @@
       '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/uma_browsing_activity_observer.cc',
-      'browser/ui/uma_browsing_activity_observer.h',
       'browser/ui/uninstall_browser_prompt.h',
-      'browser/ui/unload_controller.cc',
-      'browser/ui/unload_controller.h',
       'browser/ui/validation_message_bubble.h',
       'browser/ui/view_ids.h',
       'browser/ui/views/accelerator_utils_aura.cc',
@@ -1703,26 +1478,18 @@
       'browser/ui/website_settings/permission_bubble_manager.h',
       'browser/ui/website_settings/permission_bubble_request.h',
       'browser/ui/website_settings/permission_bubble_view.h',
-      'browser/ui/website_settings/permission_menu_model.cc',
-      'browser/ui/website_settings/permission_menu_model.h',
       'browser/ui/website_settings/website_settings.cc',
       'browser/ui/website_settings/website_settings.h',
       'browser/ui/website_settings/website_settings_infobar_delegate.cc',
       'browser/ui/website_settings/website_settings_infobar_delegate.h',
       'browser/ui/website_settings/website_settings_ui.cc',
       'browser/ui/website_settings/website_settings_ui.h',
-      'browser/ui/website_settings/website_settings_utils.cc',
-      'browser/ui/website_settings/website_settings_utils.h',
       'browser/ui/webui/about_ui.cc',
       'browser/ui/webui/about_ui.h',
-      'browser/ui/webui/app_launcher_page_ui.cc',
-      'browser/ui/webui/app_launcher_page_ui.h',
       'browser/ui/webui/app_list/start_page_handler.cc',
       'browser/ui/webui/app_list/start_page_handler.h',
       'browser/ui/webui/app_list/start_page_ui.cc',
       'browser/ui/webui/app_list/start_page_ui.h',
-      'browser/ui/webui/bookmarks_ui.cc',
-      'browser/ui/webui/bookmarks_ui.h',
       'browser/ui/webui/chromeos/bluetooth_pairing_ui.cc',
       'browser/ui/webui/chromeos/bluetooth_pairing_ui.h',
       'browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc',
@@ -1838,8 +1605,6 @@
       'browser/ui/webui/chromeos/slow_ui.h',
       'browser/ui/webui/chromeos/ui_account_tweaks.cc',
       'browser/ui/webui/chromeos/ui_account_tweaks.h',
-      'browser/ui/webui/chrome_web_contents_handler.cc',
-      'browser/ui/webui/chrome_web_contents_handler.h',
       'browser/ui/webui/chrome_web_ui_controller_factory.cc',
       'browser/ui/webui/chrome_web_ui_controller_factory.h',
       'browser/ui/webui/components_ui.cc',
@@ -1854,32 +1619,16 @@
       'browser/ui/webui/crashes_ui.h',
       'browser/ui/webui/devtools_ui.cc',
       'browser/ui/webui/devtools_ui.h',
-      'browser/ui/webui/downloads_dom_handler.cc',
-      'browser/ui/webui/downloads_dom_handler.h',
-      'browser/ui/webui/downloads_ui.cc',
-      'browser/ui/webui/downloads_ui.h',
       'browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc',
       'browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h',
-      'browser/ui/webui/extensions/command_handler.cc',
-      'browser/ui/webui/extensions/command_handler.h',
       'browser/ui/webui/extensions/extension_basic_info.cc',
       'browser/ui/webui/extensions/extension_basic_info.h',
-      'browser/ui/webui/extensions/extension_error_handler.cc',
-      'browser/ui/webui/extensions/extension_error_handler.h',
       'browser/ui/webui/extensions/extension_error_ui_util.cc',
       'browser/ui/webui/extensions/extension_error_ui_util.h',
       'browser/ui/webui/extensions/extension_icon_source.cc',
       'browser/ui/webui/extensions/extension_icon_source.h',
       'browser/ui/webui/extensions/extension_info_ui.cc',
       'browser/ui/webui/extensions/extension_info_ui.h',
-      'browser/ui/webui/extensions/extension_loader_handler.cc',
-      'browser/ui/webui/extensions/extension_loader_handler.h',
-      'browser/ui/webui/extensions/extension_settings_handler.cc',
-      'browser/ui/webui/extensions/extension_settings_handler.h',
-      'browser/ui/webui/extensions/extensions_ui.cc',
-      'browser/ui/webui/extensions/extensions_ui.h',
-      'browser/ui/webui/extensions/install_extension_handler.cc',
-      'browser/ui/webui/extensions/install_extension_handler.h',
       'browser/ui/webui/extensions/pack_extension_handler.cc',
       'browser/ui/webui/extensions/pack_extension_handler.h',
       'browser/ui/webui/favicon_source.cc',
@@ -1892,24 +1641,8 @@
       'browser/ui/webui/flash_ui.h',
       'browser/ui/webui/gcm_internals_ui.cc',
       'browser/ui/webui/gcm_internals_ui.h',
-      'browser/ui/webui/help/help_handler.cc',
-      'browser/ui/webui/help/help_handler.h',
-      'browser/ui/webui/help/help_ui.cc',
-      'browser/ui/webui/help/help_ui.h',
-      'browser/ui/webui/help/help_utils_chromeos.cc',
-      'browser/ui/webui/help/help_utils_chromeos.h',
-      'browser/ui/webui/help/version_updater_chromeos.cc',
-      'browser/ui/webui/help/version_updater_chromeos.h',
-      'browser/ui/webui/help/version_updater.h',
-      'browser/ui/webui/help/version_updater_mac.h',
-      'browser/ui/webui/help/version_updater_mac.mm',
-      'browser/ui/webui/help/version_updater_win.cc',
       'browser/ui/webui/history_ui.cc',
       'browser/ui/webui/history_ui.h',
-      'browser/ui/webui/identity_internals_ui.cc',
-      'browser/ui/webui/identity_internals_ui.h',
-      'browser/ui/webui/inspect_ui.cc',
-      'browser/ui/webui/inspect_ui.h',
       'browser/ui/webui/instant_ui.cc',
       'browser/ui/webui/instant_ui.h',
       'browser/ui/webui/invalidations_message_handler.cc',
@@ -1933,222 +1666,30 @@
       'browser/ui/webui/net_export_ui.h',
       'browser/ui/webui/net_internals/net_internals_ui.cc',
       'browser/ui/webui/net_internals/net_internals_ui.h',
-      'browser/ui/webui/ntp/app_launcher_handler.cc',
-      'browser/ui/webui/ntp/app_launcher_handler.h',
-      'browser/ui/webui/ntp/app_resource_cache_factory.cc',
-      'browser/ui/webui/ntp/app_resource_cache_factory.h',
-      'browser/ui/webui/ntp/core_app_launcher_handler.cc',
-      'browser/ui/webui/ntp/core_app_launcher_handler.h',
-      'browser/ui/webui/ntp/favicon_webui_handler.cc',
-      'browser/ui/webui/ntp/favicon_webui_handler.h',
-      'browser/ui/webui/ntp/foreign_session_handler.cc',
-      'browser/ui/webui/ntp/foreign_session_handler.h',
-      'browser/ui/webui/ntp/most_visited_handler.cc',
-      'browser/ui/webui/ntp/most_visited_handler.h',
-      'browser/ui/webui/ntp/new_tab_page_handler.cc',
-      'browser/ui/webui/ntp/new_tab_page_handler.h',
-      'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
-      'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
-      'browser/ui/webui/ntp/new_tab_ui.cc',
-      'browser/ui/webui/ntp/new_tab_ui.h',
-      'browser/ui/webui/ntp/ntp_login_handler.cc',
-      'browser/ui/webui/ntp/ntp_login_handler.h',
-      'browser/ui/webui/ntp/ntp_resource_cache.cc',
-      'browser/ui/webui/ntp/ntp_resource_cache_factory.cc',
-      'browser/ui/webui/ntp/ntp_resource_cache_factory.h',
-      'browser/ui/webui/ntp/ntp_resource_cache.h',
-      'browser/ui/webui/ntp/ntp_stats.h',
-      'browser/ui/webui/ntp/ntp_user_data_logger.cc',
-      'browser/ui/webui/ntp/ntp_user_data_logger.h',
-      'browser/ui/webui/ntp/recently_closed_tabs_handler.cc',
-      'browser/ui/webui/ntp/recently_closed_tabs_handler.h',
-      'browser/ui/webui/ntp/suggestions_combiner.cc',
-      'browser/ui/webui/ntp/suggestions_combiner.h',
-      'browser/ui/webui/ntp/suggestions_page_handler.cc',
-      'browser/ui/webui/ntp/suggestions_page_handler.h',
-      'browser/ui/webui/ntp/suggestions_source.h',
-      'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
-      'browser/ui/webui/ntp/suggestions_source_top_sites.h',
-      'browser/ui/webui/ntp/thumbnail_source.cc',
-      'browser/ui/webui/ntp/thumbnail_source.h',
       'browser/ui/webui/omnibox/omnibox_ui.cc',
       'browser/ui/webui/omnibox/omnibox_ui.h',
       'browser/ui/webui/omnibox/omnibox_ui_handler.cc',
       'browser/ui/webui/omnibox/omnibox_ui_handler.h',
-      'browser/ui/webui/options/advanced_options_utils.h',
-      'browser/ui/webui/options/advanced_options_utils_linux.cc',
-      'browser/ui/webui/options/advanced_options_utils_mac.mm',
-      'browser/ui/webui/options/advanced_options_utils_win.cc',
-      'browser/ui/webui/options/autofill_options_handler.cc',
-      'browser/ui/webui/options/autofill_options_handler.h',
-      'browser/ui/webui/options/automatic_settings_reset_handler.cc',
-      'browser/ui/webui/options/automatic_settings_reset_handler.h',
-      'browser/ui/webui/options/browser_options_handler.cc',
-      'browser/ui/webui/options/browser_options_handler.h',
-      'browser/ui/webui/options/chromeos/accounts_options_handler.cc',
-      'browser/ui/webui/options/chromeos/accounts_options_handler.h',
-      'browser/ui/webui/options/chromeos/bluetooth_options_handler.cc',
-      'browser/ui/webui/options/chromeos/bluetooth_options_handler.h',
-      'browser/ui/webui/options/chromeos/change_picture_options_handler.cc',
-      'browser/ui/webui/options/chromeos/change_picture_options_handler.h',
-      'browser/ui/webui/options/chromeos/consumer_management_handler.cc',
-      'browser/ui/webui/options/chromeos/consumer_management_handler.h',
-      'browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc',
-      'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
-      'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
-      'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
-      'browser/ui/webui/options/chromeos/date_time_options_handler.cc',
-      'browser/ui/webui/options/chromeos/date_time_options_handler.h',
-      'browser/ui/webui/options/chromeos/display_options_handler.cc',
-      'browser/ui/webui/options/chromeos/display_options_handler.h',
-      'browser/ui/webui/options/chromeos/display_overscan_handler.cc',
-      'browser/ui/webui/options/chromeos/display_overscan_handler.h',
-      'browser/ui/webui/options/chromeos/internet_options_handler.cc',
-      'browser/ui/webui/options/chromeos/internet_options_handler.h',
-      'browser/ui/webui/options/chromeos/internet_options_handler_strings.cc',
-      'browser/ui/webui/options/chromeos/internet_options_handler_strings.h',
-      'browser/ui/webui/options/chromeos/keyboard_handler.cc',
-      'browser/ui/webui/options/chromeos/keyboard_handler.h',
-      'browser/ui/webui/options/chromeos/pointer_handler.cc',
-      'browser/ui/webui/options/chromeos/pointer_handler.h',
-      'browser/ui/webui/options/chromeos/proxy_handler.cc',
-      'browser/ui/webui/options/chromeos/proxy_handler.h',
-      'browser/ui/webui/options/chromeos/stats_options_handler.cc',
-      'browser/ui/webui/options/chromeos/stats_options_handler.h',
-      'browser/ui/webui/options/chromeos/user_image_source.cc',
-      'browser/ui/webui/options/chromeos/user_image_source.h',
-      'browser/ui/webui/options/clear_browser_data_handler.cc',
-      'browser/ui/webui/options/clear_browser_data_handler.h',
-      'browser/ui/webui/options/content_settings_handler.cc',
-      'browser/ui/webui/options/content_settings_handler.h',
-      'browser/ui/webui/options/cookies_view_handler.cc',
-      'browser/ui/webui/options/cookies_view_handler.h',
-      'browser/ui/webui/options/core_options_handler.cc',
-      'browser/ui/webui/options/core_options_handler.h',
-      'browser/ui/webui/options/create_profile_handler.cc',
-      'browser/ui/webui/options/create_profile_handler.h',
-      'browser/ui/webui/options/font_settings_handler.cc',
-      'browser/ui/webui/options/font_settings_handler.h',
-      'browser/ui/webui/options/font_settings_utils.h',
-      'browser/ui/webui/options/font_settings_utils_linux.cc',
-      'browser/ui/webui/options/font_settings_utils_mac.mm',
-      'browser/ui/webui/options/font_settings_utils_win.cc',
-      'browser/ui/webui/options/handler_options_handler.cc',
-      'browser/ui/webui/options/handler_options_handler.h',
-      'browser/ui/webui/options/home_page_overlay_handler.cc',
-      'browser/ui/webui/options/home_page_overlay_handler.h',
-      'browser/ui/webui/options/import_data_handler.cc',
-      'browser/ui/webui/options/import_data_handler.h',
-      'browser/ui/webui/options/language_dictionary_overlay_handler.cc',
-      'browser/ui/webui/options/language_dictionary_overlay_handler.h',
-      'browser/ui/webui/options/language_options_handler.cc',
-      'browser/ui/webui/options/language_options_handler_common.cc',
-      'browser/ui/webui/options/language_options_handler_common.h',
-      'browser/ui/webui/options/language_options_handler.h',
-      'browser/ui/webui/options/managed_user_create_confirm_handler.cc',
-      'browser/ui/webui/options/managed_user_create_confirm_handler.h',
-      'browser/ui/webui/options/managed_user_import_handler.cc',
-      'browser/ui/webui/options/managed_user_import_handler.h',
-      'browser/ui/webui/options/managed_user_learn_more_handler.cc',
-      'browser/ui/webui/options/managed_user_learn_more_handler.h',
-      'browser/ui/webui/options/manage_profile_handler.cc',
-      'browser/ui/webui/options/manage_profile_handler.h',
-      'browser/ui/webui/options/media_devices_selection_handler.cc',
-      'browser/ui/webui/options/media_devices_selection_handler.h',
-      'browser/ui/webui/options/options_handlers_helper.cc',
-      'browser/ui/webui/options/options_handlers_helper.h',
-      'browser/ui/webui/options/options_ui.cc',
-      'browser/ui/webui/options/options_ui.h',
-      'browser/ui/webui/options/password_manager_handler.cc',
-      'browser/ui/webui/options/password_manager_handler.h',
-      'browser/ui/webui/options/pepper_flash_content_settings_utils.cc',
-      'browser/ui/webui/options/pepper_flash_content_settings_utils.h',
-      'browser/ui/webui/options/reset_profile_settings_handler.cc',
-      'browser/ui/webui/options/reset_profile_settings_handler.h',
-      'browser/ui/webui/options/search_engine_manager_handler.cc',
-      'browser/ui/webui/options/search_engine_manager_handler.h',
-      'browser/ui/webui/options/startup_pages_handler.cc',
-      'browser/ui/webui/options/startup_pages_handler.h',
       'browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc',
       'browser/ui/webui/password_manager_internals/password_manager_internals_ui.h',
-      'browser/ui/webui/performance_monitor/performance_monitor_handler.cc',
-      'browser/ui/webui/performance_monitor/performance_monitor_handler.h',
-      'browser/ui/webui/performance_monitor/performance_monitor_l10n.cc',
-      'browser/ui/webui/performance_monitor/performance_monitor_l10n.h',
-      'browser/ui/webui/performance_monitor/performance_monitor_ui.cc',
-      'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.cc',
-      'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.h',
-      'browser/ui/webui/performance_monitor/performance_monitor_ui.h',
       'browser/ui/webui/performance_monitor/performance_monitor_ui_util.cc',
       'browser/ui/webui/performance_monitor/performance_monitor_ui_util.h',
-      'browser/ui/webui/plugins_ui.cc',
-      'browser/ui/webui/plugins_ui.h',
       'browser/ui/webui/predictors/predictors_handler.cc',
       'browser/ui/webui/predictors/predictors_handler.h',
       'browser/ui/webui/predictors/predictors_ui.cc',
       'browser/ui/webui/predictors/predictors_ui.h',
       'browser/ui/webui/profiler_ui.cc',
       'browser/ui/webui/profiler_ui.h',
-      'browser/ui/webui/quota_internals/quota_internals_handler.cc',
-      'browser/ui/webui/quota_internals/quota_internals_handler.h',
-      'browser/ui/webui/quota_internals/quota_internals_proxy.cc',
-      'browser/ui/webui/quota_internals/quota_internals_proxy.h',
-      'browser/ui/webui/quota_internals/quota_internals_types.cc',
-      'browser/ui/webui/quota_internals/quota_internals_types.h',
-      'browser/ui/webui/quota_internals/quota_internals_ui.cc',
-      'browser/ui/webui/quota_internals/quota_internals_ui.h',
-      'browser/ui/webui/signin/inline_login_handler.cc',
-      'browser/ui/webui/signin/inline_login_handler.h',
-      'browser/ui/webui/signin/inline_login_handler_impl.cc',
-      'browser/ui/webui/signin/inline_login_handler_impl.h',
-      'browser/ui/webui/signin/inline_login_ui.cc',
-      'browser/ui/webui/signin/inline_login_ui.h',
-      'browser/ui/webui/signin_internals_ui.cc',
-      'browser/ui/webui/signin_internals_ui.h',
-      'browser/ui/webui/signin/login_ui_service.cc',
-      'browser/ui/webui/signin/login_ui_service_factory.cc',
-      'browser/ui/webui/signin/login_ui_service_factory.h',
-      'browser/ui/webui/signin/login_ui_service.h',
-      'browser/ui/webui/signin/profile_signin_confirmation_dialog.cc',
-      'browser/ui/webui/signin/profile_signin_confirmation_dialog.h',
-      'browser/ui/webui/signin/profile_signin_confirmation_ui.cc',
-      'browser/ui/webui/signin/profile_signin_confirmation_ui.h',
-      'browser/ui/webui/signin/user_manager_screen_handler.cc',
-      'browser/ui/webui/signin/user_manager_screen_handler.h',
-      'browser/ui/webui/signin/user_manager_ui.cc',
-      'browser/ui/webui/signin/user_manager_ui.h',
-      'browser/ui/webui/suggestions_internals/suggestions_internals_ui.cc',
-      'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',
-      'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',
-      'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h',
-      'browser/ui/webui/sync_file_system_internals/dump_database_handler.cc',
-      'browser/ui/webui/sync_file_system_internals/dump_database_handler.h',
-      'browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc',
-      'browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h',
-      'browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc',
-      'browser/ui/webui/sync_file_system_internals/file_metadata_handler.h',
-      'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc',
-      'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h',
-      'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.cc',
-      'browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h',
       'browser/ui/webui/sync_internals_message_handler.cc',
       'browser/ui/webui/sync_internals_message_handler.h',
       'browser/ui/webui/sync_internals_ui.cc',
       'browser/ui/webui/sync_internals_ui.h',
-      'browser/ui/webui/sync_setup_handler.cc',
-      'browser/ui/webui/sync_setup_handler.h',
-      'browser/ui/webui/system_info_ui.cc',
-      'browser/ui/webui/system_info_ui.h',
-      'browser/ui/webui/theme_handler.cc',
-      'browser/ui/webui/theme_handler.h',
       'browser/ui/webui/theme_source.cc',
       'browser/ui/webui/theme_source.h',
       'browser/ui/webui/translate_internals/translate_internals_handler.cc',
       'browser/ui/webui/translate_internals/translate_internals_handler.h',
       'browser/ui/webui/translate_internals/translate_internals_ui.cc',
       'browser/ui/webui/translate_internals/translate_internals_ui.h',
-      'browser/ui/webui/uber/uber_ui.cc',
-      'browser/ui/webui/uber/uber_ui.h',
       'browser/ui/webui/user_actions/user_actions_ui.cc',
       'browser/ui/webui/user_actions/user_actions_ui.h',
       'browser/ui/webui/user_actions/user_actions_ui_handler.cc',
@@ -2299,7 +1840,7 @@
       'browser/ui/autofill/autofill_dialog_common.h',
     ],
     # Autofill sources used on desktop and ChromeOS.
-    'chrome_browser_ui_autofill_dialog_desktop_sources': [
+    'chrome_browser_ui_autofill_dialog_non_mobile_sources': [
       'browser/ui/autofill/autofill_dialog_controller_impl.cc',
       'browser/ui/autofill/autofill_dialog_controller_impl.h',
       'browser/ui/autofill/autofill_dialog_i18n_input.cc',
@@ -2318,7 +1859,8 @@
       'browser/ui/crypto_module_password_dialog_nss.cc',
       'browser/ui/crypto_module_password_dialog_nss.h',
     ],
-    'chrome_browser_ui_google_now_sources': [
+    'chrome_browser_ui_google_now_non_android_sources': [
+      # These are non-Android because Android excludes all of options.
       'browser/ui/webui/options/geolocation_options_handler.cc',
       'browser/ui/webui/options/geolocation_options_handler.h',
     ],
@@ -2352,12 +1894,20 @@
       'browser/ui/views/uninstall_view.cc',
       'browser/ui/views/uninstall_view.h',
     ],
-    'chrome_browser_ui_non_win_sources': [
+    'chrome_browser_ui_mac_sources': [
+      'browser/ui/startup/session_crashed_bubble.cc',
       'browser/ui/startup/autolaunch_prompt.cc',
     ],
     'chrome_browser_ui_non_mac_sources': [
-      'browser/ui/tabs/tab_resources.cc',
-      'browser/ui/tabs/tab_resources.h',
+    ],
+    # Files used only on desktop systems (not iOS, Android, ChromeOS).
+    'chrome_browser_ui_desktop_sources': [
+      'browser/ui/webui/signin/inline_login_handler_impl.cc',
+      'browser/ui/webui/signin/inline_login_handler_impl.h',
+      'browser/ui/webui/signin/user_manager_screen_handler.cc',
+      'browser/ui/webui/signin/user_manager_screen_handler.h',
+      'browser/ui/webui/signin/user_manager_ui.cc',
+      'browser/ui/webui/signin/user_manager_ui.h',
     ],
     # ChromeOS-only sources that don't end in _chromeos or live in a chromeos
     # directory.
@@ -2409,87 +1959,257 @@
       'browser/ui/views/javascript_app_modal_event_blocker_x11.h',
       'browser/ui/views/screen_capture_notification_ui_views.cc',
       'browser/ui/views/tabs/window_finder_x11.cc',
-      'browser/ui/webui/signin/inline_login_handler_impl.cc',
-      'browser/ui/webui/signin/inline_login_handler_impl.h',
-      'browser/ui/webui/signin/user_manager_screen_handler.cc',
-      'browser/ui/webui/signin/user_manager_screen_handler.h',
-      'browser/ui/webui/signin/user_manager_ui.cc',
-      'browser/ui/webui/signin/user_manager_ui.h',
     ],
     'chrome_browser_ui_android_sources': [
       'browser/ui/auto_login_infobar_delegate.cc',
       'browser/ui/auto_login_infobar_delegate.h',
     ],
     'chrome_browser_ui_non_android_sources': [
-      'browser/ui/window_sizer/window_sizer.cc',
-      'browser/ui/window_sizer/window_sizer.h',
-    ],
-    # These files are removed from the main list of files on Android.
-    'chrome_browser_ui_android_excluded_sources': [
       'browser/ui/apps/chrome_app_window_delegate.cc',
+      'browser/ui/apps/chrome_app_window_delegate.h',
       'browser/ui/autofill/account_chooser_model.cc',
+      'browser/ui/autofill/account_chooser_model.h',
       'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
+      'browser/ui/autofill/autofill_dialog_sign_in_delegate.h',
       'browser/ui/autofill/country_combobox_model.cc',
+      'browser/ui/autofill/country_combobox_model.h',
+      'browser/ui/autofill/generated_credit_card_bubble_controller.cc',
+      'browser/ui/autofill/generated_credit_card_bubble_controller.h',
+      'browser/ui/autofill/generated_credit_card_bubble_view.cc',
+      'browser/ui/autofill/generated_credit_card_bubble_view.h',
+      'browser/ui/autofill/new_credit_card_bubble_controller.cc',
+      '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/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_delegate.cc',
+      'browser/ui/bookmarks/bookmark_tab_helper_delegate.h',
       'browser/ui/browser.cc',
+      'browser/ui/browser.h',
       'browser/ui/browser_command_controller.cc',
+      'browser/ui/browser_command_controller.h',
       'browser/ui/browser_content_setting_bubble_model_delegate.cc',
+      'browser/ui/browser_content_setting_bubble_model_delegate.h',
       'browser/ui/browser_finder.cc',
+      'browser/ui/browser_finder.h',
       'browser/ui/browser_iterator.cc',
+      'browser/ui/browser_iterator.h',
       'browser/ui/browser_list.cc',
+      'browser/ui/browser_list.h',
       'browser/ui/browser_otr_state.cc',
-      'browser/ui/browser_tabrestore.cc',
+      'browser/ui/browser_otr_state.h',
       'browser/ui/browser_tab_restore_service_delegate.cc',
+      'browser/ui/browser_tab_restore_service_delegate.h',
+      'browser/ui/browser_tab_strip_model_delegate.cc',
+      'browser/ui/browser_tab_strip_model_delegate.h',
+      'browser/ui/browser_tabrestore.cc',
+      'browser/ui/browser_tabrestore.h',
       'browser/ui/browser_tabstrip.cc',
       'browser/ui/browser_tabstrip.h',
-      'browser/ui/browser_tab_strip_model_delegate.cc',
       'browser/ui/browser_toolbar_model_delegate.cc',
+      'browser/ui/browser_toolbar_model_delegate.h',
       'browser/ui/browser_view_prefs.cc',
+      'browser/ui/browser_view_prefs.h',
       'browser/ui/chrome_pages.cc',
       'browser/ui/chrome_pages.h',
       'browser/ui/chrome_style.cc',
+      'browser/ui/chrome_style.h',
       'browser/ui/chrome_web_modal_dialog_manager_delegate.cc',
+      'browser/ui/chrome_web_modal_dialog_manager_delegate.h',
       'browser/ui/collected_cookies_infobar_delegate.cc',
+      'browser/ui/collected_cookies_infobar_delegate.h',
       'browser/ui/confirm_bubble_model.cc',
-      'browser/ui/crypto_module_password_dialog_openssl.cc',
+      'browser/ui/confirm_bubble_model.h',
+      'browser/ui/content_settings/content_setting_bubble_model.cc',
+      'browser/ui/content_settings/content_setting_bubble_model.h',
+      'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
+      'browser/ui/content_settings/content_setting_image_model.cc',
+      'browser/ui/content_settings/content_setting_image_model.h',
+      'browser/ui/content_settings/content_setting_media_menu_model.cc',
+      'browser/ui/content_settings/content_setting_media_menu_model.h',
+      'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
+      'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
       'browser/ui/elide_url.cc',
+      'browser/ui/elide_url.h',
       'browser/ui/extensions/application_launch.cc',
+      'browser/ui/extensions/application_launch.h',
       'browser/ui/extensions/extension_install_ui_default.cc',
       'browser/ui/extensions/extension_install_ui_default.h',
       'browser/ui/fast_unload_controller.cc',
+      'browser/ui/fast_unload_controller.h',
       'browser/ui/find_bar/find_bar_controller.cc',
+      'browser/ui/find_bar/find_bar_controller.h',
       'browser/ui/fullscreen/fullscreen_controller.cc',
+      'browser/ui/fullscreen/fullscreen_controller.h',
       'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc',
+      'browser/ui/fullscreen/fullscreen_exit_bubble_type.h',
       'browser/ui/ntp_background_util.cc',
       'browser/ui/ntp_background_util.h',
+      'browser/ui/omnibox/alternate_nav_infobar_delegate.cc',
+      'browser/ui/omnibox/alternate_nav_infobar_delegate.h',
+      'browser/ui/omnibox/location_bar.cc',
+      'browser/ui/omnibox/location_bar.h',
+      'browser/ui/omnibox/location_bar_util.cc',
+      'browser/ui/omnibox/location_bar_util.h',
+      'browser/ui/omnibox/omnibox_controller.cc',
+      'browser/ui/omnibox/omnibox_controller.h',
+      'browser/ui/omnibox/omnibox_current_page_delegate.h',
+      'browser/ui/omnibox/omnibox_current_page_delegate_impl.cc',
+      'browser/ui/omnibox/omnibox_current_page_delegate_impl.h',
+      'browser/ui/omnibox/omnibox_edit_controller.cc',
+      'browser/ui/omnibox/omnibox_edit_controller.h',
+      'browser/ui/omnibox/omnibox_edit_model.cc',
+      'browser/ui/omnibox/omnibox_edit_model.h',
+      'browser/ui/omnibox/omnibox_navigation_observer.cc',
+      'browser/ui/omnibox/omnibox_navigation_observer.h',
+      'browser/ui/omnibox/omnibox_popup_model.cc',
+      'browser/ui/omnibox/omnibox_popup_model.h',
+      'browser/ui/omnibox/omnibox_popup_model_observer.h',
+      'browser/ui/omnibox/omnibox_popup_view.h',
       'browser/ui/options/options_util.cc',
+      'browser/ui/options/options_util.h',
+      'browser/ui/panels/detached_panel_collection.cc',
+      'browser/ui/panels/detached_panel_collection.h',
+      'browser/ui/panels/detached_panel_drag_handler.cc',
+      'browser/ui/panels/detached_panel_drag_handler.h',
+      'browser/ui/panels/display_settings_provider.cc',
+      'browser/ui/panels/display_settings_provider.h',
+      'browser/ui/panels/docked_panel_collection.cc',
+      'browser/ui/panels/docked_panel_collection.h',
+      'browser/ui/panels/docked_panel_drag_handler.cc',
+      'browser/ui/panels/docked_panel_drag_handler.h',
+      'browser/ui/panels/native_panel.h',
+      'browser/ui/panels/native_panel_stack_window.h',
+      'browser/ui/panels/panel.cc',
+      'browser/ui/panels/panel.h',
+      'browser/ui/panels/panel_bounds_animation.cc',
+      'browser/ui/panels/panel_bounds_animation.h',
+      'browser/ui/panels/panel_collection.cc',
+      'browser/ui/panels/panel_collection.h',
+      'browser/ui/panels/panel_constants.h',
+      'browser/ui/panels/panel_drag_controller.cc',
+      'browser/ui/panels/panel_drag_controller.h',
+      'browser/ui/panels/panel_host.cc',
+      'browser/ui/panels/panel_host.h',
+      'browser/ui/panels/panel_manager.cc',
+      'browser/ui/panels/panel_manager.h',
+      'browser/ui/panels/panel_mouse_watcher.cc',
+      'browser/ui/panels/panel_mouse_watcher.h',
+      'browser/ui/panels/panel_mouse_watcher_observer.h',
+      'browser/ui/panels/panel_mouse_watcher_timer.cc',
+      'browser/ui/panels/panel_resize_controller.cc',
+      'browser/ui/panels/panel_resize_controller.h',
+      'browser/ui/panels/stacked_panel_collection.cc',
+      'browser/ui/panels/stacked_panel_collection.h',
+      'browser/ui/panels/stacked_panel_drag_handler.cc',
+      'browser/ui/panels/stacked_panel_drag_handler.h',
+      'browser/ui/pdf/open_pdf_in_reader_prompt_delegate.h',
+      'browser/ui/pdf/pdf_tab_helper.cc',
+      'browser/ui/pdf/pdf_tab_helper.h',
+      'browser/ui/pdf/pdf_unsupported_feature.cc',
+      'browser/ui/pdf/pdf_unsupported_feature.h',
       'browser/ui/sad_tab.cc',
+      'browser/ui/sad_tab.h',
       'browser/ui/sad_tab_helper.cc',
-      'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
-      'browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc',
+      'browser/ui/sad_tab_helper.h',
+      'browser/ui/sad_tab_types.h',
       'browser/ui/search/search_delegate.cc',
+      'browser/ui/search/search_delegate.h',
       'browser/ui/search/search_ui.cc',
-      'browser/ui/send_feedback_experiment.cc',
+      '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/search_engines/template_url_fetcher_ui_callbacks.cc',
+      'browser/ui/search_engines/template_url_fetcher_ui_callbacks.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.cc',
+      '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',
+      'browser/ui/startup/obsolete_system_infobar_delegate.h',
+      'browser/ui/startup/session_crashed_bubble.h',
+      'browser/ui/startup/session_crashed_infobar_delegate.cc',
+      'browser/ui/startup/session_crashed_infobar_delegate.h',
+      'browser/ui/startup/startup_browser_creator.cc',
+      'browser/ui/startup/startup_browser_creator.h',
+      'browser/ui/startup/startup_browser_creator_impl.cc',
+      'browser/ui/startup/startup_browser_creator_impl.h',
+      'browser/ui/startup/startup_tab.cc',
+      'browser/ui/startup/startup_tab.h',
+      'browser/ui/startup/startup_types.h',
       'browser/ui/sync/browser_synced_window_delegate.cc',
+      'browser/ui/sync/browser_synced_window_delegate.h',
       'browser/ui/tab_contents/tab_contents_iterator.cc',
+      'browser/ui/tab_contents/tab_contents_iterator.h',
       'browser/ui/tab_modal_confirm_dialog_delegate.cc',
+      'browser/ui/tab_modal_confirm_dialog_delegate.h',
+      'browser/ui/tabs/hover_tab_selector.cc',
+      'browser/ui/tabs/hover_tab_selector.h',
+      'browser/ui/tabs/pinned_tab_codec.cc',
+      'browser/ui/tabs/pinned_tab_codec.h',
+      'browser/ui/tabs/pinned_tab_service.cc',
+      'browser/ui/tabs/pinned_tab_service.h',
+      'browser/ui/tabs/pinned_tab_service_factory.cc',
+      'browser/ui/tabs/pinned_tab_service_factory.h',
+      'browser/ui/tabs/tab_menu_model.cc',
+      'browser/ui/tabs/tab_menu_model.h',
+      'browser/ui/tabs/tab_resources.cc',
+      'browser/ui/tabs/tab_resources.h',
+      'browser/ui/tabs/tab_strip_model.cc',
+      'browser/ui/tabs/tab_strip_model.h',
+      'browser/ui/tabs/tab_strip_model_delegate.h',
+      'browser/ui/tabs/tab_strip_model_observer.cc',
+      'browser/ui/tabs/tab_strip_model_observer.h',
+      'browser/ui/tabs/tab_strip_model_order_controller.cc',
+      'browser/ui/tabs/tab_strip_model_order_controller.h',
+      'browser/ui/tabs/tab_strip_model_utils.cc',
+      'browser/ui/tabs/tab_strip_model_utils.h',
+      'browser/ui/toolbar/back_forward_menu_model.cc',
+      'browser/ui/toolbar/back_forward_menu_model.h',
+      'browser/ui/toolbar/bookmark_sub_menu_model.cc',
+      'browser/ui/toolbar/bookmark_sub_menu_model.h',
+      'browser/ui/toolbar/encoding_menu_controller.cc',
+      'browser/ui/toolbar/encoding_menu_controller.h',
+      'browser/ui/toolbar/origin_chip_info.cc',
+      'browser/ui/toolbar/origin_chip_info.h',
+      'browser/ui/toolbar/recent_tabs_sub_menu_model.cc',
+      'browser/ui/toolbar/recent_tabs_sub_menu_model.h',
+      'browser/ui/toolbar/wrench_icon_painter.cc',
+      'browser/ui/toolbar/wrench_icon_painter.h',
+      'browser/ui/toolbar/wrench_menu_model.cc',
+      'browser/ui/toolbar/wrench_menu_model.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/website_settings/permission_menu_model.cc',
+      'browser/ui/website_settings/permission_menu_model.h',
       'browser/ui/website_settings/website_settings_utils.cc',
+      'browser/ui/website_settings/website_settings_utils.h',
       'browser/ui/webui/app_launcher_page_ui.cc',
       'browser/ui/webui/app_launcher_page_ui.h',
       'browser/ui/webui/bookmarks_ui.cc',
       '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/downloads_dom_handler.cc',
+      'browser/ui/webui/downloads_dom_handler.h',
+      'browser/ui/webui/downloads_ui.cc',
+      'browser/ui/webui/downloads_ui.h',
       'browser/ui/webui/extensions/command_handler.cc',
+      'browser/ui/webui/extensions/command_handler.h',
       'browser/ui/webui/extensions/extension_error_handler.cc',
       'browser/ui/webui/extensions/extension_error_handler.h',
       'browser/ui/webui/extensions/extension_loader_handler.cc',
@@ -2497,22 +2217,189 @@
       'browser/ui/webui/extensions/extension_settings_handler.cc',
       'browser/ui/webui/extensions/extension_settings_handler.h',
       'browser/ui/webui/extensions/extensions_ui.cc',
+      'browser/ui/webui/extensions/extensions_ui.h',
       'browser/ui/webui/extensions/install_extension_handler.cc',
+      'browser/ui/webui/extensions/install_extension_handler.h',
+      'browser/ui/webui/help/help_handler.cc',
+      'browser/ui/webui/help/help_handler.h',
+      'browser/ui/webui/help/help_ui.cc',
+      'browser/ui/webui/help/help_ui.h',
+      'browser/ui/webui/help/help_utils_chromeos.cc',
+      'browser/ui/webui/help/help_utils_chromeos.h',
+      'browser/ui/webui/help/version_updater.h',
+      'browser/ui/webui/help/version_updater_chromeos.cc',
+      'browser/ui/webui/help/version_updater_chromeos.h',
+      'browser/ui/webui/help/version_updater_mac.h',
+      'browser/ui/webui/help/version_updater_mac.mm',
+      'browser/ui/webui/help/version_updater_win.cc',
       'browser/ui/webui/identity_internals_ui.cc',
       'browser/ui/webui/identity_internals_ui.h',
       'browser/ui/webui/inspect_ui.cc',
       'browser/ui/webui/inspect_ui.h',
-      # Android uses native UI for sync setup.
+      'browser/ui/webui/ntp/app_launcher_handler.cc',
+      'browser/ui/webui/ntp/app_launcher_handler.h',
+      'browser/ui/webui/ntp/app_resource_cache_factory.cc',
+      'browser/ui/webui/ntp/app_resource_cache_factory.h',
+      'browser/ui/webui/ntp/core_app_launcher_handler.cc',
+      'browser/ui/webui/ntp/core_app_launcher_handler.h',
+      'browser/ui/webui/ntp/favicon_webui_handler.cc',
+      'browser/ui/webui/ntp/favicon_webui_handler.h',
+      'browser/ui/webui/ntp/foreign_session_handler.cc',
+      'browser/ui/webui/ntp/foreign_session_handler.h',
+      'browser/ui/webui/ntp/most_visited_handler.cc',
+      'browser/ui/webui/ntp/most_visited_handler.h',
+      'browser/ui/webui/ntp/new_tab_page_handler.cc',
+      'browser/ui/webui/ntp/new_tab_page_handler.h',
       'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
       'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
+      'browser/ui/webui/ntp/new_tab_ui.cc',
+      'browser/ui/webui/ntp/new_tab_ui.h',
       'browser/ui/webui/ntp/ntp_login_handler.cc',
       'browser/ui/webui/ntp/ntp_login_handler.h',
+      'browser/ui/webui/ntp/ntp_resource_cache.cc',
+      'browser/ui/webui/ntp/ntp_resource_cache.h',
+      'browser/ui/webui/ntp/ntp_resource_cache_factory.cc',
+      'browser/ui/webui/ntp/ntp_resource_cache_factory.h',
+      'browser/ui/webui/ntp/ntp_stats.h',
+      'browser/ui/webui/ntp/ntp_user_data_logger.cc',
+      'browser/ui/webui/ntp/ntp_user_data_logger.h',
+      'browser/ui/webui/ntp/recently_closed_tabs_handler.cc',
+      'browser/ui/webui/ntp/recently_closed_tabs_handler.h',
+      'browser/ui/webui/ntp/suggestions_combiner.cc',
+      'browser/ui/webui/ntp/suggestions_combiner.h',
+      'browser/ui/webui/ntp/suggestions_page_handler.cc',
+      'browser/ui/webui/ntp/suggestions_page_handler.h',
+      'browser/ui/webui/ntp/suggestions_source.h',
+      'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
+      'browser/ui/webui/ntp/suggestions_source_top_sites.h',
+      'browser/ui/webui/ntp/thumbnail_source.cc',
+      'browser/ui/webui/ntp/thumbnail_source.h',
+      'browser/ui/webui/options/advanced_options_utils.h',
+      'browser/ui/webui/options/advanced_options_utils_linux.cc',
+      'browser/ui/webui/options/advanced_options_utils_mac.mm',
+      'browser/ui/webui/options/advanced_options_utils_win.cc',
+      'browser/ui/webui/options/autofill_options_handler.cc',
+      'browser/ui/webui/options/autofill_options_handler.h',
+      'browser/ui/webui/options/automatic_settings_reset_handler.cc',
+      'browser/ui/webui/options/automatic_settings_reset_handler.h',
+      'browser/ui/webui/options/browser_options_handler.cc',
+      'browser/ui/webui/options/browser_options_handler.h',
+      'browser/ui/webui/options/chromeos/accounts_options_handler.cc',
+      'browser/ui/webui/options/chromeos/accounts_options_handler.h',
+      'browser/ui/webui/options/chromeos/bluetooth_options_handler.cc',
+      'browser/ui/webui/options/chromeos/bluetooth_options_handler.h',
+      'browser/ui/webui/options/chromeos/change_picture_options_handler.cc',
+      'browser/ui/webui/options/chromeos/change_picture_options_handler.h',
+      'browser/ui/webui/options/chromeos/consumer_management_handler.cc',
+      'browser/ui/webui/options/chromeos/consumer_management_handler.h',
+      'browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc',
+      'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
+      'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
+      'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
+      'browser/ui/webui/options/chromeos/date_time_options_handler.cc',
+      'browser/ui/webui/options/chromeos/date_time_options_handler.h',
+      'browser/ui/webui/options/chromeos/display_options_handler.cc',
+      'browser/ui/webui/options/chromeos/display_options_handler.h',
+      'browser/ui/webui/options/chromeos/display_overscan_handler.cc',
+      'browser/ui/webui/options/chromeos/display_overscan_handler.h',
+      'browser/ui/webui/options/chromeos/internet_options_handler.cc',
+      'browser/ui/webui/options/chromeos/internet_options_handler.h',
+      'browser/ui/webui/options/chromeos/internet_options_handler_strings.cc',
+      'browser/ui/webui/options/chromeos/internet_options_handler_strings.h',
+      'browser/ui/webui/options/chromeos/keyboard_handler.cc',
+      'browser/ui/webui/options/chromeos/keyboard_handler.h',
+      'browser/ui/webui/options/chromeos/pointer_handler.cc',
+      'browser/ui/webui/options/chromeos/pointer_handler.h',
+      'browser/ui/webui/options/chromeos/proxy_handler.cc',
+      'browser/ui/webui/options/chromeos/proxy_handler.h',
+      'browser/ui/webui/options/chromeos/stats_options_handler.cc',
+      'browser/ui/webui/options/chromeos/stats_options_handler.h',
+      'browser/ui/webui/options/chromeos/user_image_source.cc',
+      'browser/ui/webui/options/chromeos/user_image_source.h',
+      'browser/ui/webui/options/clear_browser_data_handler.cc',
+      'browser/ui/webui/options/clear_browser_data_handler.h',
+      'browser/ui/webui/options/content_settings_handler.cc',
+      'browser/ui/webui/options/content_settings_handler.h',
+      'browser/ui/webui/options/cookies_view_handler.cc',
+      'browser/ui/webui/options/cookies_view_handler.h',
+      'browser/ui/webui/options/core_options_handler.cc',
+      'browser/ui/webui/options/core_options_handler.h',
+      'browser/ui/webui/options/create_profile_handler.cc',
+      'browser/ui/webui/options/create_profile_handler.h',
+      'browser/ui/webui/options/font_settings_handler.cc',
+      'browser/ui/webui/options/font_settings_handler.h',
+      'browser/ui/webui/options/font_settings_utils.h',
+      'browser/ui/webui/options/font_settings_utils_linux.cc',
+      'browser/ui/webui/options/font_settings_utils_mac.mm',
+      'browser/ui/webui/options/font_settings_utils_win.cc',
+      'browser/ui/webui/options/handler_options_handler.cc',
+      'browser/ui/webui/options/handler_options_handler.h',
+      'browser/ui/webui/options/home_page_overlay_handler.cc',
+      'browser/ui/webui/options/home_page_overlay_handler.h',
+      'browser/ui/webui/options/import_data_handler.cc',
+      'browser/ui/webui/options/import_data_handler.h',
+      'browser/ui/webui/options/language_dictionary_overlay_handler.cc',
+      'browser/ui/webui/options/language_dictionary_overlay_handler.h',
+      'browser/ui/webui/options/language_options_handler.cc',
+      'browser/ui/webui/options/language_options_handler.h',
+      'browser/ui/webui/options/language_options_handler_common.cc',
+      'browser/ui/webui/options/language_options_handler_common.h',
+      'browser/ui/webui/options/manage_profile_handler.cc',
+      'browser/ui/webui/options/manage_profile_handler.h',
+      'browser/ui/webui/options/managed_user_create_confirm_handler.cc',
+      'browser/ui/webui/options/managed_user_create_confirm_handler.h',
+      'browser/ui/webui/options/managed_user_import_handler.cc',
+      'browser/ui/webui/options/managed_user_import_handler.h',
+      'browser/ui/webui/options/managed_user_learn_more_handler.cc',
+      'browser/ui/webui/options/managed_user_learn_more_handler.h',
+      'browser/ui/webui/options/media_devices_selection_handler.cc',
+      'browser/ui/webui/options/media_devices_selection_handler.h',
+      'browser/ui/webui/options/options_handlers_helper.cc',
+      'browser/ui/webui/options/options_handlers_helper.h',
+      'browser/ui/webui/options/options_ui.cc',
+      'browser/ui/webui/options/options_ui.h',
+      'browser/ui/webui/options/password_manager_handler.cc',
+      'browser/ui/webui/options/password_manager_handler.h',
+      'browser/ui/webui/options/pepper_flash_content_settings_utils.cc',
+      'browser/ui/webui/options/pepper_flash_content_settings_utils.h',
+      'browser/ui/webui/options/reset_profile_settings_handler.cc',
+      'browser/ui/webui/options/reset_profile_settings_handler.h',
+      'browser/ui/webui/options/search_engine_manager_handler.cc',
+      'browser/ui/webui/options/search_engine_manager_handler.h',
+      'browser/ui/webui/options/startup_pages_handler.cc',
+      'browser/ui/webui/options/startup_pages_handler.h',
       'browser/ui/webui/performance_monitor/performance_monitor_handler.cc',
+      'browser/ui/webui/performance_monitor/performance_monitor_handler.h',
       'browser/ui/webui/performance_monitor/performance_monitor_l10n.cc',
+      'browser/ui/webui/performance_monitor/performance_monitor_l10n.h',
       'browser/ui/webui/performance_monitor/performance_monitor_ui.cc',
+      'browser/ui/webui/performance_monitor/performance_monitor_ui.h',
       'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.cc',
+      'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.h',
       'browser/ui/webui/plugins_ui.cc',
       'browser/ui/webui/plugins_ui.h',
+      'browser/ui/webui/quota_internals/quota_internals_handler.cc',
+      'browser/ui/webui/quota_internals/quota_internals_handler.h',
+      'browser/ui/webui/quota_internals/quota_internals_proxy.cc',
+      'browser/ui/webui/quota_internals/quota_internals_proxy.h',
+      'browser/ui/webui/quota_internals/quota_internals_types.cc',
+      'browser/ui/webui/quota_internals/quota_internals_types.h',
+      'browser/ui/webui/quota_internals/quota_internals_ui.cc',
+      'browser/ui/webui/quota_internals/quota_internals_ui.h',
+      'browser/ui/webui/signin/inline_login_handler.cc',
+      'browser/ui/webui/signin/inline_login_handler.h',
+      'browser/ui/webui/signin/inline_login_ui.cc',
+      'browser/ui/webui/signin/inline_login_ui.h',
+      'browser/ui/webui/signin/login_ui_service.cc',
+      'browser/ui/webui/signin/login_ui_service.h',
+      'browser/ui/webui/signin/login_ui_service_factory.cc',
+      'browser/ui/webui/signin/login_ui_service_factory.h',
+      'browser/ui/webui/signin/profile_signin_confirmation_dialog.cc',
+      'browser/ui/webui/signin/profile_signin_confirmation_dialog.h',
+      'browser/ui/webui/signin/profile_signin_confirmation_ui.cc',
+      'browser/ui/webui/signin/profile_signin_confirmation_ui.h',
+      'browser/ui/webui/signin_internals_ui.cc',
+      'browser/ui/webui/signin_internals_ui.h',
       'browser/ui/webui/suggestions_internals/suggestions_internals_ui.cc',
       'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',
       'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',
@@ -2532,6 +2419,11 @@
       'browser/ui/webui/system_info_ui.cc',
       'browser/ui/webui/system_info_ui.h',
       'browser/ui/webui/theme_handler.cc',
+      'browser/ui/webui/theme_handler.h',
+      'browser/ui/webui/uber/uber_ui.cc',
+      'browser/ui/webui/uber/uber_ui.h',
+      'browser/ui/window_sizer/window_sizer.cc',
+      'browser/ui/window_sizer/window_sizer.h',
     ],
     'chrome_browser_ui_print_preview_sources': [
       'browser/ui/webui/print_preview/print_preview_handler.cc',
@@ -2586,9 +2478,6 @@
       'browser/ui/views/session_crashed_bubble_view.h',
       'browser/ui/views/simple_message_box_views.cc',
     ],
-    'chrome_browser_ui_non_views_sources': [
-      'browser/ui/startup/session_crashed_bubble.cc',
-    ],
     # Cross-platform aura sources.
     'chrome_browser_ui_aura_sources': [
       'browser/ui/webui/gesture_config_ui.cc',
@@ -2607,6 +2496,7 @@
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
+      'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/views/apps/chrome_app_window_delegate_views.cc',
       'browser/ui/views/frame/taskbar_decorator.cc',
       'browser/ui/webui/certificate_viewer_ui.cc',
@@ -2814,8 +2704,6 @@
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
-        }, {
-          'sources': [ '<@(chrome_browser_ui_non_views_sources)' ],
         }],
         ['toolkit_views==1 and chromeos==0', {
           'sources': [ '<@(chrome_browser_ui_message_center_sources)' ],
@@ -2828,6 +2716,9 @@
             '../build/linux/system.gyp:gio',
           ],
         }],
+        ['OS=="win" or OS=="mac" or desktop_linux==1', {
+          'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
+        }],
         ['chromeos==1 or OS=="android"', {
           'sources': [ '<@(chrome_browser_ui_android_chromeos_sources)' ],
         }],
@@ -2876,40 +2767,15 @@
              'chrome_browser_ui_views.gyp:browser_ui_views',
           ],
           'sources': [ '<@(chrome_browser_ui_android_sources)' ],
-          'sources!': [
-            '<@(chrome_browser_ui_android_excluded_sources)',
-          ],
-          'sources/': [
-            ['exclude', '^browser/ui/autofill/.*credit_card_bubble.*'],
-            ['exclude', '^browser/ui/content_settings/'],
-            ['exclude', '^browser/ui/omnibox/'],
-            ['include', '^browser/ui/omnibox/omnibox_view\\.(cc|h)$'],
-            ['exclude', '^browser/ui/panels/'],
-            ['exclude', '^browser/ui/pdf/'],
-            ['exclude', '^browser/ui/startup/'],
-            ['exclude', '^browser/ui/tabs/'],
-            ['include', '^browser/ui/tabs/tab_utils\\.(cc|h)$'],
-            ['exclude', '^browser/ui/toolbar/'],
-            ['include', '^browser/ui/toolbar/toolbar_model\\.(cc|h)$'],
-            ['include', '^browser/ui/toolbar/toolbar_model_delegate\\.(cc|h)$'],
-            ['include', '^browser/ui/toolbar/toolbar_model_impl\\.(cc|h)$'],
-            ['include', '^browser/ui/toolbar/toolbar_model_security_level_list\\.h$'],
-            ['exclude', '^browser/ui/webui/downloads_'],
-            ['exclude', '^browser/ui/webui/feedback_'],
-            ['exclude', '^browser/ui/webui/help/'],
-            ['exclude', '^browser/ui/webui/inspect_'],
-            ['exclude', '^browser/ui/webui/ntp'],
-            ['exclude', '^browser/ui/webui/options'],
-            ['exclude', '^browser/ui/webui/options'],
-	    ['exclude', '^browser/ui/webui/quota_internals'],
-            ['exclude', '^browser/ui/webui/signin/'],
-            ['exclude', '^browser/ui/webui/uber'],
-          ],
         }, {  # Non-Android
           'sources': [ '<@(chrome_browser_ui_non_android_sources)' ],
         }],
         ['OS=="mac"', {
+          'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
           'sources!': [
+            # Mac has its own way of drawing tabs.
+            'browser/ui/tabs/tab_resources.cc',
+            'browser/ui/tabs/tab_resources.h',
             'browser/ui/views/extensions/extension_view_views.cc',
             'browser/ui/views/extensions/extension_view_views.h',
           ],
@@ -2979,7 +2845,6 @@
             }],
           ],
         }, {  # 'OS!="win"
-          'sources': [ '<@(chrome_browser_ui_non_win_sources)' ],
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
@@ -3038,7 +2903,7 @@
           'conditions': [
             ['OS!="android" and OS!="ios"', {
               'sources': [
-                '<@(chrome_browser_ui_autofill_dialog_desktop_sources)',
+                '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
               ],
               'dependencies': [
                 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
@@ -3047,8 +2912,8 @@
             }],
           ],
         }],
-        ['enable_google_now==1', {
-          'sources': [ '<@(chrome_browser_ui_google_now_sources)' ],
+        ['enable_google_now==1 and OS!="android"', {
+          'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ],
         }],
         ['enable_webrtc==1', {
           'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ],