Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / chrome_browser_ui.gypi

diff --git a/src/chrome/chrome_browser_ui.gypi b/src/chrome/chrome_browser_ui.gypi
index 9fe2ed9..1b82807 100644 (file)
--- a/src/chrome/chrome_browser_ui.gypi
+++ b/src/chrome/chrome_browser_ui.gypi
@@ -28,12 +28,14 @@
         'in_memory_url_index_cache_proto',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
-        'feedback_proto',
-        '../components/component_strings.gyp:component_strings',
         '../components/components.gyp:auto_login_parser',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
+        '../components/components.gyp:feedback_proto',
         '../components/components.gyp:onc_component',
+        '../components/components.gyp:password_manager_core_browser',
+        '../components/components_resources.gyp:components_resources',
+        '../components/components_strings.gyp:components_strings',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -46,15 +48,16 @@
         '../third_party/libusb/libusb.gyp:libusb',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/base/ui_base.gyp:ui_base',
+        '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/native_theme/native_theme.gyp:native_theme',
-        '../ui/snapshot/snapshot.gyp:snapshot',
-        '../ui/ui.gyp:ui',
         '../ui/resources/ui_resources.gyp:ui_resources',
-        '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '../ui/snapshot/snapshot.gyp:snapshot',
       ],
       'include_dirs': [
         '..',
@@ -70,26 +73,30 @@
         # All .cc, .h, .m, and .mm files under browser/ui except for:
         # * tests and mocks.
         'browser/ui/accelerator_utils.h',
-        'browser/ui/alternate_error_tab_observer.cc',
-        'browser/ui/alternate_error_tab_observer.h',
         'browser/ui/android/android_about_app_info.cc',
         'browser/ui/android/android_about_app_info.h',
         'browser/ui/android/autofill/autofill_dialog_controller_android.cc',
         'browser/ui/android/autofill/autofill_dialog_controller_android.h',
         'browser/ui/android/autofill/autofill_dialog_result.cc',
         'browser/ui/android/autofill/autofill_dialog_result.h',
+        'browser/ui/android/autofill/autofill_logger_android.cc',
+        'browser/ui/android/autofill/autofill_logger_android.h',
         'browser/ui/android/autofill/autofill_popup_view_android.cc',
         'browser/ui/android/autofill/autofill_popup_view_android.h',
         'browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc',
         'browser/ui/android/content_settings/popup_blocked_infobar_delegate.h',
         'browser/ui/android/infobars/auto_login_infobar_delegate_android.cc',
         'browser/ui/android/infobars/auto_login_infobar_delegate_android.h',
+        'browser/ui/android/infobars/auto_login_prompter.cc',
+        'browser/ui/android/infobars/auto_login_prompter.h',
         'browser/ui/android/infobars/confirm_infobar.cc',
         'browser/ui/android/infobars/confirm_infobar.h',
         'browser/ui/android/infobars/infobar_android.cc',
         'browser/ui/android/infobars/infobar_android.h',
         'browser/ui/android/infobars/infobar_container_android.cc',
         'browser/ui/android/infobars/infobar_container_android.h',
+        'browser/ui/android/infobars/save_password_infobar.cc',
+        'browser/ui/android/infobars/save_password_infobar.h',
         'browser/ui/android/infobars/translate_infobar.cc',
         'browser/ui/android/infobars/translate_infobar.h',
         'browser/ui/android/certificate_viewer_android.cc',
@@ -128,26 +135,28 @@
         'browser/ui/app_list/app_context_menu.cc',
         'browser/ui/app_list/app_context_menu.h',
         'browser/ui/app_list/app_context_menu_delegate.h',
-        'browser/ui/app_list/app_list.h',
         'browser/ui/app_list/app_list_controller_delegate.cc',
         'browser/ui/app_list/app_list_controller_delegate.h',
         'browser/ui/app_list/app_list_controller_delegate_impl.cc',
         'browser/ui/app_list/app_list_controller_delegate_impl.h',
-        'browser/ui/app_list/app_list_factory.h',
+        'browser/ui/app_list/app_list_controller_delegate_views.cc',
+        'browser/ui/app_list/app_list_controller_delegate_views.h',
         'browser/ui/app_list/app_list_icon_win.cc',
         'browser/ui/app_list/app_list_icon_win.h',
         'browser/ui/app_list/app_list_positioner.cc',
         'browser/ui/app_list/app_list_positioner.h',
         'browser/ui/app_list/app_list_service.cc',
         'browser/ui/app_list/app_list_service.h',
-        'browser/ui/app_list/app_list_service_ash.h',
         'browser/ui/app_list/app_list_service_disabled.cc',
         'browser/ui/app_list/app_list_service_impl.cc',
         'browser/ui/app_list/app_list_service_impl.h',
         'browser/ui/app_list/app_list_service_mac.h',
         'browser/ui/app_list/app_list_service_mac.mm',
-        'browser/ui/app_list/app_list_shower.cc',
-        'browser/ui/app_list/app_list_shower.h',
+        'browser/ui/app_list/app_list_service_views.cc',
+        'browser/ui/app_list/app_list_service_views.h',
+        'browser/ui/app_list/app_list_shower_delegate.h',
+        'browser/ui/app_list/app_list_shower_views.cc',
+        'browser/ui/app_list/app_list_shower_views.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',
@@ -166,15 +175,14 @@
         'browser/ui/app_list/extension_uninstaller.h',
         'browser/ui/app_list/fast_show_pickler.cc',
         'browser/ui/app_list/fast_show_pickler.h',
-        'browser/ui/app_list/keep_alive_service.h',
-        'browser/ui/app_list/keep_alive_service_impl.cc',
-        'browser/ui/app_list/keep_alive_service_impl.h',
         'browser/ui/app_list/profile_loader.cc',
         'browser/ui/app_list/profile_loader.h',
         'browser/ui/app_list/profile_store.h',
         'browser/ui/app_list/recommended_apps.cc',
         'browser/ui/app_list/recommended_apps.h',
         'browser/ui/app_list/recommended_apps_observer.h',
+        'browser/ui/app_list/scoped_keep_alive.cc',
+        'browser/ui/app_list/scoped_keep_alive.h',
         'browser/ui/app_list/search/app_result.cc',
         'browser/ui/app_list/search/app_result.h',
         'browser/ui/app_list/search/app_search_provider.cc',
@@ -234,6 +242,8 @@
         'browser/ui/app_list/start_page_observer.h',
         'browser/ui/app_list/start_page_service.cc',
         'browser/ui/app_list/start_page_service.h',
+        'browser/ui/app_list/start_page_service_factory.cc',
+        'browser/ui/app_list/start_page_service_factory.h',
         'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog.h',
         'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc',
@@ -243,19 +253,25 @@
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc',
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
-        'browser/ui/apps/app_metro_infobar_delegate_win.cc',
-        'browser/ui/apps/app_metro_infobar_delegate_win.h',
+        '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_shell_window_delegate.cc',
-        'browser/ui/apps/chrome_shell_window_delegate.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_views.cc',
+        'browser/ui/ash/accessibility/automation_manager_views.h',
+        'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc',
+        'browser/ui/ash/accessibility/ax_root_obj_wrapper.h',
+        'browser/ui/ash/accessibility/ax_tree_source_views.cc',
+        'browser/ui/ash/accessibility/ax_tree_source_views.h',
         'browser/ui/ash/ash_keyboard_controller_proxy.cc',
         'browser/ui/ash/ash_keyboard_controller_proxy.h',
-        'browser/ui/ash/app_list/app_list_controller_ash.h',
         'browser/ui/ash/app_list/app_list_controller_ash.cc',
+        'browser/ui/ash/app_list/app_list_controller_ash.h',
         'browser/ui/ash/app_list/app_list_service_ash.cc',
+        'browser/ui/ash/app_list/app_list_service_ash.h',
         'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',
         'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',
         'browser/ui/ash/app_sync_ui_state.cc',
@@ -267,10 +283,6 @@
         'browser/ui/ash/ash_init.h',
         'browser/ui/ash/ash_util.cc',
         'browser/ui/ash/ash_util.h',
-        'browser/ui/ash/caps_lock_delegate_chromeos.cc',
-        'browser/ui/ash/caps_lock_delegate_chromeos.h',
-        'browser/ui/ash/caps_lock_delegate_views.cc',
-        'browser/ui/ash/caps_lock_delegate_views.h',
         'browser/ui/ash/chrome_launcher_prefs.cc',
         'browser/ui/ash/chrome_launcher_prefs.h',
         'browser/ui/ash/chrome_new_window_delegate.cc',
@@ -281,12 +293,14 @@
         'browser/ui/ash/chrome_shell_delegate.h',
         'browser/ui/ash/chrome_shell_delegate_chromeos.cc',
         'browser/ui/ash/chrome_shell_delegate_views.cc',
-        'browser/ui/ash/event_rewriter.cc',
-        'browser/ui/ash/event_rewriter.h',
         'browser/ui/ash/ime_controller_chromeos.cc',
         'browser/ui/ash/ime_controller_chromeos.h',
         'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc',
         'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h',
+        'browser/ui/ash/launcher/app_window_launcher_item_controller.cc',
+        'browser/ui/ash/launcher/app_window_launcher_item_controller.h',
+        'browser/ui/ash/launcher/app_window_launcher_controller.cc',
+        'browser/ui/ash/launcher/app_window_launcher_controller.h',
         'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc',
         'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h',
         'browser/ui/ash/launcher/browser_status_monitor.cc',
@@ -315,14 +329,12 @@
         'browser/ui/ash/launcher/launcher_item_controller.h',
         'browser/ui/ash/launcher/launcher_item_util.cc',
         'browser/ui/ash/launcher/launcher_item_util.h',
+        'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc',
+        'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h',
         'browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc',
         'browser/ui/ash/launcher/multi_profile_browser_status_monitor.h',
-        'browser/ui/ash/launcher/multi_profile_shell_window_launcher_controller.cc',
-        'browser/ui/ash/launcher/multi_profile_shell_window_launcher_controller.h',
-        'browser/ui/ash/launcher/shell_window_launcher_item_controller.cc',
-        'browser/ui/ash/launcher/shell_window_launcher_item_controller.h',
-        'browser/ui/ash/launcher/shell_window_launcher_controller.cc',
-        'browser/ui/ash/launcher/shell_window_launcher_controller.h',
+        'browser/ui/ash/media_delegate_chromeos.cc',
+        'browser/ui/ash/media_delegate_chromeos.h',
         'browser/ui/ash/multi_user/multi_user_context_menu.cc',
         'browser/ui/ash/multi_user/multi_user_context_menu.h',
         'browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc',
@@ -330,27 +342,28 @@
         'browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h',
         'browser/ui/ash/multi_user/multi_user_util.cc',
         'browser/ui/ash/multi_user/multi_user_util.h',
+        'browser/ui/ash/multi_user/multi_user_warning_dialog.cc',
+        'browser/ui/ash/multi_user/multi_user_warning_dialog.h',
         'browser/ui/ash/multi_user/multi_user_window_manager.cc',
         'browser/ui/ash/multi_user/multi_user_window_manager.h',
         'browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc',
         'browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h',
         'browser/ui/ash/multi_user/multi_user_window_manager_stub.cc',
         'browser/ui/ash/multi_user/multi_user_window_manager_stub.h',
+        'browser/ui/ash/multi_user/user_switch_animator_chromeos.cc',
+        'browser/ui/ash/multi_user/user_switch_animator_chromeos.h',
         'browser/ui/ash/screenshot_taker.cc',
         'browser/ui/ash/screenshot_taker.h',
         'browser/ui/ash/session_state_delegate_chromeos.cc',
         'browser/ui/ash/session_state_delegate_chromeos.h',
         'browser/ui/ash/session_state_delegate_views.cc',
         'browser/ui/ash/session_state_delegate_views.h',
+        'browser/ui/ash/stub_user_accounts_delegate.cc',
+        'browser/ui/ash/stub_user_accounts_delegate.h',
         'browser/ui/ash/system_tray_delegate_chromeos.cc',
         'browser/ui/ash/system_tray_delegate_chromeos.h',
         'browser/ui/ash/system_tray_delegate_win.cc',
         'browser/ui/ash/system_tray_delegate_win.h',
-        'browser/ui/ash/tabs/dock_info_ash.cc',
-        'browser/ui/ash/tabs/dock_info_ash.h',
-        'browser/ui/ash/tabs/dock_info_chromeos.cc',
-        'browser/ui/ash/user_action_handler.cc',
-        'browser/ui/ash/user_action_handler.h',
         'browser/ui/ash/user_wallpaper_delegate_win.cc',
         'browser/ui/ash/user_wallpaper_delegate_win.h',
         'browser/ui/ash/volume_controller_chromeos.cc',
@@ -361,7 +374,6 @@
         '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/aura/tabs/dock_info_auralinux.cc',
         'browser/ui/autofill/account_chooser_model.cc',
         'browser/ui/autofill/account_chooser_model.h',
         'browser/ui/autofill/autofill_dialog_common.cc',
@@ -404,6 +416,7 @@
         'browser/ui/autofill/password_generation_popup_controller_impl.h',
         'browser/ui/autofill/password_generation_popup_controller.h',
         'browser/ui/autofill/password_generation_popup_observer.h',
+        'browser/ui/autofill/password_generation_popup_view.cc',
         'browser/ui/autofill/password_generation_popup_view.h',
         'browser/ui/autofill/popup_controller_common.cc',
         'browser/ui/autofill/popup_controller_common.h',
@@ -411,8 +424,6 @@
         'browser/ui/autofill/tab_autofill_manager_delegate.h',
         'browser/ui/auto_login_infobar_delegate.cc',
         'browser/ui/auto_login_infobar_delegate.h',
-        'browser/ui/auto_login_prompter.cc',
-        'browser/ui/auto_login_prompter.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',
@@ -429,8 +440,6 @@
         'browser/ui/bookmarks/bookmark_drag_drop.h',
         'browser/ui/bookmarks/bookmark_editor.cc',
         'browser/ui/bookmarks/bookmark_editor.h',
-        'browser/ui/bookmarks/bookmark_prompt_controller.cc',
-        'browser/ui/bookmarks/bookmark_prompt_controller.h',
         'browser/ui/bookmarks/bookmark_tab_helper.cc',
         'browser/ui/bookmarks/bookmark_tab_helper.h',
         'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc',
@@ -471,8 +480,6 @@
         'browser/ui/browser_otr_state.h',
         'browser/ui/browser_ui_prefs.cc',
         'browser/ui/browser_ui_prefs.h',
-        'browser/ui/browser_tab_contents.h',
-        'browser/ui/browser_tab_contents.cc',
         'browser/ui/browser_tab_restore_service_delegate.cc',
         'browser/ui/browser_tab_restore_service_delegate.h',
         'browser/ui/browser_tab_strip_model_delegate.cc',
@@ -530,11 +537,14 @@
         'browser/ui/cocoa/applescript/tab_applescript.mm',
         'browser/ui/cocoa/applescript/window_applescript.h',
         'browser/ui/cocoa/applescript/window_applescript.mm',
+        'browser/ui/cocoa/apps/app_info_dialog_cocoa.mm',
         'browser/ui/cocoa/apps/app_shim_menu_controller_mac.h',
         'browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm',
-        'browser/ui/cocoa/apps/chrome_shell_window_delegate_cocoa.mm',
+        'browser/ui/cocoa/apps/chrome_app_window_delegate_cocoa.mm',
         'browser/ui/cocoa/apps/native_app_window_cocoa.h',
         'browser/ui/cocoa/apps/native_app_window_cocoa.mm',
+        'browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc',
+        'browser/ui/cocoa/apps/quit_with_apps_controller_mac.h',
         'browser/ui/cocoa/autofill/autofill_account_chooser.h',
         'browser/ui/cocoa/autofill/autofill_account_chooser.mm',
         'browser/ui/cocoa/autofill/autofill_details_container.h',
@@ -641,22 +651,10 @@
         'browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm',
         'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h',
         'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.mm',
-        'browser/ui/cocoa/browser/avatar_base_controller.h',
-        'browser/ui/cocoa/browser/avatar_base_controller.mm',
-        'browser/ui/cocoa/browser/avatar_button_controller.h',
-        'browser/ui/cocoa/browser/avatar_button_controller.mm',
-        'browser/ui/cocoa/browser/avatar_icon_controller.h',
-        'browser/ui/cocoa/browser/avatar_icon_controller.mm',
-        'browser/ui/cocoa/browser/avatar_label_button.h',
-        'browser/ui/cocoa/browser/avatar_label_button.mm',
-        'browser/ui/cocoa/browser/avatar_menu_bubble_controller.h',
-        'browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm',
         'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h',
         'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm',
         'browser/ui/cocoa/browser/password_generation_bubble_controller.h',
         'browser/ui/cocoa/browser/password_generation_bubble_controller.mm',
-        'browser/ui/cocoa/browser/profile_chooser_controller.h',
-        'browser/ui/cocoa/browser/profile_chooser_controller.mm',
         'browser/ui/cocoa/browser/zoom_bubble_controller.h',
         'browser/ui/cocoa/browser/zoom_bubble_controller.mm',
         'browser/ui/cocoa/browser_command_executor.h',
@@ -788,6 +786,10 @@
         'browser/ui/cocoa/extensions/extension_view_mac.mm',
         'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h',
         'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm',
+        'browser/ui/cocoa/extensions/media_gallery_list_entry_view.h',
+        'browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm',
+        'browser/ui/cocoa/extensions/media_galleries_scan_result_dialog_cocoa.h',
+        'browser/ui/cocoa/extensions/media_galleries_scan_result_dialog_cocoa.mm',
         'browser/ui/cocoa/extensions/windowed_install_dialog_controller.h',
         'browser/ui/cocoa/extensions/windowed_install_dialog_controller.mm',
         'browser/ui/cocoa/external_protocol_dialog.h',
@@ -907,6 +909,8 @@
         'browser/ui/cocoa/location_bar/location_icon_decoration.mm',
         'browser/ui/cocoa/location_bar/mic_search_decoration.h',
         'browser/ui/cocoa/location_bar/mic_search_decoration.mm',
+        'browser/ui/cocoa/location_bar/origin_chip_decoration.h',
+        'browser/ui/cocoa/location_bar/origin_chip_decoration.mm',
         'browser/ui/cocoa/location_bar/page_action_decoration.h',
         'browser/ui/cocoa/location_bar/page_action_decoration.mm',
         'browser/ui/cocoa/location_bar/search_button_decoration.h',
@@ -915,6 +919,8 @@
         'browser/ui/cocoa/location_bar/selected_keyword_decoration.mm',
         'browser/ui/cocoa/location_bar/star_decoration.h',
         'browser/ui/cocoa/location_bar/star_decoration.mm',
+        'browser/ui/cocoa/location_bar/translate_decoration.h',
+        'browser/ui/cocoa/location_bar/translate_decoration.mm',
         'browser/ui/cocoa/location_bar/zoom_decoration.h',
         'browser/ui/cocoa/location_bar/zoom_decoration.mm',
         'browser/ui/cocoa/login_prompt_cocoa.h',
@@ -934,15 +940,6 @@
         'browser/ui/cocoa/multi_key_equivalent_button.mm',
         'browser/ui/cocoa/new_tab_button.h',
         'browser/ui/cocoa/new_tab_button.mm',
-        'browser/ui/cocoa/notifications/balloon_collection_cocoa.mm',
-        'browser/ui/cocoa/notifications/balloon_controller.h',
-        'browser/ui/cocoa/notifications/balloon_controller.mm',
-        'browser/ui/cocoa/notifications/balloon_view.h',
-        'browser/ui/cocoa/notifications/balloon_view.mm',
-        'browser/ui/cocoa/notifications/balloon_view_bridge.h',
-        'browser/ui/cocoa/notifications/balloon_view_bridge.mm',
-        'browser/ui/cocoa/notifications/balloon_view_host_mac.h',
-        'browser/ui/cocoa/notifications/balloon_view_host_mac.mm',
         'browser/ui/cocoa/notifications/message_center_tray_bridge.h',
         'browser/ui/cocoa/notifications/message_center_tray_bridge.mm',
         'browser/ui/cocoa/nsmenuitem_additions.h',
@@ -981,8 +978,26 @@
         'browser/ui/cocoa/pdf_password_dialog.mm',
         'browser/ui/cocoa/presentation_mode_controller.h',
         'browser/ui/cocoa/presentation_mode_controller.mm',
-        'browser/ui/cocoa/profile_menu_controller.h',
-        'browser/ui/cocoa/profile_menu_controller.mm',
+        'browser/ui/cocoa/profiles/avatar_base_controller.h',
+        'browser/ui/cocoa/profiles/avatar_base_controller.mm',
+        'browser/ui/cocoa/profiles/avatar_button_controller.h',
+        'browser/ui/cocoa/profiles/avatar_button_controller.mm',
+        'browser/ui/cocoa/profiles/avatar_icon_controller.h',
+        'browser/ui/cocoa/profiles/avatar_icon_controller.mm',
+        'browser/ui/cocoa/profiles/avatar_label_button.h',
+        'browser/ui/cocoa/profiles/avatar_label_button.mm',
+        'browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h',
+        'browser/ui/cocoa/profiles/avatar_menu_bubble_controller.mm',
+        'browser/ui/cocoa/profiles/profile_chooser_controller.h',
+        'browser/ui/cocoa/profiles/profile_chooser_controller.mm',
+        'browser/ui/cocoa/profiles/profile_menu_controller.h',
+        'browser/ui/cocoa/profiles/profile_menu_controller.mm',
+        'browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h',
+        'browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.mm',
+        'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.h',
+        'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm',
+        'browser/ui/cocoa/profiles/user_manager_mac.h',
+        'browser/ui/cocoa/profiles/user_manager_mac.mm',
         'browser/ui/cocoa/rect_path_utils.h',
         'browser/ui/cocoa/rect_path_utils.mm',
         'browser/ui/cocoa/restart_browser.h',
@@ -990,9 +1005,8 @@
         'browser/ui/cocoa/screen_capture_notification_ui_cocoa.h',
         'browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm',
         'browser/ui/cocoa/simple_message_box_mac.mm',
-        'browser/ui/cocoa/speech_recognition_bubble_cocoa.mm',
-        'browser/ui/cocoa/speech_recognition_window_controller.h',
-        'browser/ui/cocoa/speech_recognition_window_controller.mm',
+        'browser/ui/cocoa/sprite_view.h',
+        'browser/ui/cocoa/sprite_view.mm',
         'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h',
         'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm',
         'browser/ui/cocoa/status_bubble_mac.h',
@@ -1005,18 +1019,14 @@
         'browser/ui/cocoa/styled_text_field.mm',
         'browser/ui/cocoa/styled_text_field_cell.h',
         'browser/ui/cocoa/styled_text_field_cell.mm',
-        'browser/ui/cocoa/profile_signin_confirmation_dialog_cocoa.h',
-        'browser/ui/cocoa/profile_signin_confirmation_dialog_cocoa.mm',
-        'browser/ui/cocoa/profile_signin_confirmation_view_controller.h',
-        'browser/ui/cocoa/profile_signin_confirmation_view_controller.mm',
+        'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h',
+        'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm',
         'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h',
         'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm',
         'browser/ui/cocoa/tab_contents/favicon_util_mac.h',
         'browser/ui/cocoa/tab_contents/favicon_util_mac.mm',
         'browser/ui/cocoa/tab_contents/overlayable_contents_controller.h',
         'browser/ui/cocoa/tab_contents/overlayable_contents_controller.mm',
-        'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h',
-        'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm',
         'browser/ui/cocoa/tab_contents/sad_tab_controller.h',
         'browser/ui/cocoa/tab_contents/sad_tab_controller.mm',
         'browser/ui/cocoa/tab_contents/sad_tab_view.h',
@@ -1029,9 +1039,6 @@
         'browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm',
         'browser/ui/cocoa/table_row_nsimage_cache.h',
         'browser/ui/cocoa/table_row_nsimage_cache.mm',
-        'browser/ui/cocoa/tabpose_window.h',
-        'browser/ui/cocoa/tabpose_window.mm',
-        'browser/ui/cocoa/tabs/dock_info_mac.cc',
         'browser/ui/cocoa/tabs/media_indicator_view.h',
         'browser/ui/cocoa/tabs/media_indicator_view.mm',
         'browser/ui/cocoa/tabs/tab_controller.h',
@@ -1048,8 +1055,6 @@
         'browser/ui/cocoa/tabs/tab_view.mm',
         'browser/ui/cocoa/tabs/tab_window_controller.h',
         'browser/ui/cocoa/tabs/tab_window_controller.mm',
-        'browser/ui/cocoa/tabs/throbber_view.h',
-        'browser/ui/cocoa/tabs/throbber_view.mm',
         'browser/ui/cocoa/task_manager_mac.h',
         'browser/ui/cocoa/task_manager_mac.mm',
         'browser/ui/cocoa/themed_window.h',
@@ -1066,12 +1071,12 @@
         'browser/ui/cocoa/toolbar/toolbar_view.mm',
         'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h',
         'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm',
+        'browser/ui/cocoa/translate/translate_bubble_controller.h',
+        'browser/ui/cocoa/translate/translate_bubble_controller.mm',
         'browser/ui/cocoa/ui_localizer.h',
         'browser/ui/cocoa/ui_localizer.mm',
         'browser/ui/cocoa/url_drop_target.h',
         'browser/ui/cocoa/url_drop_target.mm',
-        'browser/ui/cocoa/user_manager_mac.h',
-        'browser/ui/cocoa/user_manager_mac.mm',
         'browser/ui/cocoa/validation_message_bubble_cocoa.mm',
         'browser/ui/cocoa/validation_message_bubble_controller.h',
         'browser/ui/cocoa/vertical_gradient_view.h',
@@ -1082,8 +1087,18 @@
         'browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm',
         'browser/ui/cocoa/web_dialog_window_controller.h',
         'browser/ui/cocoa/web_dialog_window_controller.mm',
-        'browser/ui/cocoa/website_settings_bubble_controller.h',
-        'browser/ui/cocoa/website_settings_bubble_controller.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_selector_button.h',
+        'browser/ui/cocoa/website_settings/permission_selector_button.mm',
+        'browser/ui/cocoa/website_settings/split_block_button.h',
+        'browser/ui/cocoa/website_settings/split_block_button.mm',
+        'browser/ui/cocoa/website_settings/website_settings_bubble_controller.h',
+        'browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm',
+        'browser/ui/cocoa/website_settings/website_settings_utils_cocoa.h',
+        'browser/ui/cocoa/website_settings/website_settings_utils_cocoa.mm',
         'browser/ui/cocoa/window_restore_utils.h',
         'browser/ui/cocoa/window_restore_utils.mm',
         'browser/ui/cocoa/window_size_autosaver.h',
@@ -1117,6 +1132,8 @@
         'browser/ui/crypto_module_password_dialog.h',
         'browser/ui/crypto_module_password_dialog_nss.cc',
         'browser/ui/crypto_module_password_dialog_nss.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',
@@ -1145,6 +1162,8 @@
         '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',
         'browser/ui/gesture_prefs_observer_factory_aura.h',
         'browser/ui/global_error/global_error.cc',
@@ -1154,280 +1173,16 @@
         'browser/ui/global_error/global_error_service.h',
         'browser/ui/global_error/global_error_service_factory.cc',
         'browser/ui/global_error/global_error_service_factory.h',
-        'browser/ui/gtk/accelerator_utils_gtk.cc',
-        'browser/ui/gtk/accelerators_gtk.cc',
-        'browser/ui/gtk/accelerators_gtk.h',
-        'browser/ui/gtk/apps/chrome_shell_window_delegate_gtk.cc',
-        'browser/ui/gtk/apps/native_app_window_gtk.cc',
-        'browser/ui/gtk/apps/native_app_window_gtk.h',
-        'browser/ui/gtk/autofill/autofill_popup_view_gtk.cc',
-        'browser/ui/gtk/autofill/autofill_popup_view_gtk.h',
-        'browser/ui/gtk/avatar_menu_bubble_gtk.cc',
-        'browser/ui/gtk/avatar_menu_bubble_gtk.h',
-        'browser/ui/gtk/avatar_menu_button_gtk.cc',
-        'browser/ui/gtk/avatar_menu_button_gtk.h',
-        'browser/ui/gtk/avatar_menu_item_gtk.cc',
-        'browser/ui/gtk/avatar_menu_item_gtk.h',
-        'browser/ui/gtk/back_forward_button_gtk.cc',
-        'browser/ui/gtk/back_forward_button_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_bar_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_drag_drop_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_editor_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h',
-        'browser/ui/gtk/bookmarks/bookmark_tree_model.cc',
-        'browser/ui/gtk/bookmarks/bookmark_tree_model.h',
-        'browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc',
-        'browser/ui/gtk/bookmarks/bookmark_utils_gtk.h',
-        'browser/ui/gtk/browser_actions_toolbar_gtk.cc',
-        'browser/ui/gtk/browser_actions_toolbar_gtk.h',
-        'browser/ui/gtk/browser_titlebar.cc',
-        'browser/ui/gtk/browser_titlebar.h',
-        'browser/ui/gtk/browser_toolbar_gtk.cc',
-        'browser/ui/gtk/browser_toolbar_gtk.h',
-        'browser/ui/gtk/browser_window_gtk.cc',
-        'browser/ui/gtk/browser_window_gtk.h',
-        'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc',
-        'browser/ui/gtk/bubble/bubble_accelerators_gtk.h',
-        'browser/ui/gtk/bubble/bubble_gtk.cc',
-        'browser/ui/gtk/bubble/bubble_gtk.h',
-        'browser/ui/gtk/certificate_viewer_gtk.cc',
-        'browser/ui/gtk/chrome_browser_main_extra_parts_gtk.cc',
-        'browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h',
-        'browser/ui/gtk/chrome_gtk_frame.cc',
-        'browser/ui/gtk/chrome_gtk_frame.h',
-        'browser/ui/gtk/collected_cookies_gtk.cc',
-        'browser/ui/gtk/collected_cookies_gtk.h',
-        'browser/ui/gtk/confirm_bubble_gtk.cc',
-        'browser/ui/gtk/confirm_bubble_gtk.h',
-        'browser/ui/gtk/color_chooser_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',
-        'browser/ui/gtk/content_setting_bubble_gtk.h',
-        'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
-        'browser/ui/gtk/create_application_shortcuts_dialog_gtk.h',
-        'browser/ui/gtk/crypto_module_password_dialog_gtk.cc',
-        'browser/ui/gtk/custom_button.cc',
-        'browser/ui/gtk/custom_button.h',
-        'browser/ui/gtk/custom_drag.cc',
-        'browser/ui/gtk/custom_drag.h',
-        'browser/ui/gtk/download/download_in_progress_dialog_gtk.cc',
-        'browser/ui/gtk/download/download_in_progress_dialog_gtk.h',
-        'browser/ui/gtk/download/download_item_drag.cc',
-        'browser/ui/gtk/download/download_item_drag.h',
-        'browser/ui/gtk/download/download_item_gtk.cc',
-        'browser/ui/gtk/download/download_item_gtk.h',
-        'browser/ui/gtk/download/download_shelf_context_menu_gtk.cc',
-        'browser/ui/gtk/download/download_shelf_context_menu_gtk.h',
-        'browser/ui/gtk/download/download_shelf_gtk.cc',
-        'browser/ui/gtk/download/download_shelf_gtk.h',
-        'browser/ui/gtk/download/download_started_animation_gtk.cc',
-        'browser/ui/gtk/edit_search_engine_dialog.cc',
-        'browser/ui/gtk/edit_search_engine_dialog.h',
-        'browser/ui/gtk/event_utils.cc',
-        'browser/ui/gtk/event_utils.h',
-        'browser/ui/gtk/extensions/browser_action_test_util_gtk.cc',
-        'browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc',
-        'browser/ui/gtk/extensions/bundle_installed_bubble_gtk.h',
-        'browser/ui/gtk/extensions/extension_install_dialog_gtk.cc',
-        'browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc',
-        'browser/ui/gtk/extensions/extension_installed_bubble_gtk.h',
-        'browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc',
-        'browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h',
-        'browser/ui/gtk/extensions/extension_popup_gtk.cc',
-        'browser/ui/gtk/extensions/extension_popup_gtk.h',
-        'browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc',
-        'browser/ui/gtk/extensions/extension_view_gtk.cc',
-        'browser/ui/gtk/extensions/extension_view_gtk.h',
-        'browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc',
-        'browser/ui/gtk/extensions/media_galleries_dialog_gtk.h',
-        'browser/ui/gtk/find_bar_gtk.cc',
-        'browser/ui/gtk/find_bar_gtk.h',
-        'browser/ui/gtk/first_run_bubble.cc',
-        'browser/ui/gtk/first_run_bubble.h',
-        'browser/ui/gtk/first_run_dialog.cc',
-        'browser/ui/gtk/first_run_dialog.h',
-        'browser/ui/gtk/fullscreen_exit_bubble_gtk.cc',
-        'browser/ui/gtk/fullscreen_exit_bubble_gtk.h',
-        'browser/ui/gtk/gconf_titlebar_listener.cc',
-        'browser/ui/gtk/gconf_titlebar_listener.h',
-        'browser/ui/gtk/global_error_bubble.cc',
-        'browser/ui/gtk/global_error_bubble.h',
-        'browser/ui/gtk/global_history_menu.cc',
-        'browser/ui/gtk/global_history_menu.h',
-        'browser/ui/gtk/global_menu_bar.cc',
-        'browser/ui/gtk/global_menu_bar.h',
-        'browser/ui/gtk/gtk_chrome_button.cc',
-        'browser/ui/gtk/gtk_chrome_button.h',
-        'browser/ui/gtk/gtk_chrome_cookie_view.cc',
-        'browser/ui/gtk/gtk_chrome_cookie_view.h',
-        'browser/ui/gtk/gtk_chrome_link_button.cc',
-        'browser/ui/gtk/gtk_chrome_link_button.h',
-        'browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc',
-        'browser/ui/gtk/gtk_chrome_shrinkable_hbox.h',
-        'browser/ui/gtk/gtk_custom_menu.cc',
-        'browser/ui/gtk/gtk_custom_menu.h',
-        'browser/ui/gtk/gtk_custom_menu_item.cc',
-        'browser/ui/gtk/gtk_custom_menu_item.h',
-        'browser/ui/gtk/gtk_input_event_box.cc',
-        'browser/ui/gtk/gtk_input_event_box.h',
-        'browser/ui/gtk/gtk_theme_service.cc',
-        'browser/ui/gtk/gtk_theme_service.h',
-        'browser/ui/gtk/gtk_tree.cc',
-        'browser/ui/gtk/gtk_tree.h',
-        'browser/ui/gtk/gtk_util.cc',
-        'browser/ui/gtk/gtk_util.h',
-        'browser/ui/gtk/gtk_window_util.cc',
-        'browser/ui/gtk/gtk_window_util.h',
-        'browser/ui/gtk/hover_controller_gtk.cc',
-        'browser/ui/gtk/hover_controller_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',
-        'browser/ui/gtk/infobars/after_translate_infobar_gtk.cc',
-        'browser/ui/gtk/infobars/after_translate_infobar_gtk.h',
-        'browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc',
-        'browser/ui/gtk/infobars/alternate_nav_infobar_gtk.h',
-        'browser/ui/gtk/infobars/before_translate_infobar_gtk.cc',
-        'browser/ui/gtk/infobars/before_translate_infobar_gtk.h',
-        'browser/ui/gtk/infobars/confirm_infobar_gtk.cc',
-        'browser/ui/gtk/infobars/confirm_infobar_gtk.h',
-        'browser/ui/gtk/infobars/extension_infobar_gtk.cc',
-        'browser/ui/gtk/infobars/extension_infobar_gtk.h',
-        'browser/ui/gtk/infobars/infobar_container_gtk.cc',
-        'browser/ui/gtk/infobars/infobar_container_gtk.h',
-        'browser/ui/gtk/infobars/infobar_gtk.cc',
-        'browser/ui/gtk/infobars/infobar_gtk.h',
-        'browser/ui/gtk/infobars/translate_infobar_base_gtk.cc',
-        'browser/ui/gtk/infobars/translate_infobar_base_gtk.h',
-        'browser/ui/gtk/infobars/translate_message_infobar_gtk.cc',
-        'browser/ui/gtk/infobars/translate_message_infobar_gtk.h',
-        'browser/ui/gtk/javascript_app_modal_dialog_gtk.cc',
-        'browser/ui/gtk/javascript_app_modal_dialog_gtk.h',
-        'browser/ui/gtk/location_bar_view_gtk.cc',
-        'browser/ui/gtk/location_bar_view_gtk.h',
-        'browser/ui/gtk/login_prompt_gtk.cc',
-        'browser/ui/gtk/manage_passwords_bubble_gtk.cc',
-        'browser/ui/gtk/manage_passwords_bubble_gtk.h',
-        'browser/ui/gtk/menu_bar_helper.cc',
-        'browser/ui/gtk/menu_bar_helper.h',
-        'browser/ui/gtk/menu_gtk.cc',
-        'browser/ui/gtk/menu_gtk.h',
-        'browser/ui/gtk/nine_box.cc',
-        'browser/ui/gtk/nine_box.h',
-        'browser/ui/gtk/notifications/balloon_collection_gtk.cc',
-        'browser/ui/gtk/notifications/balloon_view_gtk.cc',
-        'browser/ui/gtk/notifications/balloon_view_gtk.h',
-        'browser/ui/gtk/notifications/balloon_view_host_gtk.cc',
-        'browser/ui/gtk/notifications/balloon_view_host_gtk.h',
-        'browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc',
-        'browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h',
-        'browser/ui/gtk/omnibox/omnibox_view_gtk.cc',
-        'browser/ui/gtk/omnibox/omnibox_view_gtk.h',
-        'browser/ui/gtk/one_click_signin_bubble_gtk.cc',
-        'browser/ui/gtk/one_click_signin_bubble_gtk.h',
-        'browser/ui/gtk/overflow_button.cc',
-        'browser/ui/gtk/overflow_button.h',
-        'browser/ui/gtk/panels/display_settings_provider_gtk.cc',
-        'browser/ui/gtk/panels/panel_drag_gtk.cc',
-        'browser/ui/gtk/panels/panel_drag_gtk.h',
-        'browser/ui/gtk/panels/panel_gtk.cc',
-        'browser/ui/gtk/panels/panel_gtk.h',
-        'browser/ui/gtk/panels/panel_stack_window_gtk.cc',
-        'browser/ui/gtk/panels/panel_stack_window_gtk.h',
-        'browser/ui/gtk/panels/panel_titlebar_gtk.cc',
-        'browser/ui/gtk/panels/panel_titlebar_gtk.h',
-        'browser/ui/gtk/password_generation_bubble_gtk.cc',
-        'browser/ui/gtk/password_generation_bubble_gtk.h',
-        'browser/ui/gtk/process_singleton_dialog.cc',
-        'browser/ui/gtk/protocol_dialog_gtk.cc',
-        'browser/ui/gtk/protocol_dialog_gtk.h',
-        'browser/ui/gtk/reload_button_gtk.cc',
-        'browser/ui/gtk/reload_button_gtk.h',
-        'browser/ui/gtk/rounded_window.cc',
-        'browser/ui/gtk/rounded_window.h',
-        'browser/ui/gtk/sad_tab_gtk.cc',
-        'browser/ui/gtk/sad_tab_gtk.h',
-        'browser/ui/gtk/screen_capture_notification_ui_gtk.cc',
-        'browser/ui/gtk/simple_message_box_gtk.cc',
-        'browser/ui/gtk/slide_animator_gtk.cc',
-        'browser/ui/gtk/slide_animator_gtk.h',
-        'browser/ui/gtk/speech_recognition_bubble_gtk.cc',
-        'browser/ui/gtk/ssl_client_certificate_selector.cc',
-        'browser/ui/gtk/status_bubble_gtk.cc',
-        'browser/ui/gtk/status_bubble_gtk.h',
-        'browser/ui/gtk/status_icons/status_icon_gtk.cc',
-        'browser/ui/gtk/status_icons/status_icon_gtk.h',
-        'browser/ui/gtk/status_icons/status_tray_gtk.cc',
-        'browser/ui/gtk/status_icons/status_tray_gtk.h',
-        'browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc',
-        'browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h',
-        'browser/ui/gtk/tab_contents/render_view_context_menu_gtk.cc',
-        'browser/ui/gtk/tab_contents/render_view_context_menu_gtk.h',
-        'browser/ui/gtk/tab_contents/web_drag_bookmark_handler_gtk.cc',
-        'browser/ui/gtk/tab_contents/web_drag_bookmark_handler_gtk.h',
-        'browser/ui/gtk/tab_contents_container_gtk.cc',
-        'browser/ui/gtk/tab_contents_container_gtk.h',
-        'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
-        'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
-        'browser/ui/gtk/tabs/dock_info_gtk.cc',
-        'browser/ui/gtk/tabs/drag_data.cc',
-        'browser/ui/gtk/tabs/drag_data.h',
-        'browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc',
-        'browser/ui/gtk/tabs/dragged_tab_controller_gtk.h',
-        'browser/ui/gtk/tabs/dragged_view_gtk.cc',
-        'browser/ui/gtk/tabs/dragged_view_gtk.h',
-        'browser/ui/gtk/tabs/tab_gtk.cc',
-        'browser/ui/gtk/tabs/tab_gtk.h',
-        'browser/ui/gtk/tabs/tab_renderer_gtk.cc',
-        'browser/ui/gtk/tabs/tab_renderer_gtk.h',
-        'browser/ui/gtk/tabs/tab_strip_gtk.cc',
-        'browser/ui/gtk/tabs/tab_strip_gtk.h',
-        'browser/ui/gtk/tabs/tab_strip_menu_controller.cc',
-        'browser/ui/gtk/tabs/tab_strip_menu_controller.h',
-        'browser/ui/gtk/task_manager_gtk.cc',
-        'browser/ui/gtk/task_manager_gtk.h',
-        'browser/ui/gtk/throbber_gtk.cc',
-        'browser/ui/gtk/throbber_gtk.h',
-        'browser/ui/gtk/titlebar_throb_animation.cc',
-        'browser/ui/gtk/titlebar_throb_animation.h',
-        'browser/ui/gtk/unity_service.cc',
-        'browser/ui/gtk/unity_service.h',
-        'browser/ui/gtk/update_recommended_dialog.cc',
-        'browser/ui/gtk/update_recommended_dialog.h',
-        'browser/ui/gtk/user_manager_gtk.cc',
-        'browser/ui/gtk/validation_message_bubble_gtk.cc',
-        'browser/ui/gtk/view_id_util.cc',
-        'browser/ui/gtk/view_id_util.h',
-        'browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc',
-        'browser/ui/gtk/web_dialog_gtk.cc',
-        'browser/ui/gtk/web_dialog_gtk.h',
-        'browser/ui/gtk/website_settings/permission_selector.cc',
-        'browser/ui/gtk/website_settings/permission_selector.h',
-        'browser/ui/gtk/website_settings/permission_selector_observer.h',
-        'browser/ui/gtk/website_settings/website_settings_popup_gtk.cc',
-        'browser/ui/gtk/website_settings/website_settings_popup_gtk.h',
-        'browser/ui/gtk/zoom_bubble_gtk.cc',
-        'browser/ui/gtk/zoom_bubble_gtk.h',
         'browser/ui/host_desktop.cc',
         'browser/ui/host_desktop.h',
         'browser/ui/hung_plugin_tab_helper.cc',
         'browser/ui/hung_plugin_tab_helper.h',
-        'browser/ui/login/login_model.h',
         'browser/ui/login/login_prompt.cc',
         'browser/ui/login/login_prompt.h',
         'browser/ui/media_utils.cc',
         'browser/ui/media_utils.h',
+        'browser/ui/navigation_correction_tab_observer.cc',
+        '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/network_profile_bubble.cc',
@@ -1494,10 +1249,14 @@
         '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',
         'browser/ui/passwords/manage_passwords_bubble_model.h',
-        'browser/ui/passwords/manage_passwords_bubble_ui_controller.cc',
-        'browser/ui/passwords/manage_passwords_bubble_ui_controller.h',
+        'browser/ui/passwords/manage_passwords_icon.cc',
+        'browser/ui/passwords/manage_passwords_icon.h',
+        'browser/ui/passwords/manage_passwords_ui_controller.cc',
+        'browser/ui/passwords/manage_passwords_ui_controller.h',
         'browser/ui/passwords/password_manager_presenter.cc',
         'browser/ui/passwords/password_manager_presenter.h',
         'browser/ui/passwords/password_ui_view.h',
@@ -1523,8 +1282,6 @@
         'browser/ui/screen_capture_notification_ui_stub.cc',
         'browser/ui/search/instant_controller.cc',
         'browser/ui/search/instant_controller.h',
-        'browser/ui/search/instant_ipc_sender.cc',
-        'browser/ui/search/instant_ipc_sender.h',
         'browser/ui/search/instant_page.cc',
         'browser/ui/search/instant_page.h',
         'browser/ui/search/instant_search_prerenderer.cc',
@@ -1542,6 +1299,8 @@
         'browser/ui/search/search_model_observer.h',
         'browser/ui/search/search_tab_helper.cc',
         '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',
@@ -1556,6 +1315,9 @@
         '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',
+        'browser/ui/settings_window_manager.h',
+        'browser/ui/settings_window_manager_observer.h',
         'browser/ui/profile_reset_bubble.h',
         'browser/ui/profile_reset_bubble_stub.cc',
         'browser/ui/simple_message_box.h',
@@ -1575,12 +1337,11 @@
         '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_browser_creator_win.cc',
-        'browser/ui/startup/startup_browser_creator_win.h',
         'browser/ui/startup/startup_tab.cc',
         'browser/ui/startup/startup_tab.h',
         'browser/ui/startup/startup_types.h',
@@ -1595,6 +1356,8 @@
         'browser/ui/sync/one_click_signin_helper.cc',
         'browser/ui/sync/one_click_signin_helper.h',
         'browser/ui/sync/one_click_signin_histogram.h',
+        'browser/ui/sync/one_click_signin_sync_observer.cc',
+        'browser/ui/sync/one_click_signin_sync_observer.h',
         'browser/ui/sync/one_click_signin_sync_starter.cc',
         'browser/ui/sync/one_click_signin_sync_starter.h',
         'browser/ui/sync/profile_signin_confirmation_helper.cc',
@@ -1611,11 +1374,11 @@
         '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.h',
+        'browser/ui/tab_helpers.cc',
         '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/dock_info.cc',
-        'browser/ui/tabs/dock_info.h',
         'browser/ui/tabs/hover_tab_selector.cc',
         'browser/ui/tabs/hover_tab_selector.h',
         'browser/ui/tabs/pinned_tab_codec.cc',
@@ -1648,6 +1411,8 @@
         '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',
@@ -1675,19 +1440,13 @@
         'browser/ui/uninstall_browser_prompt.h',
         'browser/ui/unload_controller.cc',
         'browser/ui/unload_controller.h',
-        'browser/ui/user_data_dir_dialog.h',
         'browser/ui/validation_message_bubble.h',
         'browser/ui/view_ids.h',
         'browser/ui/views/accelerator_utils_aura.cc',
-        'browser/ui/views/accelerator_utils_views.cc',
-        'browser/ui/views/about_ipc_dialog.cc',
-        'browser/ui/views/about_ipc_dialog.h',
         'browser/ui/views/accessibility/accessibility_event_router_views.cc',
         'browser/ui/views/accessibility/accessibility_event_router_views.h',
         'browser/ui/views/accessibility/invert_bubble_view.cc',
         'browser/ui/views/accessibility/invert_bubble_view.h',
-        'browser/ui/views/app_list/linux/app_list_controller_delegate_linux.cc',
-        'browser/ui/views/app_list/linux/app_list_controller_delegate_linux.h',
         'browser/ui/views/app_list/linux/app_list_linux.cc',
         'browser/ui/views/app_list/linux/app_list_linux.h',
         'browser/ui/views/app_list/linux/app_list_service_linux.cc',
@@ -1700,18 +1459,36 @@
         'browser/ui/views/app_list/win/app_list_service_win.h',
         'browser/ui/views/app_list/win/app_list_win.cc',
         'browser/ui/views/app_list/win/app_list_win.h',
-        'browser/ui/views/apps/chrome_shell_window_delegate_views.cc',
-        'browser/ui/views/apps/chrome_shell_window_delegate_views_win.cc',
-        'browser/ui/views/apps/native_app_window_views.cc',
-        'browser/ui/views/apps/native_app_window_views.h',
-        'browser/ui/views/apps/native_app_window_views_win.cc',
-        'browser/ui/views/apps/native_app_window_views_win.h',
+        'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
+        'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
+        'browser/ui/views/apps/app_info_dialog/app_info_manage_tab.cc',
+        'browser/ui/views/apps/app_info_dialog/app_info_manage_tab.h',
+        'browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.cc',
+        'browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.h',
+        'browser/ui/views/apps/app_info_dialog/app_info_summary_tab.cc',
+        'browser/ui/views/apps/app_info_dialog/app_info_summary_tab.h',
+        'browser/ui/views/apps/app_info_dialog/app_info_tab.cc',
+        'browser/ui/views/apps/app_info_dialog/app_info_tab.h',
+        'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
+        'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
+        'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
+        'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
+        'browser/ui/views/apps/chrome_app_window_delegate_views.cc',
+        'browser/ui/views/apps/chrome_app_window_delegate_views_win.cc',
+        'browser/ui/views/apps/chrome_native_app_window_views.cc',
+        'browser/ui/views/apps/chrome_native_app_window_views.h',
+        'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
+        'browser/ui/views/apps/chrome_native_app_window_views_win.h',
+        'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
+        'browser/ui/views/apps/glass_app_window_frame_view_win.h',
         'browser/ui/views/apps/shaped_app_window_targeter.cc',
         'browser/ui/views/apps/shaped_app_window_targeter.h',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
         'browser/ui/views/ash/tab_scrubber.h',
         'browser/ui/views/ash/tab_scrubber.cc',
+        'browser/ui/views/auto_keep_alive.cc',
+        'browser/ui/views/auto_keep_alive.h',
         'browser/ui/views/autofill/autofill_dialog_views.cc',
         'browser/ui/views/autofill/autofill_dialog_views.h',
         'browser/ui/views/autofill/autofill_popup_base_view.cc',
@@ -1724,18 +1501,14 @@
         'browser/ui/views/autofill/new_credit_card_bubble_views.h',
         'browser/ui/views/autofill/decorated_textfield.cc',
         'browser/ui/views/autofill/decorated_textfield.h',
+        'browser/ui/views/autofill/expanding_textfield.cc',
+        'browser/ui/views/autofill/expanding_textfield.h',
         'browser/ui/views/autofill/info_bubble.cc',
         'browser/ui/views/autofill/info_bubble.h',
         'browser/ui/views/autofill/password_generation_popup_view_views.cc',
         'browser/ui/views/autofill/password_generation_popup_view_views.h',
         'browser/ui/views/autofill/tooltip_icon.cc',
         'browser/ui/views/autofill/tooltip_icon.h',
-        'browser/ui/views/avatar_menu_bubble_view.cc',
-        'browser/ui/views/avatar_menu_bubble_view.h',
-        'browser/ui/views/avatar_menu_button.cc',
-        'browser/ui/views/avatar_menu_button.h',
-        'browser/ui/views/avatar_label.cc',
-        'browser/ui/views/avatar_label.h',
         'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc',
         'browser/ui/views/bookmarks/bookmark_bar_instructions_view.h',
         'browser/ui/views/bookmarks/bookmark_bar_view.cc',
@@ -1745,7 +1518,6 @@
         'browser/ui/views/bookmarks/bookmark_bubble_view_observer.h',
         'browser/ui/views/bookmarks/bookmark_context_menu.cc',
         'browser/ui/views/bookmarks/bookmark_context_menu.h',
-        'browser/ui/views/bookmarks/bookmark_context_menu_controller_win.cc',
         'browser/ui/views/bookmarks/bookmark_drag_drop_views.cc',
         'browser/ui/views/bookmarks/bookmark_drag_drop_views.h',
         'browser/ui/views/bookmarks/bookmark_editor_view.cc',
@@ -1755,8 +1527,6 @@
         'browser/ui/views/bookmarks/bookmark_menu_controller_views.h',
         'browser/ui/views/bookmarks/bookmark_menu_delegate.cc',
         'browser/ui/views/bookmarks/bookmark_menu_delegate.h',
-        'browser/ui/views/bookmarks/bookmark_prompt_view.cc',
-        'browser/ui/views/bookmarks/bookmark_prompt_view.h',
         'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
         'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
         'browser/ui/views/certificate_viewer_win.cc',
@@ -1795,6 +1565,8 @@
         'browser/ui/views/detachable_toolbar_view.cc',
         'browser/ui/views/detachable_toolbar_view.h',
         'browser/ui/views/download/download_danger_prompt_views.cc',
+        'browser/ui/views/download/download_feedback_dialog_view.cc',
+        'browser/ui/views/download/download_feedback_dialog_view.h',
         'browser/ui/views/download/download_in_progress_dialog_view.cc',
         'browser/ui/views/download/download_in_progress_dialog_view.h',
         'browser/ui/views/download/download_item_view.cc',
@@ -1812,6 +1584,10 @@
         'browser/ui/views/dropdown_bar_view.h',
         'browser/ui/views/edit_search_engine_dialog.cc',
         'browser/ui/views/edit_search_engine_dialog.h',
+        'browser/ui/views/elevation_icon_setter.cc',
+        'browser/ui/views/elevation_icon_setter.h',
+        'browser/ui/views/extensions/bookmark_app_bubble_view.cc',
+        'browser/ui/views/extensions/bookmark_app_bubble_view.h',
         'browser/ui/views/extensions/browser_action_drag_data.cc',
         'browser/ui/views/extensions/browser_action_drag_data.h',
         'browser/ui/views/extensions/browser_action_overflow_menu_controller.cc',
@@ -1837,6 +1613,8 @@
         'browser/ui/views/extensions/media_galleries_dialog_views.h',
         'browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc',
         'browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h',
+        'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
+        'browser/ui/views/extensions/media_gallery_checkbox_view.h',
         'browser/ui/views/external_protocol_dialog.cc',
         'browser/ui/views/external_protocol_dialog.h',
         'browser/ui/views/find_bar_host.cc',
@@ -1848,8 +1626,8 @@
         'browser/ui/views/first_run_bubble.h',
         'browser/ui/views/first_run_dialog.cc',
         'browser/ui/views/first_run_dialog.h',
-        'browser/ui/views/frame/app_panel_browser_frame_view.cc',
-        'browser/ui/views/frame/app_panel_browser_frame_view.h',
+        'browser/ui/views/frame/browser_command_handler_x11.cc',
+        'browser/ui/views/frame/browser_command_handler_x11.h',
         'browser/ui/views/frame/browser_frame.cc',
         'browser/ui/views/frame/browser_frame.h',
         'browser/ui/views/frame/browser_frame_ash.cc',
@@ -1858,15 +1636,18 @@
         'browser/ui/views/frame/browser_frame_ashwin.h',
         'browser/ui/views/frame/browser_frame_common_win.cc',
         'browser/ui/views/frame/browser_frame_common_win.h',
+        'browser/ui/views/frame/browser_header_painter_ash.cc',
+        'browser/ui/views/frame/browser_header_painter_ash.h',
         'browser/ui/views/frame/browser_non_client_frame_view.cc',
         'browser/ui/views/frame/browser_non_client_frame_view.h',
         'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
         'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
         'browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc',
-        'browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc',
         'browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc',
         'browser/ui/views/frame/browser_root_view.cc',
         'browser/ui/views/frame/browser_root_view.h',
+        'browser/ui/views/frame/browser_shutdown.cc',
+        'browser/ui/views/frame/browser_shutdown.h',
         'browser/ui/views/frame/browser_view.cc',
         'browser/ui/views/frame/browser_view.h',
         'browser/ui/views/frame/browser_view_layout.cc',
@@ -1880,13 +1661,11 @@
         'browser/ui/views/frame/contents_web_view.h',
         'browser/ui/views/frame/desktop_browser_frame_aura.cc',
         'browser/ui/views/frame/desktop_browser_frame_aura.h',
-        'browser/ui/views/frame/desktop_user_action_handler_aura.cc',
-        'browser/ui/views/frame/desktop_user_action_handler_aura.h',
-        'browser/ui/views/frame/browser_desktop_root_window_host.h',
-        'browser/ui/views/frame/browser_desktop_root_window_host_win.cc',
-        'browser/ui/views/frame/browser_desktop_root_window_host_win.h',
-        'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc',
-        'browser/ui/views/frame/browser_desktop_root_window_host_x11.h',
+        'browser/ui/views/frame/browser_desktop_window_tree_host.h',
+        'browser/ui/views/frame/browser_desktop_window_tree_host_win.cc',
+        'browser/ui/views/frame/browser_desktop_window_tree_host_win.h',
+        'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
+        'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
         'browser/ui/views/frame/glass_browser_frame_view.cc',
         'browser/ui/views/frame/glass_browser_frame_view.h',
         'browser/ui/views/frame/global_menu_bar_x11.cc',
@@ -1936,14 +1715,15 @@
         'browser/ui/views/frame/taskbar_decorator_win.cc',
         'browser/ui/views/frame/top_container_view.cc',
         'browser/ui/views/frame/top_container_view.h',
+        'browser/ui/views/frame/web_contents_close_handler.cc',
+        'browser/ui/views/frame/web_contents_close_handler.h',
+        'browser/ui/views/frame/web_contents_close_handler_delegate.h',
         'browser/ui/views/fullscreen_exit_bubble_views.cc',
         'browser/ui/views/fullscreen_exit_bubble_views.h',
         'browser/ui/views/global_error_bubble_view.cc',
         'browser/ui/views/global_error_bubble_view.h',
         'browser/ui/views/hung_renderer_view.cc',
         'browser/ui/views/hung_renderer_view.h',
-        'browser/ui/views/hung_renderer_view_win.cc',
-        'browser/ui/views/hung_renderer_view_win.h',
         'browser/ui/views/importer/import_lock_dialog_view.cc',
         'browser/ui/views/importer/import_lock_dialog_view.h',
         'browser/ui/views/infobars/alternate_nav_infobar_view.cc',
@@ -1968,6 +1748,8 @@
         'browser/ui/views/infobars/translate_language_menu_model.h',
         'browser/ui/views/infobars/translate_message_infobar.cc',
         'browser/ui/views/infobars/translate_message_infobar.h',
+        'browser/ui/views/javascript_app_modal_event_blocker_x11.cc',
+        'browser/ui/views/javascript_app_modal_event_blocker_x11.h',
         'browser/ui/views/javascript_app_modal_dialog_views.cc',
         'browser/ui/views/javascript_app_modal_dialog_views.h',
         'browser/ui/views/load_complete_listener.cc',
@@ -1994,6 +1776,8 @@
         'browser/ui/views/location_bar/location_icon_view.h',
         'browser/ui/views/location_bar/open_pdf_in_reader_view.cc',
         'browser/ui/views/location_bar/open_pdf_in_reader_view.h',
+        'browser/ui/views/location_bar/origin_chip_view.cc',
+        'browser/ui/views/location_bar/origin_chip_view.h',
         'browser/ui/views/location_bar/page_action_image_view.cc',
         'browser/ui/views/location_bar/page_action_image_view.h',
         'browser/ui/views/location_bar/page_action_with_badge_view.cc',
@@ -2020,22 +1804,12 @@
         'browser/ui/views/message_center/web_notification_tray.h',
         'browser/ui/views/message_center/web_notification_tray.cc',
         'browser/ui/views/message_center/web_notification_tray_win.cc',
-        'browser/ui/views/new_avatar_button.cc',
-        'browser/ui/views/new_avatar_button.h',
-        'browser/ui/views/notifications/balloon_collection_views.cc',
-        'browser/ui/views/notifications/balloon_view_host.cc',
-        'browser/ui/views/notifications/balloon_view_host.h',
-        'browser/ui/views/notifications/balloon_view_views.cc',
-        'browser/ui/views/notifications/balloon_view_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',
         'browser/ui/views/omnibox/omnibox_result_view.h',
-        'browser/ui/views/omnibox/omnibox_result_view_model.h',
         'browser/ui/views/omnibox/omnibox_view_views.cc',
         'browser/ui/views/omnibox/omnibox_view_views.h',
-        'browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc',
-        'browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h',
         'browser/ui/views/open_pdf_in_reader_bubble_view.cc',
         'browser/ui/views/open_pdf_in_reader_bubble_view.h',
         'browser/ui/views/outdated_upgrade_bubble_view.cc',
@@ -2048,20 +1822,34 @@
         'browser/ui/views/panels/panel_view.h',
         'browser/ui/views/panels/taskbar_window_thumbnailer_win.cc',
         'browser/ui/views/panels/taskbar_window_thumbnailer_win.h',
+        'browser/ui/views/passwords/manage_password_item_view.cc',
+        'browser/ui/views/passwords/manage_password_item_view.h',
         'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
         'browser/ui/views/passwords/manage_passwords_bubble_view.h',
         'browser/ui/views/passwords/manage_passwords_icon_view.cc',
         'browser/ui/views/passwords/manage_passwords_icon_view.h',
-        'browser/ui/views/passwords/manage_password_item_view.cc',
-        'browser/ui/views/passwords/manage_password_item_view.h',
+        'browser/ui/views/passwords/save_password_refusal_combobox_model.cc',
+        'browser/ui/views/passwords/save_password_refusal_combobox_model.h',
         'browser/ui/views/password_generation_bubble_view.cc',
         'browser/ui/views/password_generation_bubble_view.h',
         'browser/ui/views/pdf_password_dialog.cc',
         'browser/ui/views/process_singleton_dialog_linux.cc',
-        'browser/ui/views/profile_chooser_view.cc',
-        'browser/ui/views/profile_chooser_view.h',
-        'browser/ui/views/profile_reset_bubble_view.cc',
-        'browser/ui/views/profile_reset_bubble_view.h',
+        'browser/ui/views/profiles/avatar_label.cc',
+        'browser/ui/views/profiles/avatar_label.h',
+        'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
+        'browser/ui/views/profiles/avatar_menu_bubble_view.h',
+        'browser/ui/views/profiles/avatar_menu_button.cc',
+        'browser/ui/views/profiles/avatar_menu_button.h',
+        'browser/ui/views/profiles/new_avatar_button.cc',
+        'browser/ui/views/profiles/new_avatar_button.h',
+        'browser/ui/views/profiles/profile_chooser_view.cc',
+        'browser/ui/views/profiles/profile_chooser_view.h',
+        'browser/ui/views/profiles/profile_reset_bubble_view.cc',
+        'browser/ui/views/profiles/profile_reset_bubble_view.h',
+        'browser/ui/views/profiles/user_manager_view.cc',
+        'browser/ui/views/profiles/user_manager_view.h',
+        'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
+        'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
         'browser/ui/views/sad_tab_view.cc',
         'browser/ui/views/sad_tab_view.h',
         'browser/ui/views/screen_capture_notification_ui_views.cc',
@@ -2069,12 +1857,17 @@
         'browser/ui/views/select_file_dialog_extension.h',
         'browser/ui/views/select_file_dialog_extension_factory.cc',
         'browser/ui/views/select_file_dialog_extension_factory.h',
+        'browser/ui/views/settings_api_bubble_helper_views.cc',
+        'browser/ui/views/settings_api_bubble_helper_views.h',
+        'browser/ui/views/signed_certificate_timestamps_views.cc',
+        'browser/ui/views/signed_certificate_timestamps_views.h',
+        'browser/ui/views/signed_certificate_timestamp_info_view.cc',
+        'browser/ui/views/signed_certificate_timestamp_info_view.h',
         'browser/ui/views/simple_message_box_views.cc',
-        'browser/ui/views/simple_message_box_win.cc',
-        'browser/ui/views/simple_message_box_win.h',
-        'browser/ui/views/speech_recognition_bubble_views.cc',
         'browser/ui/views/ssl_client_certificate_selector.cc',
         'browser/ui/views/ssl_client_certificate_selector.h',
+        'browser/ui/views/session_crashed_bubble_view.cc',
+        'browser/ui/views/session_crashed_bubble_view.h',
         'browser/ui/views/status_bubble_views.cc',
         'browser/ui/views/status_bubble_views.h',
         'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
@@ -2085,6 +1878,8 @@
         'browser/ui/views/status_icons/status_tray_linux.h',
         'browser/ui/views/status_icons/status_tray_win.cc',
         'browser/ui/views/status_icons/status_tray_win.h',
+        'browser/ui/views/status_icons/status_tray_state_changer_win.cc',
+        'browser/ui/views/status_icons/status_tray_state_changer_win.h',
         'browser/ui/views/stubs_aura.cc',
         'browser/ui/views/sync/one_click_signin_bubble_view.cc',
         'browser/ui/views/sync/one_click_signin_bubble_view.h',
@@ -2092,21 +1887,12 @@
         'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
         'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
         'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
-        'browser/ui/views/tab_contents/render_view_context_menu_views.cc',
-        'browser/ui/views/tab_contents/render_view_context_menu_views.h',
-        'browser/ui/views/tab_contents/render_view_context_menu_win.cc',
-        'browser/ui/views/tab_contents/render_view_context_menu_win.h',
         'browser/ui/views/tab_icon_view.cc',
         'browser/ui/views/tab_icon_view.h',
         'browser/ui/views/tab_modal_confirm_dialog_views.cc',
         'browser/ui/views/tab_modal_confirm_dialog_views.h',
         'browser/ui/views/tabs/browser_tab_strip_controller.cc',
         'browser/ui/views/tabs/browser_tab_strip_controller.h',
-        'browser/ui/views/tabs/dock_info_views.cc',
-        'browser/ui/views/tabs/dock_info_win.cc',
-        'browser/ui/views/tabs/dragged_tab_view.cc',
-        'browser/ui/views/tabs/dragged_tab_view.h',
-        'browser/ui/views/tabs/native_view_photobooth.h',
         'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
         'browser/ui/views/tabs/stacked_tab_strip_layout.h',
         'browser/ui/views/tabs/tab.cc',
@@ -2117,6 +1903,11 @@
         'browser/ui/views/tabs/tab_strip.cc',
         'browser/ui/views/tabs/tab_strip.h',
         'browser/ui/views/tabs/tab_strip_controller.h',
+        'browser/ui/views/tabs/window_finder.h',
+        'browser/ui/views/tabs/window_finder_ash.cc',
+        'browser/ui/views/tabs/window_finder_chromeos.cc',
+        'browser/ui/views/tabs/window_finder_win.cc',
+        'browser/ui/views/tabs/window_finder_x11.cc',
         'browser/ui/views/task_manager_view.cc',
         'browser/ui/views/theme_image_mapper.cc',
         'browser/ui/views/theme_image_mapper.h',
@@ -2128,12 +1919,13 @@
         'browser/ui/views/toolbar/browser_action_view.h',
         'browser/ui/views/toolbar/browser_actions_container.cc',
         'browser/ui/views/toolbar/browser_actions_container.h',
+        'browser/ui/views/toolbar/browser_actions_container_observer.h',
         'browser/ui/views/toolbar/home_button.cc',
         'browser/ui/views/toolbar/home_button.h',
+        'browser/ui/views/toolbar/toolbar_origin_chip_view.cc',
+        'browser/ui/views/toolbar/toolbar_origin_chip_view.h',
         'browser/ui/views/toolbar/reload_button.cc',
         'browser/ui/views/toolbar/reload_button.h',
-        'browser/ui/views/toolbar/site_chip_view.cc',
-        'browser/ui/views/toolbar/site_chip_view.h',
         'browser/ui/views/toolbar/toolbar_button.cc',
         'browser/ui/views/toolbar/toolbar_button.h',
         'browser/ui/views/toolbar/toolbar_view.cc',
@@ -2151,10 +1943,6 @@
         'browser/ui/views/uninstall_view.h',
         'browser/ui/views/update_recommended_message_box.cc',
         'browser/ui/views/update_recommended_message_box.h',
-        'browser/ui/views/user_data_dir_dialog_view.cc',
-        'browser/ui/views/user_data_dir_dialog_view.h',
-        'browser/ui/views/user_manager_view.cc',
-        'browser/ui/views/user_manager_view.h',
         'browser/ui/views/validation_message_bubble_delegate.h',
         'browser/ui/views/validation_message_bubble_delegate.cc',
         'browser/ui/views/validation_message_bubble_view.cc',
@@ -2162,13 +1950,13 @@
         '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',
-        'browser/ui/web_applications/web_app_ui.cc',
-        'browser/ui/web_applications/web_app_ui.h',
-        'browser/ui/website_settings/permission_bubble_delegate.h',
         'browser/ui/website_settings/permission_bubble_manager.cc',
         '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',
@@ -2200,6 +1988,8 @@
         'browser/ui/webui/chrome_web_ui_controller_factory.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',
+        'browser/ui/webui/chromeos/certificate_manager_dialog_ui.h',
         'browser/ui/webui/chromeos/charger_replacement_handler.cc',
         'browser/ui/webui/chromeos/charger_replacement_handler.h',
         'browser/ui/webui/chromeos/charger_replacement_ui.cc',
@@ -2239,6 +2029,8 @@
         'browser/ui/webui/chromeos/login/eula_screen_handler.h',
         'browser/ui/webui/chromeos/login/gaia_screen_handler.cc',
         'browser/ui/webui/chromeos/login/gaia_screen_handler.h',
+        'browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc',
+        'browser/ui/webui/chromeos/login/hid_detection_screen_handler.h',
         'browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc',
         'browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h',
         'browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc',
@@ -2289,6 +2081,8 @@
         'browser/ui/webui/chromeos/power_ui.h',
         'browser/ui/webui/chromeos/proxy_settings_ui.cc',
         'browser/ui/webui/chromeos/proxy_settings_ui.h',
+        'browser/ui/webui/chromeos/set_time_ui.cc',
+        'browser/ui/webui/chromeos/set_time_ui.h',
         'browser/ui/webui/chromeos/sim_unlock_ui.cc',
         'browser/ui/webui/chromeos/sim_unlock_ui.h',
         'browser/ui/webui/chromeos/slow_trace_ui.cc',
@@ -2321,10 +2115,14 @@
         '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',
@@ -2341,6 +2139,8 @@
         'browser/ui/webui/flags_ui.h',
         'browser/ui/webui/flash_ui.cc',
         'browser/ui/webui/flash_ui.h',
+        'browser/ui/webui/gcm_internals_ui.cc',
+        'browser/ui/webui/gcm_internals_ui.h',
         'browser/ui/webui/gesture_config_ui.cc',
         'browser/ui/webui/gesture_config_ui.h',
         'browser/ui/webui/chromeos/salsa_ui.cc',
@@ -2367,6 +2167,10 @@
         'browser/ui/webui/inspect_ui.h',
         'browser/ui/webui/instant_ui.cc',
         'browser/ui/webui/instant_ui.h',
+        'browser/ui/webui/invalidations_ui.cc',
+        'browser/ui/webui/invalidations_ui.h',
+        'browser/ui/webui/invalidations_message_handler.cc',
+        'browser/ui/webui/invalidations_message_handler.h',
         'browser/ui/webui/media/webrtc_logs_ui.cc',
         'browser/ui/webui/media/webrtc_logs_ui.h',
         'browser/ui/webui/memory_internals/memory_internals_handler.cc',
@@ -2377,6 +2181,9 @@
         'browser/ui/webui/memory_internals/memory_internals_ui.h',
         'browser/ui/webui/metrics_handler.cc',
         'browser/ui/webui/metrics_handler.h',
+        'browser/ui/webui/mojo_web_ui_controller.cc',
+        'browser/ui/webui/mojo_web_ui_controller.h',
+        'browser/ui/webui/mojo_web_ui_handler.h',
         'browser/ui/webui/nacl_ui.cc',
         'browser/ui/webui/nacl_ui.h',
         'browser/ui/webui/net_export_ui.cc',
@@ -2419,8 +2226,6 @@
         '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_list_source.cc',
-        'browser/ui/webui/ntp/thumbnail_list_source.h',
         'browser/ui/webui/ntp/thumbnail_source.cc',
         'browser/ui/webui/ntp/thumbnail_source.h',
         'browser/ui/webui/omnibox/omnibox_ui.cc',
@@ -2433,6 +2238,8 @@
         '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/certificate_manager_handler.cc',
@@ -2447,12 +2254,16 @@
         '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',
@@ -2503,8 +2314,6 @@
         '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/media_galleries_handler.cc',
-        'browser/ui/webui/options/media_galleries_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',
@@ -2519,6 +2328,8 @@
         '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_l10n.cc',
         'browser/ui/webui/performance_monitor/performance_monitor_l10n.h',
         'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.cc',
@@ -2625,20 +2436,22 @@
         'browser/ui/window_sizer/window_sizer.h',
         'browser/ui/window_sizer/window_sizer_ash.cc',
         'browser/ui/window_sizer/window_sizer_aura.cc',
-        'browser/ui/window_sizer/window_sizer_gtk.cc',
         'browser/ui/window_sizer/window_sizer_mac.mm',
         'browser/ui/zoom/zoom_controller.cc',
         'browser/ui/zoom/zoom_controller.h',
         'browser/ui/zoom/zoom_observer.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc',
       ],
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
             'browser_extensions',
             'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
