cros: Remove some OS platform ifdefs from ash

ash/aura/wm_shell_aura.cc

 // Copyright 2016 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.
 
 #include "ash/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/aura/key_event_watcher_aura.h"
 #include "ash/aura/pointer_watcher_adapter.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/laser/laser_pointer_controller.h"
 #include "ash/metrics/task_switch_metrics_recorder.h"
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
+#include "ash/virtual_keyboard_controller.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_cycle_event_filter_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/wm/public/activation_client.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/virtual_keyboard_controller.h"
-#endif
-
 #if defined(USE_X11)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #endif
 
 namespace ash {
 
@@ skipping 230 matching lines @@
 }
 
 void WmShellAura::RequestShutdown() {
   Shell::GetInstance()->lock_state_controller()->RequestShutdown();
 }
 
 bool WmShellAura::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
-#if defined(OS_CHROMEOS)
 void WmShellAura::ToggleIgnoreExternalKeyboard() {
   Shell::GetInstance()
       ->virtual_keyboard_controller()
       ->ToggleIgnoreExternalKeyboard();
 }
 
 void WmShellAura::SetLaserPointerEnabled(bool enabled) {
   Shell::GetInstance()->laser_pointer_controller()->SetEnabled(enabled);
 }
-#endif
 
 void WmShellAura::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   WmWindow* gained_active_wm = WmWindowAura::Get(gained_active);
   WmWindow* lost_active_wm = WmWindowAura::Get(lost_active);
   if (gained_active_wm)
     set_root_window_for_new_windows(gained_active_wm->GetRootWindow());
   for (auto& observer : activation_observers_)
@@ skipping 21 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash