Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git] / src / chrome / chrome_browser_ui.gypi
index 2304aa8..1b82807 100644 (file)
         'in_memory_url_index_cache_proto',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
-        'feedback_proto',
         '../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',
@@ -73,8 +73,6 @@
         # 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',
@@ -89,6 +87,8 @@
         '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/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',
         '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/hotword_background_activity_delegate.h',
-        'browser/ui/app_list/hotword_background_activity_monitor.cc',
-        'browser/ui/app_list/hotword_background_activity_monitor.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',
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
         'browser/ui/apps/app_info_dialog.h',
-        'browser/ui/apps/app_metro_infobar_delegate_win.cc',
-        'browser/ui/apps/app_metro_infobar_delegate_win.h',
         'browser/ui/apps/apps_metro_handler_win.cc',
         'browser/ui/apps/apps_metro_handler_win.h',
         'browser/ui/apps/chrome_app_window_delegate.cc',
         'browser/ui/apps/chrome_app_window_delegate.h',
         'browser/ui/apps/directory_access_confirmation_dialog.cc',
         'browser/ui/apps/directory_access_confirmation_dialog.h',
+        'browser/ui/ash/accessibility/automation_manager_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',
         '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/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',
         '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/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',
         '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',
         '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',
         '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',
         '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/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',
         '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',
         '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/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/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',
         '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_bubble_controller.h',
-        'browser/ui/cocoa/website_settings_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',
         '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/app_info_dialog_gtk.cc',
-        'browser/ui/gtk/apps/chrome_app_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/renderer_context_menu/render_view_context_menu_gtk.cc',
-        'browser/ui/gtk/renderer_context_menu/render_view_context_menu_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/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/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/tabs/window_finder.cc',
-        'browser/ui/gtk/tabs/window_finder.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/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',
         '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',
         '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',
         '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',
         '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',
         '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',
         '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/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',
         '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/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',
         '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',
         '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',
         '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/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/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',
         '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_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',
         '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/renderer_context_menu/render_view_context_menu_win.cc',
-        'browser/ui/views/renderer_context_menu/render_view_context_menu_win.h',
         'browser/ui/views/sad_tab_view.cc',
         'browser/ui/views/sad_tab_view.h',
         'browser/ui/views/screen_capture_notification_ui_views.cc',
         '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/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',
         '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',
         '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_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',
         'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
         '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/permission_selector_view_observer.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_manager.cc',
         'browser/ui/website_settings/permission_bubble_manager.h',
         'browser/ui/website_settings/permission_bubble_request.h',
         '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',
         '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',
         'browser/ui/webui/extensions/extension_icon_source.h',
         'browser/ui/webui/extensions/extension_info_ui.cc',
         'browser/ui/webui/extensions/extension_info_ui.h',
+        'browser/ui/webui/extensions/extension_loader_handler.cc',
+        'browser/ui/webui/extensions/extension_loader_handler.h',
         'browser/ui/webui/extensions/extension_settings_handler.cc',
         'browser/ui/webui/extensions/extension_settings_handler.h',
         'browser/ui/webui/extensions/extensions_ui.cc',
         'browser/ui/webui/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',
         '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',
         'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
         'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
         'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
+        'browser/ui/webui/options/chromeos/date_time_options_handler.cc',
+        'browser/ui/webui/options/chromeos/date_time_options_handler.h',
         'browser/ui/webui/options/chromeos/display_options_handler.cc',
         'browser/ui/webui/options/chromeos/display_options_handler.h',
         'browser/ui/webui/options/chromeos/display_overscan_handler.cc',
         'browser/ui/webui/options/chromeos/display_overscan_handler.h',
         'browser/ui/webui/options/chromeos/internet_options_handler.cc',
         'browser/ui/webui/options/chromeos/internet_options_handler.h',
+        'browser/ui/webui/options/chromeos/internet_options_handler_strings.cc',
+        'browser/ui/webui/options/chromeos/internet_options_handler_strings.h',
         'browser/ui/webui/options/chromeos/keyboard_handler.cc',
         'browser/ui/webui/options/chromeos/keyboard_handler.h',
         'browser/ui/webui/options/chromeos/pointer_handler.cc',
         'browser/ui/webui/options/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',
         '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',
+            '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',
             '../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',
             ['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', {
             'safe_browsing_report_proto',
           ],
         }],
-        ['toolkit_views == 1', {
-          'dependencies': [
-            '../ui/wm/wm.gyp:wm_core',
-          ],
-          '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',
             'browser/ui/startup/default_browser_prompt.h',
             'browser/ui/external_protocol_dialog_delegate.cc',
             'browser/ui/external_protocol_dialog_delegate.h',
-            'browser/ui/views/app_list/linux/app_list_service_linux.cc',
             'browser/ui/views/chrome_views_delegate_aura.cc',
             'browser/ui/views/external_protocol_dialog.cc',
             'browser/ui/views/external_protocol_dialog.h',
             'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',
             'browser/ui/views/javascript_app_modal_event_blocker_x11.cc',
             'browser/ui/views/javascript_app_modal_event_blocker_x11.h',
-            '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/screen_capture_notification_ui_views.cc',
             'browser/ui/views/tabs/window_finder_x11.cc',
             'browser/ui/webui/help/version_updater_basic.cc',
           ],
           'sources/': [
             ['exclude', '^browser/ui/views/frame/opaque_browser_frame_view*'],
+            ['exclude', '^browser/ui/views/app_list/linux/'],
           ],
         }],
         ['use_cups==1', {
             '../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',
           ],
         }],
         ['use_aura==1', {
+          'sources!': [
+            'browser/ui/profile_reset_bubble_stub.cc',
+          ],
           'sources/': [
             ['exclude', '^browser/ui/screen_capture_notification_ui_stub.cc'],
             # TODO: (stevenjb/beng): Find a home for these.
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
+            '../ui/wm/wm.gyp:wm',
           ],
           'conditions': [
             ['OS=="win"', {
             }],
           ],
         }, { # 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_window_tree_host.h'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'],
             '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',
           ],
           '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.
             '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/webui/bookmarks_ui.h',
             'browser/ui/webui/certificate_viewer_webui.cc',
             'browser/ui/webui/extensions/command_handler.cc',
-            'browser/ui/webui/extensions/extension_settings_handler.cc',
-            'browser/ui/webui/extensions/extension_settings_handler.h',
             'browser/ui/webui/extensions/extension_error_handler.cc',
             'browser/ui/webui/extensions/extension_error_handler.h',
+            'browser/ui/webui/extensions/extension_loader_handler.cc',
+            'browser/ui/webui/extensions/extension_loader_handler.h',
+            'browser/ui/webui/extensions/extension_settings_handler.cc',
+            'browser/ui/webui/extensions/extension_settings_handler.h',
             'browser/ui/webui/extensions/extensions_ui.cc',
             'browser/ui/webui/extensions/install_extension_handler.cc',
             'browser/ui/webui/identity_internals_ui.cc',
             'browser/ui/webui/identity_internals_ui.h',
             'browser/ui/webui/inspect_ui.cc',
             'browser/ui/webui/inspect_ui.h',
-            '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',
             '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',
             ['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/'],
             '../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',
               ],
               '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/views/speech_recognition_bubble_views.cc'],
                 ['include', '^browser/ui/window_sizer/window_sizer.cc'],
                 ['include', '^browser/ui/window_sizer/window_sizer.h'],
               ],
                 '../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': [
             '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',
+          ],
+        }],
       ],
     },
   ],