Ongoing refactoring of chrome/chrome_browser.gypi

chrome/chrome_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 4711 matching lines @@
 
             # Exclude try chrome dialog.
             ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
             ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
           ],
           'conditions': [
             ['use_aura==1',{
               'sources/': [
                 ['include', '^browser/ui/views/hung_renderer_view.cc'],
                 ['include', '^browser/ui/views/ssl_client_certificate_selector.cc'],
+                ['include', '^browser/ui/views/tab_modal_confirm_dialog_views.cc'],
+                ['include', '^browser/ui/views/tab_modal_confirm_dialog_views.h'],
               ]
             }],
             ['OS=="linux" or use_aura==1',{
               'sources/': [
                 ['include', '^browser/ui/views/accelerator_table.cc'],
                 ['include', '^browser/ui/views/accelerator_table.h'],
               ]
             }],
-            ['OS=="linux" and toolkit_views==1',{
+            ['OS=="linux" and use_aura==1',{
               'dependencies': [
                 '../ui/views/views.gyp:views',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
               'sources/': [
                 # This exclude duplicates the one just above because of the
                 # order of evaluation of the 'sources/' rule above, the
                 # conditions, and this 'sources/' rule.
                 ['exclude', '^browser/extensions/extension_rlz_module'],
+                ['exclude', '^browser/google/google_update.cc'],
+                ['exclude', '^browser/google/google_update.h'],
+                ['exclude', '^browser/platform_util_common_linux.cc'],
                 ['include', 'browser/printing/print_dialog_cloud.cc'],
                 ['include', 'browser/printing/print_dialog_cloud.h'],
                 ['include', '^browser/speech/speech_recognition_bubble_views.cc'],
-
-                # Exclude all of browser/ui/gtk, then include the things we want.
-                ['exclude', '^browser/ui/gtk'],
-                ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc'],
-                ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'],
-                ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'],
-                ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'],
-                ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'],
-                ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'],
-                ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
-                ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
-                ['include', '^browser/ui/gtk/certificate_viewer_gtk.cc'],
-                ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
-                ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
-                ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
-                ['include', '^browser/ui/gtk/collected_cookies_gtk.h'],
-                ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
-                ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
-                ['include', '^browser/ui/gtk/download/download_started_animation_gtk.cc'],
-                ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
-                ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
-                ['include', '^browser/ui/gtk/gtk_chrome_button.cc'],
-                ['include', '^browser/ui/gtk/gtk_chrome_button.h'],
-                ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.cc'],
-                ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.h'],
-                ['include', '^browser/ui/gtk/gtk_chrome_link_button.cc'],
-                ['include', '^browser/ui/gtk/gtk_chrome_link_button.h'],
-                ['include', '^browser/ui/gtk/gtk_custom_menu_item.cc'],
-                ['include', '^browser/ui/gtk/gtk_tree.cc'],
-                ['include', '^browser/ui/gtk/gtk_tree.h'],
-                ['include', '^browser/ui/gtk/gtk_util.cc'],
-                ['include', '^browser/ui/gtk/gtk_util.h'],
-                ['include', '^browser/ui/gtk/hover_controller_gtk.cc'],
-                ['include', '^browser/ui/gtk/hover_controller_gtk.h'],
-                ['include', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/importer/import_lock_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/importer/import_lock_dialog_gtk.h'],
-                ['include', '^browser/ui/gtk/importer/import_progress_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/importer/import_progress_dialog_gtk.h'],
-                ['include', '^browser/ui/gtk/nine_box.cc'],
-                ['include', '^browser/ui/gtk/nine_box.h'],
-                ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
-                ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'],
-                ['include', '^browser/ui/gtk/ssl_client_certificate_selector.cc'],
-                ['include', '^browser/ui/gtk/task_manager_gtk.cc'],
-                ['include', '^browser/ui/gtk/task_manager_gtk.h'],
-                ['include', '^browser/ui/gtk/theme_service_gtk.cc'],
-                ['include', '^browser/ui/gtk/theme_service_gtk.h'],
-                ['include', '^browser/ui/gtk/view_id_util.cc'],
-                ['include', '^browser/ui/gtk/view_id_util.h'],
                 ['include', '^browser/ui/tabs/dock_info.cc'],
                 ['include', '^browser/ui/tabs/dock_info.h'],
                 ['include', '^browser/ui/views/about_chrome_view.cc'],
                 ['include', '^browser/ui/views/about_chrome_view.h'],
                 ['include', '^browser/ui/views/accessibility_event_router_views.cc'],
                 ['include', '^browser/ui/views/accessibility_event_router_views.h'],
+                ['include', '^browser/ui/views/ash/'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.h'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view.cc'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view.h'],
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view_model.h'],
                 ['include', '^browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc'],
                 ['include', '^browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h'],
                 ['include', '^browser/ui/views/avatar_menu_bubble_view.cc'],
                 ['include', '^browser/ui/views/avatar_menu_bubble_view.h'],
                 ['include', '^browser/ui/views/avatar_menu_button.cc'],
                 ['include', '^browser/ui/views/avatar_menu_button.h'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_bar_instructions_view.h'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_bar_view.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_bar_view.h'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_bubble_view.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_bubble_view.h'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_context_menu.cc'],
-                ['include', '^browser/ui/views/bookmarks/bookmark_context_menu.h'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_context_menu.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_menu_controller_views.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_menu_delegate.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_menu_delegate.h'],
                 ['include', '^browser/ui/views/browser_actions_container.cc'],
                 ['include', '^browser/ui/views/browser_actions_container.h'],
                 ['include', '^browser/ui/views/chrome_to_mobile_bubble_view.cc'],
                 ['include', '^browser/ui/views/chrome_to_mobile_bubble_view.h'],
                 ['include', '^browser/ui/views/chrome_views_delegate.cc'],
+                ['include', '^browser/ui/views/collected_cookies_views.cc'],
+                ['include', '^browser/ui/views/collected_cookies_views.h'],
+                ['include', '^browser/ui/views/confirm_bubble_view.cc'],
+                ['include', '^browser/ui/views/confirm_bubble_view.h'],
+                ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
                 ['include', '^browser/ui/views/constrained_window_views.cc'],
                 ['include', '^browser/ui/views/content_setting_bubble_contents.cc'],
                 ['include', '^browser/ui/views/content_setting_bubble_contents.h'],
+                ['include', '^browser/ui/views/cookie_info_view.cc'],
+                ['include', '^browser/ui/views/cookie_info_view.h'],
                 ['include', '^browser/ui/views/create_application_shortcut_view.cc'],
                 ['include', '^browser/ui/views/create_application_shortcut_view.h'],
                 ['include', '^browser/ui/views/crypto_module_password_dialog_view.cc'],
                 ['include', '^browser/ui/views/crypto_module_password_dialog_view.h'],
                 ['include', '^browser/ui/views/detachable_toolbar_view.cc'],
                 ['include', '^browser/ui/views/detachable_toolbar_view.h'],
                 ['include', '^browser/ui/views/dom_view.cc'],
                 ['include', '^browser/ui/views/dom_view.h'],
                 ['include', '^browser/ui/views/download/download_in_progress_dialog_view.cc'],
                 ['include', '^browser/ui/views/download/download_in_progress_dialog_view.h'],
                 ['include', '^browser/ui/views/download/download_item_view.cc'],
                 ['include', '^browser/ui/views/download/download_item_view.h'],
                 ['include', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
                 ['include', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
                 ['include', '^browser/ui/views/download/download_shelf_view.cc'],
                 ['include', '^browser/ui/views/download/download_shelf_view.h'],
                 ['include', '^browser/ui/views/download/download_started_animation_views.cc'],
+                ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_host.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_host.h'],
                 ['include', '^browser/ui/views/dropdown_bar_view.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_view.h'],
                 ['include', '^browser/ui/views/edit_search_engine_dialog.cc'],
                 ['include', '^browser/ui/views/edit_search_engine_dialog.h'],
                 ['include', '^browser/ui/views/event_utils.cc'],
                 ['include', '^browser/ui/views/event_utils.h'],
                 ['include', '^browser/ui/views/extensions/browser_action_drag_data.cc'],
                 ['include', '^browser/ui/views/extensions/browser_action_drag_data.h'],
                 ['include', '^browser/ui/views/extensions/browser_action_overflow_menu_controller.cc'],
                 ['include', '^browser/ui/views/extensions/browser_action_overflow_menu_controller.h'],
                 ['include', '^browser/ui/views/extensions/bundle_installed_bubble.cc'],
+                ['include', '^browser/ui/views/extensions/extension_dialog.cc'],
+                ['include', '^browser/ui/views/extensions/extension_dialog.h'],
                 ['include', '^browser/ui/views/extensions/extension_dialog_observer.cc'],
                 ['include', '^browser/ui/views/extensions/extension_dialog_observer.h'],
-                ['include', '^browser/ui/views/extensions/extension_dialog.cc'],
-                ['include', '^browser/ui/views/extensions/extension_dialog.h'],
                 ['include', '^browser/ui/views/extensions/extension_install_dialog_view.cc'],
                 ['include', '^browser/ui/views/extensions/extension_installed_bubble.cc'],
                 ['include', '^browser/ui/views/extensions/extension_installed_bubble.h'],
                 ['include', '^browser/ui/views/extensions/extension_keybinding_registry_views.cc'],
                 ['include', '^browser/ui/views/extensions/extension_keybinding_registry_views.h'],
                 ['include', '^browser/ui/views/extensions/extension_popup.cc'],
                 ['include', '^browser/ui/views/extensions/extension_popup.h'],
                 ['include', '^browser/ui/views/extensions/extension_uninstall_dialog_view.cc'],
                 ['include', '^browser/ui/views/extensions/extension_view.cc'],
                 ['include', '^browser/ui/views/extensions/extension_view.h'],
+                ['include', '^browser/ui/views/extensions/shell_window_views.cc'],
                 ['include', '^browser/ui/views/extensions/shell_window_views.h'],
-                ['include', '^browser/ui/views/extensions/shell_window_views.cc'],
+                ['include', '^browser/ui/views/find_bar_host_aura.cc'],
                 ['include', '^browser/ui/views/find_bar_host.cc'],
                 ['include', '^browser/ui/views/find_bar_host.h'],
                 ['include', '^browser/ui/views/find_bar_view.cc'],
                 ['include', '^browser/ui/views/find_bar_view.h'],
                 ['include', '^browser/ui/views/first_run_bubble.cc'],
                 ['include', '^browser/ui/views/frame/app_non_client_frame_view_aura.cc'],
                 ['include', '^browser/ui/views/frame/app_non_client_frame_view_aura.h'],
+                ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
                 ['include', '^browser/ui/views/frame/browser_frame.cc'],
                 ['include', '^browser/ui/views/frame/browser_frame.h'],
+                ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.cc'],
+                ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.h'],
                 ['include', '^browser/ui/views/frame/browser_non_client_frame_view.cc'],
+                ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
                 ['include', '^browser/ui/views/frame/browser_non_client_frame_view.h'],
                 ['include', '^browser/ui/views/frame/browser_root_view.cc'],
                 ['include', '^browser/ui/views/frame/browser_root_view.h'],
                 ['include', '^browser/ui/views/frame/browser_view.cc'],
                 ['include', '^browser/ui/views/frame/browser_view.h'],
                 ['include', '^browser/ui/views/frame/browser_view_layout.cc'],
                 ['include', '^browser/ui/views/frame/browser_view_layout.h'],
                 ['include', '^browser/ui/views/frame/contents_container.cc'],
                 ['include', '^browser/ui/views/frame/contents_container.h'],
                 ['include', '^browser/ui/views/frame/native_browser_frame.h'],
                 ['include', '^browser/ui/views/frame/opaque_browser_frame_view.cc'],
                 ['include', '^browser/ui/views/frame/opaque_browser_frame_view.h'],
                 ['include', '^browser/ui/views/frame/popup_non_client_frame_view.cc'],
                 ['include', '^browser/ui/views/frame/popup_non_client_frame_view.h'],
                 ['include', '^browser/ui/views/frame/system_menu_model_delegate.cc'],
                 ['include', '^browser/ui/views/frame/system_menu_model_delegate.h'],
                 ['include', '^browser/ui/views/fullscreen_exit_bubble_views.cc'],
                 ['include', '^browser/ui/views/fullscreen_exit_bubble_views.h'],
                 ['include', '^browser/ui/views/global_error_bubble_view.cc'],
                 ['include', '^browser/ui/views/global_error_bubble_view.h'],
-                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
-                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'],
                 ['include', '^browser/ui/views/html_dialog_view.cc'],
                 ['include', '^browser/ui/views/html_dialog_view.h'],
+                ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
                 ['include', '^browser/ui/views/infobars/*'],
                 ['include', '^browser/ui/views/instant_confirm_view.cc'],
                 ['include', '^browser/ui/views/instant_confirm_view.h'],
                 ['include', '^browser/ui/views/js_modal_dialog_views.cc'],
                 ['include', '^browser/ui/views/js_modal_dialog_views.h'],
                 ['include', '^browser/ui/views/keyboard_overlay_delegate.cc'],
                 ['include', '^browser/ui/views/keyboard_overlay_delegate.h'],
                 ['include', '^browser/ui/views/keyboard_overlay_dialog_view.cc'],
                 ['include', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
                 ['include', '^browser/ui/views/location_bar/chrome_to_mobile_view.cc'],
@@ skipping 11 matching lines @@
                 ['include', '^browser/ui/views/location_bar/location_bar_view.cc'],
                 ['include', '^browser/ui/views/location_bar/location_bar_view.h'],
                 ['include', '^browser/ui/views/location_bar/location_icon_view.cc'],
                 ['include', '^browser/ui/views/location_bar/location_icon_view.h'],
                 ['include', '^browser/ui/views/location_bar/page_action_image_view.cc'],
                 ['include', '^browser/ui/views/location_bar/page_action_image_view.h'],
                 ['include', '^browser/ui/views/location_bar/page_action_with_badge_view.cc'],
                 ['include', '^browser/ui/views/location_bar/page_action_with_badge_view.h'],
                 ['include', '^browser/ui/views/location_bar/selected_keyword_view.cc'],
                 ['include', '^browser/ui/views/location_bar/selected_keyword_view.h'],
+                ['include', '^browser/ui/views/location_bar/star_view.cc'],
+                ['include', '^browser/ui/views/location_bar/star_view.h'],
                 ['include', '^browser/ui/views/location_bar/suggested_text_view.cc'],
                 ['include', '^browser/ui/views/location_bar/suggested_text_view.h'],
-                ['include', '^browser/ui/views/location_bar/star_view.cc'],
-                ['include', '^browser/ui/views/location_bar/star_view.h'],
                 ['include', '^browser/ui/views/login_view.cc'],
                 ['include', '^browser/ui/views/login_view.h'],
+                ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
                 ['include', '^browser/ui/views/notifications/balloon_view.cc'],
                 ['include', '^browser/ui/views/notifications/balloon_view.h'],
                 ['include', '^browser/ui/views/notifications/balloon_view_host.cc'],
                 ['include', '^browser/ui/views/notifications/balloon_view_host.h'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
                 ['include', '^browser/ui/views/page_info_bubble_view.cc'],
                 ['include', '^browser/ui/views/password_generation_bubble_view.cc'],
                 ['include', '^browser/ui/views/password_generation_bubble_view.h'],
                 ['include', '^browser/ui/views/profile_tag_view.cc'],
                 ['include', '^browser/ui/views/profile_tag_view.h'],
                 ['include', '^browser/ui/views/reload_button.cc'],
                 ['include', '^browser/ui/views/reload_button.h'],
                 ['include', '^browser/ui/views/restart_message_box.cc'],
                 ['include', '^browser/ui/views/restart_message_box.h'],
                 ['include', '^browser/ui/views/sad_tab_view.cc'],
                 ['include', '^browser/ui/views/sad_tab_view.h'],
                 ['include', '^browser/ui/views/simple_message_box_views.cc'],
                 ['include', '^browser/ui/views/simple_message_box_views.h'],
                 ['include', '^browser/ui/views/status_bubble_views.cc'],
                 ['include', '^browser/ui/views/status_bubble_views.h'],
                 ['include', '^browser/ui/views/status_icons/status_tray_linux.cc'],
+                ['include', '^browser/ui/views/stubs_aura.cc'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_container_aura.cc'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_container_aura.h'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_aura.cc'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_aura.h'],
+                ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_delegate.h'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_view.h'],
-                ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_delegate.h'],
                 ['include', '^browser/ui/views/tab_contents/render_view_context_menu_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/render_view_context_menu_views.h'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container.h'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'],
                 ['include', '^browser/ui/views/tab_icon_view.cc'],
                 ['include', '^browser/ui/views/tab_icon_view.h'],
                 ['include', '^browser/ui/views/tabs/abstract_tab_strip_view.h'],
                 ['include', '^browser/ui/views/tabs/base_tab.cc'],
                 ['include', '^browser/ui/views/tabs/base_tab.h'],
                 ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.cc'],
                 ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.h'],
                 ['include', '^browser/ui/views/tabs/default_tab_drag_controller.cc'],
                 ['include', '^browser/ui/views/tabs/default_tab_drag_controller.h'],
                 ['include', '^browser/ui/views/tabs/dragged_tab_view.cc'],
                 ['include', '^browser/ui/views/tabs/dragged_tab_view.h'],
                 ['include', '^browser/ui/views/tabs/native_view_photobooth.h'],
                 ['include', '^browser/ui/views/tabs/tab.cc'],
+                ['include', '^browser/ui/views/tabs/tab_controller.h'],
+                ['include', '^browser/ui/views/tabs/tab_drag_controller2.cc'],
+                ['include', '^browser/ui/views/tabs/tab_drag_controller2.h'],
+                ['include', '^browser/ui/views/tabs/tab_drag_controller.h'],
                 ['include', '^browser/ui/views/tabs/tab.h'],
-                ['include', '^browser/ui/views/tabs/tab_controller.h'],
-                ['include', '^browser/ui/views/tabs/tab_drag_controller.h'],
                 ['include', '^browser/ui/views/tabs/tab_renderer_data.cc'],
                 ['include', '^browser/ui/views/tabs/tab_renderer_data.h'],
                 ['include', '^browser/ui/views/tabs/tab_strip.cc'],
-                ['include', '^browser/ui/views/tabs/tab_strip.h'],
                 ['include', '^browser/ui/views/tabs/tab_strip_factory.cc'],
                 ['include', '^browser/ui/views/tabs/tab_strip_factory.h'],
+                ['include', '^browser/ui/views/tabs/tab_strip.h'],
                 ['include', '^browser/ui/views/theme_background.cc'],
                 ['include', '^browser/ui/views/theme_background.h'],
                 ['include', '^browser/ui/views/toolbar_view.cc'],
                 ['include', '^browser/ui/views/toolbar_view.h'],
+                ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
+                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
+                ['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'],
                 ['include', '^browser/ui/views/update_recommended_message_box.cc'],
                 ['include', '^browser/ui/views/update_recommended_message_box.h'],
                 ['include', '^browser/ui/views/web_intent_picker_views.cc'],
                 ['include', '^browser/ui/views/window.cc'],
                 ['include', '^browser/ui/views/window.h'],
                 ['include', '^browser/ui/views/wrench_menu.cc'],
                 ['include', '^browser/ui/views/wrench_menu.h'],
                 ['include', '^browser/ui/window_sizer.cc'],
                 ['include', '^browser/ui/window_sizer.h'],
-
-                # Other excluded stuff.
-                ['exclude', '^browser/extensions/browser_action_test_util_gtk.cc'],
-                ['exclude', '^browser/speech/speech_recognition_bubble_gtk.cc'],
-                ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.cc'],
-                ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'],
-                ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
-                ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
-                ['exclude', '^browser/ui/browser_list_gtk.cc'],
-                ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'],
-                ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
-                ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
-                ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
-                ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
               ],
-            }, { # else: OS=="linux" and toolkit_views==1
+            }, { # else: OS=="linux" and use_aura)
               'sources/': [
                 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc'],
                 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h'],
               ]
             }],
-            # These Views files have a GTK equivalent, so we cannot use both.
-            ['toolkit_uses_gtk==1', {
-              'sources/': [
-                ['exclude', '^browser/notifications/balloon_collection_views.cc'],
-                ['exclude', '^browser/ui/views/edit_search_engine_dialog.cc'],
-                ['exclude', '^browser/ui/views/edit_search_engine_dialog.h'],
-              ],
-            }],
-            # These GTK files haven't been ported to views, while ChromeOS has
-            # its own separate implementation below.  So re-include them only on
-            # non-ChromeOS views Linux builds.
-            ['OS=="linux" and toolkit_views==1 and chromeos==0', {
+            # Build Aura on desktop linux
+            ['OS=="linux" and use_aura==1 and chromeos==0', {
               'sources/': [
                 ['exclude', '^browser/chromeos/extensions/file_browser_private_api'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl.cc'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl.h'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl_gtk.cc'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl_kde.cc'],
-                ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.h'],
-                ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
-                ['include', '^browser/ui/views/notifications/balloon_view.cc'],
-                ['include', '^browser/ui/views/notifications/balloon_view.h'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.cc'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
-              ],
+                ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
+                ['include', '^browser/ui/views/notifications/balloon_view.cc'],
+                ['include', '^browser/ui/views/notifications/balloon_view.h'],
+                ['include', '^browser/ui/views/select_file_dialog_aura.cc'],                 ],
             }],
             # GTK build only
             ['toolkit_uses_gtk==1', {
               'sources/': [
-                ['include', '^browser/printing/print_dialog_gtk.cc'],
-                ['include', '^browser/printing/print_dialog_gtk.h'],
                 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
+                ['exclude', '^browser/notifications/balloon_collection_views.cc'],
                 ['exclude', '^browser/ui/browser_list_stub.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.h'],
                 ['exclude', '^browser/ui/panels/panel_overflow_indicator_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_overflow_indicator_view.h'],
-              ],
-              'sources!': [
-                'browser/ui/toolbar/bookmark_sub_menu_model.cc',
+                ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
+                ['exclude', '^browser/ui/views/edit_search_engine_dialog.cc'],
+                ['exclude', '^browser/ui/views/edit_search_engine_dialog.h'],
+                ['include', '^browser/printing/print_dialog_gtk.cc'],
+                ['include', '^browser/printing/print_dialog_gtk.h'],
               ],
             }],
             ['chromeos==1',{
               'sources/': [
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
                 ['exclude', '^browser/notifications/balloon_collection_gtk.cc'],
               ],
               'dependencies': [
                 '../dbus/dbus.gyp:dbus',
@@ skipping 26 matching lines @@
               ],
             }],
           ],
           # Exclude files that should be excluded for all non-Windows platforms.
           'sources!': [
             'browser/aeropeek_manager.cc',
             'browser/google/google_update.cc',
             'browser/importer/ie_importer.cc',
           ],
         }],
-        # Must remove GTK files in PureViews case
-        ['use_aura==1 and OS=="linux"', {
-          'sources/': [
-            ['exclude', '^browser/google/google_update.cc'],
-            ['exclude', '^browser/google/google_update.h'],
-            ['exclude', '^browser/platform_util_common_linux.cc'],
-            ['include', '^browser/ui/views/ash/'],
-            ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
-            ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
-            ['include', '^browser/ui/views/collected_cookies_views.cc'],
-            ['include', '^browser/ui/views/collected_cookies_views.h'],
-            ['include', '^browser/ui/views/confirm_bubble_view.cc'],
-            ['include', '^browser/ui/views/confirm_bubble_view.h'],
-            ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
-            ['include', '^browser/ui/views/constrained_window_views.cc'],
-            ['include', '^browser/ui/views/cookie_info_view.cc'],
-            ['include', '^browser/ui/views/cookie_info_view.h'],
-            ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
-            ['include', '^browser/ui/views/find_bar_host_aura.cc'],
-            ['include', '^browser/ui/views/first_run_bubble.cc'],
-            ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
-            ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.cc'],
-            ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.h'],
-            ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
-            ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
-            ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
-            ['include', '^browser/ui/views/stubs_aura.cc'],
-            ['include', '^browser/ui/views/tabs/tab_drag_controller2.cc'],
-            ['include', '^browser/ui/views/tabs/tab_drag_controller2.h'],
-            ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
-            ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
-          ],
-        }],
-        # Build Aura on desktop linux
-        ['use_aura==1 and OS=="linux" and chromeos==0', {
-          'sources/': [
-            ['include', '^browser/ui/views/select_file_dialog_aura.cc'],
-          ],
-        }],
-        ['use_aura==1', {
-          'sources/': [
-            ['include', '^browser/ui/views/tab_modal_confirm_dialog_views.cc'],
-            ['include', '^browser/ui/views/tab_modal_confirm_dialog_views.h'],
-          ],
-        }],
         ['enable_plugin_installation==0', {
           'sources!': [
             'browser/plugin_finder.cc',
             'browser/plugin_finder.h',
             'browser/plugin_installer.cc',
             'browser/plugin_installer.h',
             'browser/plugin_installer_observer.cc',
             'browser/plugin_installer_observer.h',
           ],
         }],
@@ skipping 110 matching lines @@
          'variables': {
           'proto_in_dir': '../third_party/cros_system_api/dbus/',
           'proto_out_dir': 'chrome/browser/chromeos/dbus',
          },
          'includes': ['../build/protoc.gypi'],
         }],
       ],
     },
   ],
 }