ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/accelerators/accelerator_controller_delegate_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/accelerators/accelerator_controller_delegate_aura.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 #include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/window_state.h"
 #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"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/rotator/window_rotation.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/utility/screenshot_controller.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #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"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/message_center/message_center.h"
 #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 {
 
 using base::UserMetricsAction;
 
 // The notification delegate that will be used to open the keyboard shortcut
 // help page when the notification is clicked.
 class DeprecatedAcceleratorNotificationDelegate
     : public message_center::NotificationDelegate {
  public:
@@ skipping 151 matching lines @@
 }
 
 bool CanHandleUnpin() {
   // Returns true only for WINDOW_STATE_TYPE_PINNED.
   // WINDOW_STATE_TYPE_TRUSTED_PINNED does not accept user's unpin operation.
   wm::WindowState* window_state = wm::GetActiveWindowState();
   return window_state &&
          window_state->GetStateType() == wm::WINDOW_STATE_TYPE_PINNED;
 }
 
-#if defined(OS_CHROMEOS)
 void HandleSwapPrimaryDisplay() {
   base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
 
   // TODO(rjkroege): This is not correct behaviour on devices with more than
   // two screens. Behave the same as mirroring: fail and notify if there are
   // three or more screens.
   Shell::GetInstance()->display_configuration_controller()->SetPrimaryDisplayId(
       Shell::GetInstance()->display_manager()->GetSecondaryDisplay().id(),
       true /* user_action */);
 }
@@ skipping 12 matching lines @@
 void HandleTouchHudClear() {
   RootWindowController::ForTargetRootWindow()->touch_hud_debug()->Clear();
 }
 
 void HandleTouchHudModeChange() {
   RootWindowController* controller =
       RootWindowController::ForTargetRootWindow();
   controller->touch_hud_debug()->ChangeToNextMode();
 }
 
-#endif  // defined(OS_CHROMEOS)
-
 }  // namespace
 
 AcceleratorControllerDelegateAura::AcceleratorControllerDelegateAura() {}
 
 AcceleratorControllerDelegateAura::~AcceleratorControllerDelegateAura() {}
 
 void AcceleratorControllerDelegateAura::SetScreenshotDelegate(
     std::unique_ptr<ScreenshotDelegate> screenshot_delegate) {
   screenshot_delegate_ = std::move(screenshot_delegate);
 }
 
 bool AcceleratorControllerDelegateAura::HandlesAction(
     AcceleratorAction action) {
   // NOTE: When adding a new accelerator that only depends on //ash/common code,
   // add it to accelerator_controller.cc instead. See class comment.
   switch (action) {
     case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
     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:
     case SCALE_UI_RESET:
     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;
   }
   return false;
 }
 
 bool AcceleratorControllerDelegateAura::CanPerformAction(
     AcceleratorAction action,
     const ui::Accelerator& accelerator,
     const ui::Accelerator& previous_accelerator) {
   switch (action) {
     case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
     case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
     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:
       return CanHandleMagnifyScreen();
     case SCALE_UI_DOWN:
     case SCALE_UI_RESET:
     case SCALE_UI_UP:
       return accelerators::IsInternalDisplayZoomEnabled();
     case UNPIN:
       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;
   }
   return false;
 }
 
 void AcceleratorControllerDelegateAura::PerformAction(
     AcceleratorAction action,
     const ui::Accelerator& accelerator) {
   switch (action) {
     case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
       Shell::GetInstance()->display_manager()->ToggleDisplayScaleFactor();
       break;
     case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
       debug::ToggleShowDebugBorders();
       break;
     case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
       debug::ToggleShowFpsCounter();
       break;
     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;
     case ROTATE_WINDOW:
       HandleRotateActiveWindow();
       break;
     case SCALE_UI_DOWN:
       accelerators::ZoomInternalDisplay(false /* down */);
       break;
     case SCALE_UI_RESET:
       accelerators::ResetInternalDisplayZoom();
       break;
     case SCALE_UI_UP:
       accelerators::ZoomInternalDisplay(true /* up */);
       break;
     case SHOW_SYSTEM_TRAY_BUBBLE:
       HandleShowSystemTrayBubble();
       break;
+    case SWAP_PRIMARY_DISPLAY:
+      HandleSwapPrimaryDisplay();
+      break;
     case TAKE_PARTIAL_SCREENSHOT:
       HandleTakePartialScreenshot(screenshot_delegate_.get());
       break;
     case TAKE_SCREENSHOT:
       HandleTakeScreenshot(screenshot_delegate_.get());
       break;
     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;
     case TOUCH_HUD_CLEAR:
       HandleTouchHudClear();
       break;
     case TOUCH_HUD_MODE_CHANGE:
       HandleTouchHudModeChange();
       break;
     case TOUCH_HUD_PROJECTION_TOGGLE:
       accelerators::ToggleTouchHudProjection();
       break;
-#endif
+    case UNPIN:
+      accelerators::Unpin();
+      break;
     default:
       break;
   }
 }
 
 void AcceleratorControllerDelegateAura::ShowDeprecatedAcceleratorNotification(
     const char* const notification_id,
     int message_id,
     int old_shortcut_id,
     int new_shortcut_id) {
   const base::string16 message =
       GetNotificationText(message_id, old_shortcut_id, new_shortcut_id);
   std::unique_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE, notification_id,
           base::string16(), message,
           WmShell::Get()->delegate()->GetDeprecatedAcceleratorImage(),
           base::string16(), GURL(),
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierDeprecatedAccelerator),
           message_center::RichNotificationData(),
           new DeprecatedAcceleratorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace ash