X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fchrome_browser_ui.gypi;h=290aa25c799dcfc98119b7141c40659abe5dd4db;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=9fe2ed90246e4e1e7c67b15a21fb9ac2943b4099;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/chrome_browser_ui.gypi b/src/chrome/chrome_browser_ui.gypi
index 9fe2ed9..290aa25 100644
--- a/src/chrome/chrome_browser_ui.gypi
+++ b/src/chrome/chrome_browser_ui.gypi
@@ -33,6 +33,7 @@
         '../components/components.gyp:auto_login_parser',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
+        '../components/components.gyp:password_manager_core_browser',
         '../components/components.gyp:onc_component',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
@@ -90,6 +91,8 @@
         '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',
@@ -234,6 +237,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,6 +248,7 @@
         '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_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',
@@ -281,8 +287,6 @@
         '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',
@@ -330,6 +334,8 @@
         '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',
@@ -404,6 +410,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',
@@ -471,8 +478,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,6 +535,7 @@
         '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',
@@ -788,6 +794,8 @@
         '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_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',
@@ -1029,8 +1037,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',
@@ -1117,6 +1123,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',
@@ -1157,6 +1165,7 @@
         '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_shell_window_delegate_gtk.cc',
         'browser/ui/gtk/apps/native_app_window_gtk.cc',
         'browser/ui/gtk/apps/native_app_window_gtk.h',
@@ -1395,6 +1404,8 @@
         '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',
@@ -1423,7 +1434,6 @@
         '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',
@@ -1611,6 +1621,8 @@
         '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',
@@ -1648,6 +1660,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.cc',
+        'browser/ui/toolbar/origin_chip.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,13 +1689,10 @@
         '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',
@@ -1700,6 +1711,8 @@
         '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/app_info_dialog_views.cc',
+        'browser/ui/views/apps/app_info_dialog_views.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',
@@ -1795,6 +1808,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 +1827,8 @@
         '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/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',
@@ -1863,10 +1880,11 @@
         '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',
@@ -1882,11 +1900,11 @@
         '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',
@@ -2069,6 +2087,10 @@
         '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/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',
@@ -2104,9 +2126,6 @@
         '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 +2136,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',
@@ -2130,10 +2154,10 @@
         'browser/ui/views/toolbar/browser_actions_container.h',
         'browser/ui/views/toolbar/home_button.cc',
         'browser/ui/views/toolbar/home_button.h',
+        'browser/ui/views/toolbar/origin_chip_view.cc',
+        'browser/ui/views/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,8 +2175,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',
@@ -2161,14 +2183,16 @@
         '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/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_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',
@@ -2321,6 +2345,8 @@
         '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',
@@ -2341,6 +2367,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 +2395,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',
@@ -2433,6 +2465,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',
@@ -2686,11 +2720,6 @@
             '../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',
@@ -2807,18 +2836,22 @@
             'browser/ui/ash/session_state_delegate_views.cc',
             'browser/ui/startup/default_browser_prompt.cc',
             '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/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',
@@ -2830,10 +2863,10 @@
             '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*'],
@@ -2892,12 +2925,7 @@
         }],
         ['use_aura==1', {
           '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'],
@@ -2927,7 +2955,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'],
@@ -2936,11 +2963,11 @@
           ],
         }, { # else: use_aura==0
           '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 +2980,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',
@@ -3044,7 +3064,6 @@
             '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',
@@ -3067,6 +3086,8 @@
             '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/extensions_ui.cc',
             'browser/ui/webui/extensions/install_extension_handler.cc',
             'browser/ui/webui/identity_internals_ui.cc',
@@ -3111,6 +3132,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',
@@ -3137,6 +3159,8 @@
             '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/': [
@@ -3356,8 +3380,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 +3396,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', {