Remove OS_CHROMEOS from ui/ash code

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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 507 matching lines @@
       'browser/ui/ash/cast_config_delegate_chromeos.cc',
       'browser/ui/ash/cast_config_delegate_chromeos.h',
       'browser/ui/ash/cast_config_delegate_media_router.cc',
       'browser/ui/ash/cast_config_delegate_media_router.h',
       'browser/ui/ash/chrome_keyboard_ui.cc',
       'browser/ui/ash/chrome_keyboard_ui.h',
       'browser/ui/ash/chrome_launcher_prefs.cc',
       'browser/ui/ash/chrome_launcher_prefs.h',
       'browser/ui/ash/chrome_new_window_delegate.cc',
       'browser/ui/ash/chrome_new_window_delegate.h',
-      'browser/ui/ash/chrome_new_window_delegate_chromeos.cc',
-      'browser/ui/ash/chrome_new_window_delegate_chromeos.h',
       'browser/ui/ash/chrome_screenshot_grabber.cc',
       'browser/ui/ash/chrome_screenshot_grabber.h',
       'browser/ui/ash/chrome_shell_content_state.cc',
       'browser/ui/ash/chrome_shell_content_state.h',
       'browser/ui/ash/chrome_shell_content_state_chromeos.cc',
       'browser/ui/ash/chrome_shell_delegate.cc',
       'browser/ui/ash/chrome_shell_delegate.h',
-      'browser/ui/ash/chrome_shell_delegate_chromeos.cc',
       'browser/ui/ash/ime_controller_chromeos.cc',
       'browser/ui/ash/ime_controller_chromeos.h',
       'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc',
       'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h',
       'browser/ui/ash/launcher/app_window_launcher_controller.cc',
       'browser/ui/ash/launcher/app_window_launcher_controller.h',
       'browser/ui/ash/launcher/app_window_launcher_item_controller.cc',
       'browser/ui/ash/launcher/app_window_launcher_item_controller.h',
       'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc',
       'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h',
@@ skipping 32 matching lines @@
       'browser/ui/ash/launcher/launcher_item_controller.cc',
       'browser/ui/ash/launcher/launcher_item_controller.h',
       'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc',
       'browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h',
       'browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc',
       'browser/ui/ash/launcher/multi_profile_browser_status_monitor.h',
       'browser/ui/ash/media_delegate_chromeos.cc',
       'browser/ui/ash/media_delegate_chromeos.h',
       'browser/ui/ash/metrics/chrome_user_metrics_recorder.cc',
       'browser/ui/ash/metrics/chrome_user_metrics_recorder.h',
+      '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_notification_blocker_chromeos.cc',
       'browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h',
       'browser/ui/ash/multi_user/multi_user_util.cc',
       'browser/ui/ash/multi_user/multi_user_util.h',
       'browser/ui/ash/multi_user/multi_user_warning_dialog.cc',
       'browser/ui/ash/multi_user/multi_user_warning_dialog.h',
       'browser/ui/ash/multi_user/multi_user_window_manager.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager.h',
       'browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h',
       'browser/ui/ash/multi_user/multi_user_window_manager_stub.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_stub.h',
       'browser/ui/ash/multi_user/user_switch_animator_chromeos.cc',
       'browser/ui/ash/multi_user/user_switch_animator_chromeos.h',
       'browser/ui/ash/network_connect_delegate_chromeos.cc',
       'browser/ui/ash/network_connect_delegate_chromeos.h',
       'browser/ui/ash/networking_config_delegate_chromeos.cc',
       'browser/ui/ash/networking_config_delegate_chromeos.h',
       'browser/ui/ash/session_state_delegate_chromeos.cc',
       'browser/ui/ash/session_state_delegate_chromeos.h',
       'browser/ui/ash/session_util.cc',
       'browser/ui/ash/session_util.h',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.cc',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.h',
       'browser/ui/ash/system_tray_delegate_chromeos.cc',
       'browser/ui/ash/system_tray_delegate_chromeos.h',
-      'browser/ui/ash/system_tray_delegate_common.cc',
-      'browser/ui/ash/system_tray_delegate_common.h',
       'browser/ui/ash/system_tray_delegate_utils.cc',
       'browser/ui/ash/system_tray_delegate_utils.h',
       'browser/ui/ash/volume_controller_chromeos.cc',
       'browser/ui/ash/volume_controller_chromeos.h',
       'browser/ui/ash/vpn_delegate_chromeos.cc',
       'browser/ui/ash/vpn_delegate_chromeos.h',
       'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
       'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
       'browser/ui/views/ash/tab_scrubber.cc',
       'browser/ui/views/ash/tab_scrubber.h',
       'browser/ui/views/touch_uma/touch_uma_ash.cc',
       'browser/ui/window_sizer/window_sizer_ash.cc',
     ],
-    # Used when Ash is enabled but not ChromeOS.
-    'chrome_browser_ui_ash_non_chromeos': [
-      'browser/ui/ash/chrome_shell_content_state_views.cc',
-      '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',
-      'browser/ui/views/chrome_views_delegate_ash.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',
@@ skipping 2340 matching lines @@
         ['use_ash==1', {
           'sources': [ '<@(chrome_browser_ui_ash_sources)' ],
           'dependencies': [
             '../ash/ash.gyp:ash',
             '../ash/ash.gyp:ash_with_content',
             '../ash/ash_strings.gyp:ash_strings',
             '../ash/wm/common/ash_wm_common.gyp:ash_wm_common',
             '../components/components.gyp:user_manager',
             '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter',
           ],
-          'conditions': [
-            ['chromeos == 0', {
-              'sources': [ '<@(chrome_browser_ui_ash_non_chromeos)' ],
-            }],
-          ],
         }, { # use_ash==0
           'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ],
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
           'dependencies': [
             '<(DEPTH)/components/components.gyp:constrained_window',
           ],
           'conditions': [
             ['chromeos == 0 and (OS!="mac" or mac_views_browser==1)', {
@@ skipping 301 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }