Revert 282355 "Add chrome/browser/ui to the GN build."

trunk/src/chrome/chrome_browser_ui.gypi

 # Copyright 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.
 
 {
   'variables': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
@@ skipping 772 matching lines @@
       'browser/ui/fullscreen/fullscreen_within_tab_helper.h',
       'browser/ui/global_error/global_error.cc',
       'browser/ui/global_error/global_error.h',
       'browser/ui/global_error/global_error_bubble_view_base.h',
       'browser/ui/global_error/global_error_service.cc',
       '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/host_desktop.cc',
       'browser/ui/host_desktop.h',
+      'browser/ui/hung_plugin_tab_helper.cc',
+      'browser/ui/hung_plugin_tab_helper.h',
       'browser/ui/login/login_interstitial_delegate.cc',
       'browser/ui/login/login_interstitial_delegate.h',
       'browser/ui/login/login_prompt.cc',
       'browser/ui/login/login_prompt.h',
       'browser/ui/media_utils.cc',
       'browser/ui/media_utils.h',
       'browser/ui/navigation_correction_tab_observer.cc',
       'browser/ui/navigation_correction_tab_observer.h',
       'browser/ui/metro_pin_tab_helper_win.cc',
       'browser/ui/metro_pin_tab_helper_win.h',
@@ skipping 268 matching lines @@
       'browser/ui/webui/gcm_internals_ui.cc',
       'browser/ui/webui/gcm_internals_ui.h',
       'browser/ui/webui/history_ui.cc',
       'browser/ui/webui/history_ui.h',
       'browser/ui/webui/instant_ui.cc',
       'browser/ui/webui/instant_ui.h',
       'browser/ui/webui/invalidations_message_handler.cc',
       'browser/ui/webui/invalidations_message_handler.h',
       'browser/ui/webui/invalidations_ui.cc',
       'browser/ui/webui/invalidations_ui.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',
       'browser/ui/webui/memory_internals/memory_internals_handler.h',
       'browser/ui/webui/memory_internals/memory_internals_proxy.cc',
       'browser/ui/webui/memory_internals/memory_internals_proxy.h',
       'browser/ui/webui/memory_internals/memory_internals_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',
@@ skipping 43 matching lines @@
       'browser/ui/webui/welcome_handler_android.cc',
       'browser/ui/webui/welcome_handler_android.h',
       'browser/ui/webui/welcome_ui_android.cc',
       'browser/ui/webui/welcome_ui_android.h',
       'browser/ui/window_sizer/window_sizer_mac.mm',
       'browser/ui/zoom/zoom_controller.cc',
       'browser/ui/zoom/zoom_controller.h',
       'browser/ui/zoom/zoom_event_manager.cc',
       'browser/ui/zoom/zoom_event_manager.h',
       'browser/ui/zoom/zoom_observer.h',
+      '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc',
     ],
     # Note that we assume app list is enabled on all views builds, so the
     # views-specific app list files are in the views section.
     'chrome_browser_ui_app_list_sources': [
       'browser/ui/views/app_list/app_list_dialog_contents_view.cc',
       'browser/ui/views/app_list/app_list_dialog_contents_view.h',
       'browser/ui/views/app_list/win/activation_tracker_win.cc',
       'browser/ui/views/app_list/win/activation_tracker_win.h',
       'browser/ui/views/app_list/win/app_list_controller_delegate_win.cc',
       'browser/ui/views/app_list/win/app_list_controller_delegate_win.h',
@@ skipping 874 matching lines @@
       'browser/ui/views/extensions/media_galleries_dialog_views.h',
       'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
       'browser/ui/views/extensions/media_gallery_checkbox_view.h',
       'browser/ui/views/find_bar_host_aura.cc',
       'browser/ui/views/find_bar_host.cc',
       'browser/ui/views/find_bar_host.h',
       'browser/ui/views/find_bar_view.cc',
       'browser/ui/views/find_bar_view.h',
       'browser/ui/views/first_run_bubble.cc',
       'browser/ui/views/first_run_bubble.h',
+      'browser/ui/views/frame/browser_frame_ash.cc',
+      'browser/ui/views/frame/browser_frame_ash.h',
       'browser/ui/views/frame/browser_frame.cc',
       'browser/ui/views/frame/browser_frame_common_win.cc',
       'browser/ui/views/frame/browser_frame_common_win.h',
       'browser/ui/views/frame/browser_frame.h',
+      'browser/ui/views/frame/browser_header_painter_ash.cc',
+      'browser/ui/views/frame/browser_header_painter_ash.h',
+      'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
+      'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
       'browser/ui/views/frame/browser_non_client_frame_view.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc',
       'browser/ui/views/frame/browser_non_client_frame_view.h',
       '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',
       'browser/ui/views/frame/browser_view_layout_delegate.h',
       'browser/ui/views/frame/browser_view_layout.h',
       'browser/ui/views/frame/browser_window_property_manager_win.cc',
       'browser/ui/views/frame/browser_window_property_manager_win.h',
       'browser/ui/views/frame/contents_layout_manager.cc',
       'browser/ui/views/frame/contents_layout_manager.h',
       'browser/ui/views/frame/contents_web_view.cc',
       'browser/ui/views/frame/contents_web_view.h',
+      'browser/ui/views/frame/immersive_mode_controller_ash.cc',
+      'browser/ui/views/frame/immersive_mode_controller_ash.h',
       'browser/ui/views/frame/immersive_mode_controller.cc',
       'browser/ui/views/frame/immersive_mode_controller_factory.cc',
       'browser/ui/views/frame/immersive_mode_controller.h',
       'browser/ui/views/frame/immersive_mode_controller_stub.cc',
       'browser/ui/views/frame/immersive_mode_controller_stub.h',
       'browser/ui/views/frame/minimize_button_metrics_win.cc',
       'browser/ui/views/frame/minimize_button_metrics_win.h',
       'browser/ui/views/frame/native_browser_frame_factory.cc',
+      'browser/ui/views/frame/native_browser_frame_factory.cc',
+      'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
       'browser/ui/views/frame/native_browser_frame_factory.h',
-      'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
+      'browser/ui/views/frame/native_browser_frame_factory.h',
       'browser/ui/views/frame/native_browser_frame.h',
       'browser/ui/views/frame/opaque_browser_frame_view_layout.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h',
       'browser/ui/views/frame/opaque_browser_frame_view_layout.h',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.h',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h',
+      'browser/ui/views/frame/scroll_end_effect_controller_ash.cc',
+      'browser/ui/views/frame/scroll_end_effect_controller_ash.h',
       'browser/ui/views/frame/scroll_end_effect_controller.h',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.h',
       'browser/ui/views/frame/system_menu_model_builder.cc',
       'browser/ui/views/frame/system_menu_model_builder.h',
       'browser/ui/views/frame/system_menu_model_delegate.cc',
       'browser/ui/views/frame/system_menu_model_delegate.h',
       'browser/ui/views/frame/taskbar_decorator.h',
       'browser/ui/views/frame/taskbar_decorator_win.cc',
       'browser/ui/views/frame/top_container_view.cc',
@@ skipping 157 matching lines @@
       'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
       'browser/ui/views/tabs/stacked_tab_strip_layout.h',
       'browser/ui/views/tabs/tab.cc',
       'browser/ui/views/tabs/tab_controller.h',
       'browser/ui/views/tabs/tab_drag_controller.cc',
       'browser/ui/views/tabs/tab_drag_controller.h',
       'browser/ui/views/tabs/tab.h',
       'browser/ui/views/tabs/tab_strip.cc',
       'browser/ui/views/tabs/tab_strip_controller.h',
       'browser/ui/views/tabs/tab_strip.h',
+      'browser/ui/views/tabs/window_finder_ash.cc',
       'browser/ui/views/tabs/window_finder_chromeos.cc',
       'browser/ui/views/tabs/window_finder.h',
       'browser/ui/views/tabs/window_finder_win.cc',
+      'browser/ui/views/task_manager_view.cc',
       'browser/ui/views/theme_image_mapper_chromeos.cc',
       'browser/ui/views/theme_image_mapper_desktop.cc',
       'browser/ui/views/theme_image_mapper.h',
       'browser/ui/views/toolbar/back_button.cc',
       'browser/ui/views/toolbar/back_button.h',
       'browser/ui/views/toolbar/browser_actions_container.cc',
       'browser/ui/views/toolbar/browser_actions_container.h',
       'browser/ui/views/toolbar/browser_actions_container_observer.h',
       'browser/ui/views/toolbar/browser_action_test_util_views.cc',
       'browser/ui/views/toolbar/browser_action_view.cc',
@@ skipping 110 matching lines @@
       'browser/ui/ash/launcher/app_window_launcher_item_controller.cc',
       'browser/ui/ash/launcher/app_window_launcher_item_controller.h',
       'browser/ui/ash/launcher/app_window_launcher_controller.cc',
       'browser/ui/ash/launcher/app_window_launcher_controller.h',
       'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc',
       'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h',
       'browser/ui/ash/launcher/browser_status_monitor.cc',
       'browser/ui/ash/launcher/browser_status_monitor.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item.cc',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item.h',
+      'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc',
+      'browser/ui/bookmarks/bookmark_tab_helper_delegate.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.cc',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc',
       'browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h',
       'browser/ui/ash/launcher/chrome_launcher_controller.cc',
       'browser/ui/ash/launcher/chrome_launcher_controller.h',
       'browser/ui/ash/launcher/chrome_launcher_controller_chromeos.cc',
       'browser/ui/ash/launcher/chrome_launcher_controller_win.cc',
@@ skipping 46 matching lines @@
       'browser/ui/ash/user_accounts_delegate_chromeos.h',
       'browser/ui/ash/volume_controller_chromeos.cc',
       'browser/ui/ash/volume_controller_chromeos.h',
       'browser/ui/views/touch_uma/touch_uma_ash.cc',
       'browser/ui/window_sizer/window_sizer_ash.cc',
     ],
     # Used when ash is disabled.
     'chrome_browser_ui_non_ash_sources': [
       'browser/ui/views/touch_uma/touch_uma.cc',
     ],
