ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/mus/accelerators/accelerator_controller_delegate_mus.cc

Index: ash/mus/accelerators/accelerator_controller_delegate_mus.cc
diff --git a/ash/mus/accelerators/accelerator_controller_delegate_mus.cc b/ash/mus/accelerators/accelerator_controller_delegate_mus.cc
index 5dd823af72b71048d8809c744b2416f158e3d501..38771a2a4ea1e358d0563cd35ae94a34a4ee20bb 100644
--- a/ash/mus/accelerators/accelerator_controller_delegate_mus.cc
+++ b/ash/mus/accelerators/accelerator_controller_delegate_mus.cc
@@ -18,13 +18,7 @@ namespace mus {
 
 AcceleratorControllerDelegateMus::AcceleratorControllerDelegateMus(
     WindowManager* window_manager)
-    : window_manager_(window_manager) {
-#if !defined(OS_CHROMEOS)
-  // To avoid trybot complaining that |window_manager_| is not being used in
-  // non-ChromeOS.
-  window_manager_ = nullptr;
-#endif
-}
+    : window_manager_(window_manager) {}
 
 AcceleratorControllerDelegateMus::~AcceleratorControllerDelegateMus() {}
 
@@ -36,44 +30,37 @@ bool AcceleratorControllerDelegateMus::HandlesAction(AcceleratorAction action) {
   // should be moved to accelerator_controller.cc/h. See
   // http://crbug.com/612331.
   switch (action) {
+    case DEV_ADD_REMOVE_DISPLAY:
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
+    case ROTATE_SCREEN:
     case SCALE_UI_DOWN:
     case SCALE_UI_RESET:
     case SCALE_UI_UP:
-    case ROTATE_SCREEN:
+    case SWAP_PRIMARY_DISPLAY:
+    case TOGGLE_MIRROR_MODE:
+    case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
     case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
-    case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
     case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
     case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
     case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
+    case DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
+    case LOCK_PRESSED:
+    case LOCK_RELEASED:
     case MAGNIFY_SCREEN_ZOOM_IN:
     case MAGNIFY_SCREEN_ZOOM_OUT:
+    case POWER_PRESSED:
+    case POWER_RELEASED:
     case ROTATE_WINDOW:
     case SHOW_SYSTEM_TRAY_BUBBLE:
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TAKE_WINDOW_SCREENSHOT:
-    case UNPIN:
-      NOTIMPLEMENTED();
-      return false;
-
-#if defined(OS_CHROMEOS)
-    case DEV_ADD_REMOVE_DISPLAY:
-    case DEV_TOGGLE_UNIFIED_DESKTOP:
-    case SWAP_PRIMARY_DISPLAY:
-    case TOGGLE_MIRROR_MODE:
-    case TOUCH_HUD_PROJECTION_TOGGLE:
-      return true;
-    case LOCK_PRESSED:
-    case LOCK_RELEASED:
-    case POWER_PRESSED:
-    case POWER_RELEASED:
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
+    case UNPIN:
       NOTIMPLEMENTED();
       return false;
-#endif
-
     default:
       break;
   }
@@ -85,21 +72,18 @@ bool AcceleratorControllerDelegateMus::CanPerformAction(
     const ui::Accelerator& accelerator,
     const ui::Accelerator& previous_accelerator) {
   switch (action) {
+    case DEV_ADD_REMOVE_DISPLAY:
+    case DEV_TOGGLE_UNIFIED_DESKTOP:
     case ROTATE_SCREEN:
     case SCALE_UI_DOWN:
     case SCALE_UI_RESET:
     case SCALE_UI_UP:
       return true;
-#if defined(OS_CHROMEOS)
-    case DEV_ADD_REMOVE_DISPLAY:
-    case DEV_TOGGLE_UNIFIED_DESKTOP:
-      return true;
     case SWAP_PRIMARY_DISPLAY:
       return display::Screen::GetScreen()->GetNumDisplays() > 1;
     case TOGGLE_MIRROR_MODE:
     case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
-#endif
     default:
       break;
   }
@@ -110,23 +94,6 @@ void AcceleratorControllerDelegateMus::PerformAction(
     AcceleratorAction action,
     const ui::Accelerator& accelerator) {
   switch (action) {
-    case ROTATE_SCREEN: {
-      window_manager_->GetDisplayController()->RotateCurrentDisplayCW();
-      break;
-    }
-    case SCALE_UI_DOWN: {
-      window_manager_->GetDisplayController()->DecreaseInternalDisplayZoom();
-      break;
-    }
-    case SCALE_UI_RESET: {
-      window_manager_->GetDisplayController()->ResetInternalDisplayZoom();
-      break;
-    }
-    case SCALE_UI_UP: {
-      window_manager_->GetDisplayController()->IncreaseInternalDisplayZoom();
-      break;
-    }
-#if defined(OS_CHROMEOS)
     case DEV_ADD_REMOVE_DISPLAY: {
       display::mojom::TestDisplayControllerPtr test_display_controller;
       window_manager_->connector()->BindInterface(ui::mojom::kServiceName,
@@ -143,6 +110,22 @@ void AcceleratorControllerDelegateMus::PerformAction(
       test_display_controller->ToggleDisplayResolution();
       break;
     }
+    case ROTATE_SCREEN: {
+      window_manager_->GetDisplayController()->RotateCurrentDisplayCW();
+      break;
+    }
+    case SCALE_UI_DOWN: {
+      window_manager_->GetDisplayController()->DecreaseInternalDisplayZoom();
+      break;
+    }
+    case SCALE_UI_RESET: {
+      window_manager_->GetDisplayController()->ResetInternalDisplayZoom();
+      break;
+    }
+    case SCALE_UI_UP: {
+      window_manager_->GetDisplayController()->IncreaseInternalDisplayZoom();
+      break;
+    }
     case SWAP_PRIMARY_DISPLAY: {
       window_manager_->GetDisplayController()->SwapPrimaryDisplay();
       break;
@@ -158,7 +141,6 @@ void AcceleratorControllerDelegateMus::PerformAction(
                          mash::mojom::LaunchMode::DEFAULT);
       break;
     }
-#endif
     default:
       NOTREACHED();
   }