ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/accelerators/accelerator_controller_delegate_aura.cc

Index: ash/accelerators/accelerator_controller_delegate_aura.cc
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
index bfd404bf9ba31e37fd2b13b67cd3f5f66fd77c79..16313bd039f056315c2d3d55a13655e0ca14c757 100644
--- a/ash/accelerators/accelerator_controller_delegate_aura.cc
+++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -22,6 +22,7 @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/debug.h"
+#include "ash/display/display_configuration_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/magnifier/magnification_controller.h"
@@ -41,6 +42,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/sys_info.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -55,11 +57,6 @@
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notifier_settings.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/display/display_configuration_controller.h"
-#include "base/sys_info.h"
-#endif  // defined(OS_CHROMEOS)
-
 namespace ash {
 namespace {
 
@@ -231,7 +228,6 @@ bool CanHandleUnpin() {
          window_state->GetStateType() == wm::WINDOW_STATE_TYPE_PINNED;
 }
 
-#if defined(OS_CHROMEOS)
 void HandleSwapPrimaryDisplay() {
   base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
 
@@ -264,8 +260,6 @@ void HandleTouchHudModeChange() {
   controller->touch_hud_debug()->ChangeToNextMode();
 }
 
-#endif  // defined(OS_CHROMEOS)
-
 }  // namespace
 
 AcceleratorControllerDelegateAura::AcceleratorControllerDelegateAura() {}
@@ -286,9 +280,15 @@ bool AcceleratorControllerDelegateAura::HandlesAction(
     case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
     case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
     case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
+    case DEV_ADD_REMOVE_DISPLAY:
     case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
+    case LOCK_PRESSED:
+    case LOCK_RELEASED:
     case MAGNIFY_SCREEN_ZOOM_IN:
     case MAGNIFY_SCREEN_ZOOM_OUT:
+    case POWER_PRESSED:
+    case POWER_RELEASED:
     case ROTATE_SCREEN:
     case ROTATE_WINDOW:
     case SCALE_UI_DOWN:
@@ -296,26 +296,16 @@ bool AcceleratorControllerDelegateAura::HandlesAction(
     case SCALE_UI_UP:
     case SHOW_MESSAGE_CENTER_BUBBLE:
     case SHOW_SYSTEM_TRAY_BUBBLE:
+    case SWAP_PRIMARY_DISPLAY:
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TAKE_WINDOW_SCREENSHOT:
-    case UNPIN:
-      return true;
-
-#if defined(OS_CHROMEOS)
-    case DEV_ADD_REMOVE_DISPLAY:
-    case DEV_TOGGLE_UNIFIED_DESKTOP:
-    case LOCK_PRESSED:
-    case LOCK_RELEASED:
-    case POWER_PRESSED:
-    case POWER_RELEASED:
-    case SWAP_PRIMARY_DISPLAY:
     case TOGGLE_MIRROR_MODE:
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
     case TOUCH_HUD_PROJECTION_TOGGLE:
+    case UNPIN:
       return true;
-#endif
 
     default:
       break;
@@ -333,7 +323,9 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
     case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
     case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
       return debug::DebugAcceleratorsEnabled();
+    case DEV_ADD_REMOVE_DISPLAY:
     case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
       return debug::DeveloperAcceleratorsEnabled();
     case MAGNIFY_SCREEN_ZOOM_IN:
     case MAGNIFY_SCREEN_ZOOM_OUT:
@@ -346,35 +338,26 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
       return CanHandleUnpin();
 
     // Following are always enabled:
+    case LOCK_PRESSED:
+    case LOCK_RELEASED:
+    case POWER_PRESSED:
+    case POWER_RELEASED:
     case ROTATE_SCREEN:
     case ROTATE_WINDOW:
     case SHOW_SYSTEM_TRAY_BUBBLE:
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TAKE_WINDOW_SCREENSHOT:
+    case TOGGLE_MIRROR_MODE:
+    case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
 
-#if defined(OS_CHROMEOS)
-    case DEV_ADD_REMOVE_DISPLAY:
-    case DEV_TOGGLE_UNIFIED_DESKTOP:
-      return debug::DeveloperAcceleratorsEnabled();
-
     case SWAP_PRIMARY_DISPLAY:
       return display::Screen::GetScreen()->GetNumDisplays() > 1;
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
       return CanHandleTouchHud();
 
-    // Following are always enabled.
-    case LOCK_PRESSED:
-    case LOCK_RELEASED:
-    case POWER_PRESSED:
-    case POWER_RELEASED:
-    case TOGGLE_MIRROR_MODE:
-    case TOUCH_HUD_PROJECTION_TOGGLE:
-      return true;
-#endif
-
     default:
       NOTREACHED();
       break;
@@ -398,15 +381,40 @@ void AcceleratorControllerDelegateAura::PerformAction(
     case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
       debug::ToggleShowPaintRects();
       break;
+    case DEV_ADD_REMOVE_DISPLAY:
+      Shell::GetInstance()->display_manager()->AddRemoveDisplay();
+      break;
     case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       Shell::GetPrimaryRootWindowController()->ash_host()->ToggleFullScreen();
       break;
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
+      Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(
+          !Shell::GetInstance()->display_manager()->unified_desktop_enabled());
+      break;
+    case LOCK_PRESSED:
+    case LOCK_RELEASED:
+      Shell::GetInstance()->power_button_controller()->OnLockButtonEvent(
+          action == LOCK_PRESSED, base::TimeTicks());
+      break;
     case MAGNIFY_SCREEN_ZOOM_IN:
       HandleMagnifyScreen(1);
       break;
     case MAGNIFY_SCREEN_ZOOM_OUT:
       HandleMagnifyScreen(-1);
       break;
+    case POWER_PRESSED:  // fallthrough
+    case POWER_RELEASED:
+      if (!base::SysInfo::IsRunningOnChromeOS()) {
+        // There is no powerd, the Chrome OS power manager, in linux desktop,
+        // so call the PowerButtonController here.
+        Shell::GetInstance()->power_button_controller()->OnPowerButtonEvent(
+            action == POWER_PRESSED, base::TimeTicks());
+      }
+      // We don't do anything with these at present on the device,
+      // (power button events are reported to us from powerm via
+      // D-BUS), but we consume them to prevent them from getting
+      // passed to apps -- see http://crbug.com/146609.
+      break;
     case ROTATE_SCREEN:
       HandleRotateScreen();
       break;
@@ -425,6 +433,9 @@ void AcceleratorControllerDelegateAura::PerformAction(
     case SHOW_SYSTEM_TRAY_BUBBLE:
       HandleShowSystemTrayBubble();
       break;
+    case SWAP_PRIMARY_DISPLAY:
+      HandleSwapPrimaryDisplay();
+      break;
     case TAKE_PARTIAL_SCREENSHOT:
       HandleTakePartialScreenshot(screenshot_delegate_.get());
       break;
@@ -434,38 +445,6 @@ void AcceleratorControllerDelegateAura::PerformAction(
     case TAKE_WINDOW_SCREENSHOT:
       HandleTakeWindowScreenshot(screenshot_delegate_.get());
       break;
-    case UNPIN:
-      accelerators::Unpin();
-      break;
-#if defined(OS_CHROMEOS)
-    case DEV_ADD_REMOVE_DISPLAY:
-      Shell::GetInstance()->display_manager()->AddRemoveDisplay();
-      break;
-    case DEV_TOGGLE_UNIFIED_DESKTOP:
-      Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(
-          !Shell::GetInstance()->display_manager()->unified_desktop_enabled());
-      break;
-    case LOCK_PRESSED:
-    case LOCK_RELEASED:
-      Shell::GetInstance()->power_button_controller()->OnLockButtonEvent(
-          action == LOCK_PRESSED, base::TimeTicks());
-      break;
-    case POWER_PRESSED:  // fallthrough
-    case POWER_RELEASED:
-      if (!base::SysInfo::IsRunningOnChromeOS()) {
-        // There is no powerd, the Chrome OS power manager, in linux desktop,
-        // so call the PowerButtonController here.
-        Shell::GetInstance()->power_button_controller()->OnPowerButtonEvent(
-            action == POWER_PRESSED, base::TimeTicks());
-      }
-      // We don't do anything with these at present on the device,
-      // (power button events are reported to us from powerm via
-      // D-BUS), but we consume them to prevent them from getting
-      // passed to apps -- see http://crbug.com/146609.
-      break;
-    case SWAP_PRIMARY_DISPLAY:
-      HandleSwapPrimaryDisplay();
-      break;
     case TOGGLE_MIRROR_MODE:
       HandleToggleMirrorMode();
       break;
@@ -478,7 +457,9 @@ void AcceleratorControllerDelegateAura::PerformAction(
     case TOUCH_HUD_PROJECTION_TOGGLE:
       accelerators::ToggleTouchHudProjection();
       break;
-#endif
+    case UNPIN:
+      accelerators::Unpin();
+      break;
     default:
       break;
   }