-    # Ash + Views.
-    'chrome_browser_ui_ash_views_sources': [
-      'browser/ui/views/frame/browser_frame_ash.cc',
-      'browser/ui/views/frame/browser_frame_ash.h',
-      'browser/ui/views/frame/browser_header_painter_ash.cc',
-      'browser/ui/views/frame/browser_header_painter_ash.h',
-      'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
-      'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
-      'browser/ui/views/frame/immersive_mode_controller_ash.cc',
-      'browser/ui/views/frame/immersive_mode_controller_ash.h',
-      'browser/ui/views/frame/scroll_end_effect_controller_ash.cc',
-      'browser/ui/views/frame/scroll_end_effect_controller_ash.h',
-      'browser/ui/views/tabs/window_finder_ash.cc',
-    ],
     # Used when Ash is enabled but not ChromeOS.
     'chrome_browser_ui_ash_non_chromeos': [
       'browser/ui/ash/chrome_shell_delegate_views.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.h',
       'browser/ui/ash/session_state_delegate_views.cc',
       'browser/ui/ash/session_state_delegate_views.h',
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
@@ skipping 103 matching lines @@
         '<(INTERMEDIATE_DIR)',
         # Needed by pepper_flash_component_installer.cc.
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'export_dependent_settings': [
         '../components/components.gyp:dom_distiller_core',
         '../sync/sync.gyp:sync',
       ],
       'conditions': [
         ['OS != "ios"', {
-          'sources': [
-            '<@(chrome_browser_ui_non_ios_sources)',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc',
-          ],
+          'sources': [ '<@(chrome_browser_ui_non_ios_sources)' ],
           '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_system_impl',
             '../third_party/re2/re2.gyp:re2',
             '../components/components.gyp:autofill_content_risk_proto',
@@ skipping 100 matching lines @@
           ],
         }, { # use_ash==0
           'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ],
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
           'conditions': [
             ['chromeos == 0', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
-            ['use_ash == 1', {
-              'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
-            }],
           ],
         }],
         ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
           'dependencies': [
             # gtk2 is the only component that can interact with gtk2 in our new
             # world.
             'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
             '../build/linux/system.gyp:gio',
           ],
         }],
@@ skipping 210 matching lines @@
         }],
         ['enable_spellcheck==1', {
           'dependencies': [
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
         }],
       ],
     },
   ],
 }