cros: Remove OS_CHROMEOS ifdefs in ash/common

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 45e4f5c825817a710756dce44fd717803979e516..f5ad7f5dab86b979c3b0e954688017bb2258ef6c 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -60,6 +60,7 @@ class KeyEventWatcher;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class LocaleNotificationController;
+class LogoutConfirmationController;
 class MaximizeModeController;
 class MediaController;
 class MruWindowTracker;
@@ -79,6 +80,7 @@ class SystemTrayDelegate;
 class SystemTrayController;
 class SystemTrayNotifier;
 class ToastManager;
+class VpnList;
 class WallpaperController;
 class WallpaperDelegate;
 class WindowCycleController;
@@ -99,11 +101,6 @@ class MaximizeModeEventHandler;
 class WindowState;
 }
 
-#if defined(OS_CHROMEOS)
-class LogoutConfirmationController;
-class VpnList;
-#endif
-
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell : public SessionStateObserver {
  public:
@@ -128,6 +125,10 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
 
   app_list::AppList* app_list() { return app_list_.get(); }
 
+  const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
+    return blocking_pool_;
+  }
+
   BrightnessControlDelegate* brightness_control_delegate() {
     return brightness_control_delegate_.get();
   }
@@ -146,6 +147,10 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
     return locale_notification_controller_.get();
   }
 
+  LogoutConfirmationController* logout_confirmation_controller() {
+    return logout_confirmation_controller_.get();
+  }
+
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
@@ -193,6 +198,8 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
 
   ToastManager* toast_manager() { return toast_manager_.get(); }
 
+  VpnList* vpn_list() { return vpn_list_.get(); }
+
   WallpaperController* wallpaper_controller() {
     return wallpaper_controller_.get();
   }
@@ -430,23 +437,11 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
   // True if any touch points are down.
   virtual bool IsTouchDown() = 0;
 
-  const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
-    return blocking_pool_;
-  }
-
-#if defined(OS_CHROMEOS)
-  LogoutConfirmationController* logout_confirmation_controller() {
-    return logout_confirmation_controller_.get();
-  }
-
-  VpnList* vpn_list() { return vpn_list_.get(); }
-
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 
   // Enable or disable the laser pointer.
   virtual void SetLaserPointerEnabled(bool enabled) = 0;
-#endif
 
  protected:
   explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate);
@@ -505,6 +500,7 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
       keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
+  std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaController> media_controller_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
@@ -519,6 +515,7 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<ToastManager> toast_manager_;
+  std::unique_ptr<VpnList> vpn_list_;
   std::unique_ptr<WallpaperController> wallpaper_controller_;
   std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
@@ -534,11 +531,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
   bool simulate_modal_window_open_for_testing_ = false;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;

[msw, 2017/01/06 18:22:51]

nit: maybe sort this alphabetically too, or maybe unsort it's accessor (to keep
the member/accessor ordering consistent without mixing unique_ptr and refptr)?

[James Cook, 2017/01/06 20:33:05]

Unsorted accessor.

-
-#if defined(OS_CHROMEOS)
-  std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
-  std::unique_ptr<VpnList> vpn_list_;
-#endif
 };
 
 }  // namespace ash