-            'common/extensions/api/api.gyp:api',
+            'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
+            'common/extensions/api/api.gyp:chrome_api',
             'debugger',
             'installer_util',
+            '../mojo/mojo.gyp:mojo_common_lib',
             '../third_party/re2/re2.gyp:re2',
             '../components/components.gyp:autofill_content_risk_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
@@ -2686,22 +2499,21 @@
             '../printing/printing.gyp:printing',
           ],
         }],
-        ['OS!="ios" and chrome_multiple_dll!=1', {
-          'dependencies': [
-            '../webkit/glue/webkit_glue.gyp:glue',
-          ],
-        }],
         ['OS == "android"', {
           'dependencies': [
             '../third_party/openssl/openssl.gyp:openssl',
           ],
         }],
+        ['OS!="android" and OS!="ios"', {
+          'sources!': [
+            'browser/ui/auto_login_infobar_delegate.cc',
+            'browser/ui/auto_login_infobar_delegate.h',
+          ],
+        }],
         ['enable_one_click_signin==0', {
           'sources!': [
             'browser/ui/cocoa/one_click_signin_bubble_controller.h',
             'browser/ui/cocoa/one_click_signin_bubble_controller.mm',
-            'browser/ui/gtk/one_click_signin_bubble_gtk.cc',
-            'browser/ui/gtk/one_click_signin_bubble_gtk.h',
             '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',
@@ -2719,8 +2531,6 @@
             ['exclude', '^browser/ui/views/task_manager_view.cc'],
             ['exclude', '^browser/ui/cocoa/task_manager_mac.h'],
             ['exclude', '^browser/ui/cocoa/task_manager_mac.mm'],
-            ['exclude', '^browser/ui/gtk/task_manager_gtk.cc'],
-            ['exclude', '^browser/ui/gtk/task_manager_gtk.h'],
           ],
         }],
         ['disable_nacl==0', {
@@ -2767,21 +2577,6 @@
             'safe_browsing_report_proto',
           ],
         }],
-        ['toolkit_views == 1', {
-          'dependencies': [
-            '../ui/events/events.gyp:events',
-            '../ui/wm/wm.gyp:wm_public',
-          ],
-          'sources!': [
-            'browser/ui/profile_reset_bubble_stub.cc',
-          ],
-        }, {  # toolkit_views == 0
-          'sources!': [
-            'browser/ui/tabs/tab_strip_layout_type.h',
-            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
-            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
-          ],
-        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:udev',
@@ -2801,42 +2596,44 @@
             'browser_chromeos',
           ],
           'sources!': [
-            'browser/ui/ash/caps_lock_delegate_views.cc',
             'browser/ui/ash/chrome_shell_delegate_views.cc',
             'browser/ui/ash/multi_user/multi_user_context_menu.cc',
             'browser/ui/ash/session_state_delegate_views.cc',
+            'browser/ui/aura/active_desktop_monitor.cc',
+            'browser/ui/aura/active_desktop_monitor.h',
             'browser/ui/startup/default_browser_prompt.cc',
             'browser/ui/startup/default_browser_prompt.h',
-            'browser/ui/views/app_list/linux/app_list_service_linux.cc',
+            'browser/ui/external_protocol_dialog_delegate.cc',
+            'browser/ui/external_protocol_dialog_delegate.h',
             'browser/ui/views/chrome_views_delegate_aura.cc',
-            'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc',
-            'browser/ui/views/frame/browser_desktop_root_window_host_x11.h',
+            'browser/ui/views/external_protocol_dialog.cc',
+            'browser/ui/views/external_protocol_dialog.h',
+            'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
+            'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
             'browser/ui/views/frame/desktop_browser_frame_aura.cc',
             'browser/ui/views/frame/desktop_browser_frame_aura.h',
-            'browser/ui/views/frame/desktop_user_action_handler_aura.cc',
-            'browser/ui/views/frame/desktop_user_action_handler_aura.h',
-            'browser/ui/views/frame/global_menu_bar_x11.cc',
-            'browser/ui/views/frame/global_menu_bar_x11.h',
             'browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
             'browser/ui/views/frame/global_menu_bar_registrar_x11.h',
+            'browser/ui/views/frame/global_menu_bar_x11.cc',
+            'browser/ui/views/frame/global_menu_bar_x11.h',
             'browser/ui/views/frame/native_browser_frame_factory_auralinux.cc',
             'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',
-            'browser/ui/views/notifications/balloon_view_host.cc',
-            'browser/ui/views/notifications/balloon_view_host.h',
-            'browser/ui/views/notifications/balloon_view_views.cc',
-            'browser/ui/views/notifications/balloon_view_views.h',
+            'browser/ui/views/javascript_app_modal_event_blocker_x11.cc',
+            '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/help/version_updater_basic.cc',
             'browser/ui/webui/help/version_updater_basic.h',
             '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.h',
             'browser/ui/webui/signin/user_manager_screen_handler.cc',
-            'browser/ui/webui/signin/user_manager_ui.h',
+            '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',
           ],
           'sources/': [
             ['exclude', '^browser/ui/views/frame/opaque_browser_frame_view*'],
+            ['exclude', '^browser/ui/views/app_list/linux/'],
           ],
         }],
         ['use_cups==1', {
@@ -2844,12 +2641,6 @@
             '../printing/printing.gyp:cups',
           ],
         }],
-        ['use_gconf==0', {
-          'sources!': [
-            'browser/ui/gtk/gconf_titlebar_listener.cc',
-            'browser/ui/gtk/gconf_titlebar_listener.h',
-          ],
-        }],
         ['use_ash==1', {
           'sources': [
             'browser/ui/views/touch_uma/touch_uma_ash.cc',
@@ -2891,13 +2682,11 @@
           ],
         }],
         ['use_aura==1', {
+          'sources!': [
+            'browser/ui/profile_reset_bubble_stub.cc',
+          ],
           'sources/': [
-            ['exclude', '^browser/ui/external_protocol_dialog_delegate.cc'],
             ['exclude', '^browser/ui/screen_capture_notification_ui_stub.cc'],
-            ['exclude', '^browser/ui/views/about_ipc_dialog.cc'],
-            ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc'],
-            ['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'],
-            ['exclude', '^browser/ui/views/user_data_dir_dialog_view.cc'],
             # TODO: (stevenjb/beng): Find a home for these.
             ['include', '^browser/ui/views/simple_message_box_views.cc'],
             ['include', '^browser/ui/webui/certificate_viewer_webui.cc'],
@@ -2911,11 +2700,12 @@
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
+            '../ui/wm/wm.gyp:wm',
           ],
           'conditions': [
             ['OS=="win"', {
               'sources/': [
-                ['exclude', '^browser/ui/views/apps/chrome_shell_window_delegate_views.cc'],
+                ['exclude', '^browser/ui/views/apps/chrome_app_window_delegate_views.cc'],
                 ['exclude', '^browser/ui/views/theme_image_mapper.cc'],
                 ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
                 ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
@@ -2927,7 +2717,6 @@
               'sources/': [
                 ['exclude', '^browser/ui/views/color_chooser_dialog.cc'],
                 ['exclude', '^browser/ui/views/color_chooser_dialog.h'],
-                ['exclude', '^browser/ui/views/external_protocol_dialog.cc'],
                 ['exclude', '^browser/ui/views/frame/glass_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/views/frame/glass_browser_frame_view.h'],
                 ['exclude', '^browser/ui/views/hwnd_util.h'],
@@ -2935,12 +2724,17 @@
             }],
           ],
         }, { # else: use_aura==0
+          'sources!': [
+            'browser/ui/tabs/tab_strip_layout_type.h',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
+          ],
           'sources/': [
-            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host.h'],
-            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.cc'],
-            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.h'],
-            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'],
-            ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.h'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host.h'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.h'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc'],
+            ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.h'],
             ['exclude', '^browser/ui/views/theme_image_mapper_aura_win.cc'],
             ['exclude', '^browser/ui/webui/gesture_config_ui.cc'],
             ['exclude', '^browser/ui/webui/gesture_config_ui.h'],
@@ -2953,13 +2747,6 @@
             '../ui/gl/gl.gyp:gl',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-          'link_settings': {
-            'libraries': [
-              '-lXss',
-            ],
-          },
-        }],
         ['use_nss!=1', {
           'sources!': [
             'browser/ui/webui/options/certificate_manager_handler.cc',
@@ -2978,21 +2765,6 @@
             'browser/ui/webui/certificate_viewer_ui.h',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus',
-            '../build/linux/system.gyp:gconf',
-            '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:gtkprint',
-            '../build/linux/system.gyp:ssl',
-            '../build/linux/system.gyp:x11',
-            '../dbus/dbus.gyp:dbus',
-            '../third_party/undoview/undoview.gyp:undoview',
-          ],
-          'sources!': [
-            'browser/ui/screen_capture_notification_ui_stub.cc',
-          ],
-        }],
         ['enable_themes==0', {
           'sources!': [
             'browser/ui/webui/theme_source.cc',
@@ -3010,19 +2782,8 @@
           ],
           'dependencies!': [
              '../third_party/libusb/libusb.gyp:libusb',
-          ],
-          'sources': [
-            'browser/ui/webui/ntp/android/bookmarks_handler.cc',
-            'browser/ui/webui/ntp/android/bookmarks_handler.h',
-            'browser/ui/webui/ntp/android/context_menu_handler.cc',
-            'browser/ui/webui/ntp/android/context_menu_handler.h',
-            'browser/ui/webui/ntp/android/navigation_handler.cc',
-            'browser/ui/webui/ntp/android/navigation_handler.h',
-            'browser/ui/webui/ntp/android/new_tab_page_ready_handler.cc',
-            'browser/ui/webui/ntp/android/new_tab_page_ready_handler.h',
-            'browser/ui/webui/ntp/android/promo_handler.cc',
-            'browser/ui/webui/ntp/android/promo_handler.h',
-            'browser/ui/webui/ntp/android/ntp_resource_cache_android.cc',
+             '../ui/events/events.gyp:events',
+             'chrome_browser_ui_views.gyp:browser_ui_views',
           ],
           'sources!': [
             # Android uses native UI for sync setup.
@@ -3037,14 +2798,12 @@
             '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_prompt_controller.cc',
             'browser/ui/browser.cc',
             'browser/ui/browser_command_controller.cc',
             'browser/ui/browser_finder.cc',
             'browser/ui/browser_iterator.cc',
             'browser/ui/browser_list.cc',
             'browser/ui/browser_otr_state.cc',
-            'browser/ui/browser_tab_contents.cc',
             'browser/ui/browser_tab_restore_service_delegate.cc',
             'browser/ui/browser_tabstrip.cc',
             'browser/ui/browser_tabstrip.h',
@@ -3065,6 +2824,10 @@
             'browser/ui/webui/bookmarks_ui.h',
             'browser/ui/webui/certificate_viewer_webui.cc',
             'browser/ui/webui/extensions/command_handler.cc',
+            'browser/ui/webui/extensions/extension_error_handler.cc',
+            'browser/ui/webui/extensions/extension_error_handler.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',
@@ -3073,18 +2836,6 @@
             'browser/ui/webui/identity_internals_ui.h',
             'browser/ui/webui/inspect_ui.cc',
             'browser/ui/webui/inspect_ui.h',
-            'browser/ui/webui/ntp/app_launcher_handler.cc',
-            'browser/ui/webui/ntp/app_launcher_handler.h',
-            'browser/ui/webui/ntp/new_tab_page_handler.cc',
-            'browser/ui/webui/ntp/new_tab_page_handler.h',
-            'browser/ui/webui/ntp/ntp_resource_cache.cc',
-            '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/plugins_ui.cc',
             'browser/ui/webui/plugins_ui.h',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui.cc',
@@ -3095,7 +2846,7 @@
             'browser/ui/window_sizer/window_sizer.h',
 
             # Also not used on android
-            'browser/ui/apps/chrome_shell_window_delegate.cc',
+            'browser/ui/apps/chrome_app_window_delegate.cc',
             'browser/ui/autofill/account_chooser_model.cc',
             'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
             'browser/ui/autofill/country_combobox_model.cc',
@@ -3111,6 +2862,7 @@
             'browser/ui/collected_cookies_infobar_delegate.cc',
             'browser/ui/confirm_bubble_model.cc',
             'browser/ui/crypto_module_password_dialog_openssl.cc',
+            'browser/ui/elide_url.cc',
             'browser/ui/extensions/application_launch.cc',
             'browser/ui/fast_unload_controller.cc',
             'browser/ui/find_bar/find_bar_controller.cc',
@@ -3131,12 +2883,12 @@
             'browser/ui/webui/app_launcher_page_ui.h',
             'browser/ui/webui/certificate_viewer_ui.cc',
             'browser/ui/webui/chrome_web_contents_handler.cc',
-            'browser/ui/webui/ntp/app_resource_cache_factory.cc',
-            'browser/ui/webui/ntp/core_app_launcher_handler.cc',
             'browser/ui/webui/performance_monitor/performance_monitor_handler.cc',
             'browser/ui/webui/performance_monitor/performance_monitor_l10n.cc',
             'browser/ui/webui/performance_monitor/performance_monitor_ui.cc',
             'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.cc',
+            'browser/ui/webui/system_info_ui.cc',
+            'browser/ui/webui/system_info_ui.h',
             'browser/ui/webui/theme_handler.cc',
           ],
           'sources/': [
@@ -3157,6 +2909,7 @@
             ['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/signin/'],
@@ -3171,7 +2924,6 @@
             'browser/ui/certificate_dialogs.cc',
             'browser/ui/certificate_dialogs.h',
             'browser/ui/screen_capture_notification_ui_stub.cc',
-            'browser/ui/tabs/dock_info.cc',
             'browser/ui/tabs/tab_resources.cc',
             'browser/ui/views/extensions/extension_view_views.cc',
             'browser/ui/views/extensions/extension_view_views.h',
@@ -3228,7 +2980,6 @@
             '../ui/app_list/app_list.gyp:app_list',
             '../ui/views/controls/webview/webview.gyp:webview',
             '../ui/views/views.gyp:views',
-            '../win8/win8.gyp:win8_util',
           ],
           'export_dependent_settings': [
             '../ui/views/controls/webview/webview.gyp:webview',
@@ -3278,13 +3029,8 @@
               ],
               'sources/': [
                 ['exclude', '^browser/ui/cocoa/*'],
-                ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_view.cc'],
-                ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/views/uninstall_view.cc'],
                 ['exclude', '^browser/ui/views/uninstall_view.h'],
-                ['include', '^browser/ui/tabs/dock_info.cc'],
-                ['include', '^browser/ui/tabs/dock_info.h'],
-                ['include', '^browser/ui/views/speech_recognition_bubble_views.cc'],
                 ['include', '^browser/ui/window_sizer/window_sizer.cc'],
                 ['include', '^browser/ui/window_sizer/window_sizer.h'],
               ],
@@ -3305,13 +3051,6 @@
                 '../dbus/dbus.gyp:dbus',
               ],
             }],
-            # GTK build only
-            ['toolkit_uses_gtk==1', {
-              'sources/': [
-                ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
-                ['exclude', '^browser/ui/views/notifications/balloon_collection_views.cc'],
-              ],
-            }],
             # x11 build
             ['use_x11==1', {
               'dependencies': [
@@ -3356,8 +3095,6 @@
           'sources!': [
             'browser/ui/autofill/autofill_dialog_common.cc',
             'browser/ui/autofill/autofill_dialog_common.h',
-            'browser/ui/autofill/data_model_wrapper.cc',
-            'browser/ui/autofill/data_model_wrapper.h',
           ],
         }],
         ['enable_autofill_dialog==1 and OS!="android" and OS!="ios"', {
@@ -3374,6 +3111,8 @@
             'browser/ui/autofill/autofill_dialog_view.h',
             'browser/ui/autofill/autofill_dialog_view.cc',
             'browser/ui/autofill/autofill_dialog_view_delegate.h',
+            'browser/ui/autofill/data_model_wrapper.cc',
+            'browser/ui/autofill/data_model_wrapper.h',
           ],
         }],
         ['enable_google_now==0', {
@@ -3388,7 +3127,7 @@
             'browser/ui/webui/media/webrtc_logs_ui.h',
           ],
         }],
-        ['enable_mdns==1', {
+        ['enable_service_discovery==1', {
           'sources': [
             'browser/ui/webui/local_discovery/local_discovery_ui.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui.h',
@@ -3396,6 +3135,15 @@
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
           ],
         }],
+        ['OS!="linux" and OS!="win"', {
+          'sources': [
+            'browser/ui/startup/session_crashed_bubble.cc'
+          ],
+          'sources!': [
+            'browser/ui/views/session_crashed_bubble_view.cc',
+            'browser/ui/views/session_crashed_bubble_view.h',
+          ],
+        }],
       ],
     },
   ],