ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/common/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 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/common/accelerators/accelerator_controller.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/accelerators/accelerator_controller_delegate.h"
@@ skipping 41 matching lines @@
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/message_center/message_center.h"
 
 namespace ash {
 namespace {
 
 using base::UserMetricsAction;
+using message_center::Notification;
+
+// Identifier for the high contrast toggle accelerator notification.
+const char kHighContrastToggleAccelNotificationId[] =
+    "chrome://settings/accessibility/highcontrast";
 
 ui::Accelerator CreateAccelerator(ui::KeyboardCode keycode,
                                   int modifiers,
                                   bool trigger_on_press) {
   ui::Accelerator accelerator(keycode, modifiers);
   accelerator.set_type(trigger_on_press ? ui::ET_KEY_PRESSED
                                         : ui::ET_KEY_RELEASED);
   return accelerator;
 }
 
@@ skipping 242 matching lines @@
   // Docked windows do not support centering.
   WmWindow* active_window = WmShell::Get()->GetActiveWindow();
   return (active_window && !active_window->GetWindowState()->IsDocked());
 }
 
 void HandlePositionCenter() {
   base::RecordAction(UserMetricsAction("Accel_Window_Position_Center"));
   wm::CenterWindow(WmShell::Get()->GetActiveWindow());
 }
 
-#if defined(OS_CHROMEOS)
-
-using message_center::Notification;
-
-// Identifier for the high contrast toggle accelerator notification.
-const char kHighContrastToggleAccelNotificationId[] =
-    "chrome://settings/accessibility/highcontrast";
-
 void HandleShowImeMenuBubble() {
   base::RecordAction(UserMetricsAction("Accel_Show_Ime_Menu_Bubble"));
 
   StatusAreaWidget* status_area_widget =
       WmShelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow())
           ->GetStatusAreaWidget();
   if (status_area_widget) {
     ImeMenuTray* ime_menu_tray = status_area_widget->ime_menu_tray();
     if (ime_menu_tray && ime_menu_tray->visible() &&
         !ime_menu_tray->IsImeMenuBubbleShown()) {
@@ skipping 181 matching lines @@
 
 void HandleVolumeUp(mojom::VolumeController* volume_controller,
                     const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_VOLUME_UP)
     base::RecordAction(UserMetricsAction("Accel_VolumeUp_F10"));
 
   if (volume_controller)
     volume_controller->VolumeUp();
 }
 
-#endif  // defined(OS_CHROMEOS)
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
 
 AcceleratorController::AcceleratorController(
     AcceleratorControllerDelegate* delegate,
     ui::AcceleratorManagerDelegate* manager_delegate)
     : delegate_(delegate),
       accelerator_manager_(new ui::AcceleratorManager(manager_delegate)),
@@ skipping 179 matching lines @@
     ui::Accelerator accelerator =
         CreateAccelerator(accelerators[i].keycode, accelerators[i].modifiers,
                           accelerators[i].trigger_on_press);
     ui_accelerators.push_back(accelerator);
     accelerators_.insert(std::make_pair(accelerator, accelerators[i].action));
   }
   Register(ui_accelerators, this);
 }
 
 void AcceleratorController::RegisterDeprecatedAccelerators() {
-#if defined(OS_CHROMEOS)
   for (size_t i = 0; i < kDeprecatedAcceleratorsDataLength; ++i) {
     const DeprecatedAcceleratorData* data = &kDeprecatedAcceleratorsData[i];
     actions_with_deprecations_[data->action] = data;
   }
 
   std::vector<ui::Accelerator> ui_accelerators;
   for (size_t i = 0; i < kDeprecatedAcceleratorsLength; ++i) {
     const AcceleratorData& accelerator_data = kDeprecatedAccelerators[i];
     const ui::Accelerator deprecated_accelerator =
         CreateAccelerator(accelerator_data.keycode, accelerator_data.modifiers,
                           accelerator_data.trigger_on_press);
 
     ui_accelerators.push_back(deprecated_accelerator);
     accelerators_[deprecated_accelerator] = accelerator_data.action;
     deprecated_accelerators_.insert(deprecated_accelerator);
   }
   Register(ui_accelerators, this);
-#endif  // defined(OS_CHROMEOS)
 }
 
 bool AcceleratorController::CanPerformAction(
     AcceleratorAction action,
     const ui::Accelerator& accelerator) {
   if (accelerator.IsRepeat() && !repeatable_actions_.count(action))
     return false;
 
   AcceleratorProcessingRestriction restriction =
       GetAcceleratorProcessingRestriction(action);
   if (restriction != RESTRICTION_NONE)
     return restriction == RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
 
   const ui::Accelerator& previous_accelerator =
       accelerator_history_->previous_accelerator();
 
   // True should be returned if running |action| does something. Otherwise,
   // false should be returned to give the web contents a chance at handling the
   // accelerator.
   switch (action) {
     case CYCLE_BACKWARD_MRU:
     case CYCLE_FORWARD_MRU:
       return CanHandleCycleMru(accelerator);
     case DEBUG_PRINT_LAYER_HIERARCHY:
     case DEBUG_PRINT_VIEW_HIERARCHY:
     case DEBUG_PRINT_WINDOW_HIERARCHY:
+    case DEBUG_SHOW_TOAST:
+    case DEBUG_TOGGLE_TOUCH_PAD:
+    case DEBUG_TOGGLE_TOUCH_SCREEN:
+    case DEBUG_TOGGLE_TOUCH_VIEW:
     case DEBUG_TOGGLE_WALLPAPER_MODE:
     case DEBUG_TRIGGER_CRASH:
       return debug::DebugAcceleratorsEnabled();
+    case DISABLE_CAPS_LOCK:
+      return CanHandleDisableCapsLock(previous_accelerator);
+    case LOCK_SCREEN:
+      return CanHandleLock();
     case NEW_INCOGNITO_WINDOW:
       return CanHandleNewIncognitoWindow();
     case NEXT_IME:
       return CanHandleNextIme(ime_control_delegate_.get());
     case PREVIOUS_IME:
       return CanHandlePreviousIme(ime_control_delegate_.get());
     case SHOW_MESSAGE_CENTER_BUBBLE:
       return CanHandleShowMessageCenterBubble();
+    case SHOW_STYLUS_TOOLS:
+      return CanHandleShowStylusTools();
     case SWITCH_IME:
       return CanHandleSwitchIme(ime_control_delegate_.get(), accelerator);
+    case SWITCH_TO_PREVIOUS_USER:
+    case SWITCH_TO_NEXT_USER:
+      return CanHandleCycleUser();
     case TOGGLE_APP_LIST:
       return CanHandleToggleAppList(accelerator, previous_accelerator);
+    case TOGGLE_CAPS_LOCK:
+      return CanHandleToggleCapsLock(accelerator, previous_accelerator);
     case WINDOW_CYCLE_SNAP_DOCK_LEFT:
     case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
       return CanHandleWindowSnapOrDock();
     case WINDOW_POSITION_CENTER:
       return CanHandlePositionCenter();
-#if defined(OS_CHROMEOS)
-    case DEBUG_SHOW_TOAST:
-    case DEBUG_TOGGLE_TOUCH_PAD:
-    case DEBUG_TOGGLE_TOUCH_SCREEN:
-    case DEBUG_TOGGLE_TOUCH_VIEW:
-      return debug::DebugAcceleratorsEnabled();
-    case DISABLE_CAPS_LOCK:
-      return CanHandleDisableCapsLock(previous_accelerator);
-    case LOCK_SCREEN:
-      return CanHandleLock();
-    case SHOW_STYLUS_TOOLS:
-      return CanHandleShowStylusTools();
-    case SWITCH_TO_PREVIOUS_USER:
-    case SWITCH_TO_NEXT_USER:
-      return CanHandleCycleUser();
-    case TOGGLE_CAPS_LOCK:
-      return CanHandleToggleCapsLock(accelerator, previous_accelerator);
-#endif
+
+    // The following are always enabled.
+    case BRIGHTNESS_DOWN:
+    case BRIGHTNESS_UP:
     case EXIT:
     case FOCUS_NEXT_PANE:
     case FOCUS_PREVIOUS_PANE:
     case FOCUS_SHELF:
+    case KEYBOARD_BRIGHTNESS_DOWN:
+    case KEYBOARD_BRIGHTNESS_UP:
     case LAUNCH_APP_0:
     case LAUNCH_APP_1:
     case LAUNCH_APP_2:
     case LAUNCH_APP_3:
     case LAUNCH_APP_4:
     case LAUNCH_APP_5:
     case LAUNCH_APP_6:
     case LAUNCH_APP_7:
     case LAUNCH_LAST_APP:
     case MEDIA_NEXT_TRACK:
     case MEDIA_PLAY_PAUSE:
     case MEDIA_PREV_TRACK:
     case NEW_TAB:
     case NEW_WINDOW:
+    case OPEN_CROSH:
     case OPEN_FEEDBACK_PAGE:
+    case OPEN_FILE_MANAGER:
+    case OPEN_GET_HELP:
     case PRINT_UI_HIERARCHIES:
     case RESTORE_TAB:
+    case SHOW_IME_MENU_BUBBLE:
     case SHOW_KEYBOARD_OVERLAY:
     case SHOW_TASK_MANAGER:
+    case SUSPEND:
     case TOGGLE_FULLSCREEN:
+    case TOGGLE_HIGH_CONTRAST:
     case TOGGLE_MAXIMIZED:
     case TOGGLE_OVERVIEW:
-    case WINDOW_MINIMIZE:
-#if defined(OS_CHROMEOS)
-    case BRIGHTNESS_DOWN:
-    case BRIGHTNESS_UP:
-    case KEYBOARD_BRIGHTNESS_DOWN:
-    case KEYBOARD_BRIGHTNESS_UP:
-    case OPEN_CROSH:
-    case OPEN_FILE_MANAGER:
-    case OPEN_GET_HELP:
-    case SHOW_IME_MENU_BUBBLE:
-    case SUSPEND:
-    case TOGGLE_HIGH_CONTRAST:
     case TOGGLE_SPOKEN_FEEDBACK:
     case TOGGLE_WIFI:
     case VOLUME_DOWN:
     case VOLUME_MUTE:
     case VOLUME_UP:
-#else
-    case DUMMY_FOR_RESERVED:
-#endif
+    case WINDOW_MINIMIZE:
       return true;
 
     default:
       // Default switch is temporary until mash transition complete. Needed as
       // some actions don't yet work with mash.
       break;
   }
   return delegate_ && delegate_->HandlesAction(action) &&
          delegate_->CanPerformAction(action, accelerator, previous_accelerator);
 }
 
 void AcceleratorController::PerformAction(AcceleratorAction action,
                                           const ui::Accelerator& accelerator) {
   AcceleratorProcessingRestriction restriction =
       GetAcceleratorProcessingRestriction(action);
   if (restriction != RESTRICTION_NONE)
     return;
 
   // If your accelerator invokes more than one line of code, please either
   // implement it in your module's controller code or pull it into a HandleFoo()
   // function above.
   switch (action) {
+    case BRIGHTNESS_DOWN: {
+      BrightnessControlDelegate* delegate =
+          WmShell::Get()->brightness_control_delegate();
+      if (delegate)
+        delegate->HandleBrightnessDown(accelerator);
+      break;
+    }
+    case BRIGHTNESS_UP: {
+      BrightnessControlDelegate* delegate =
+          WmShell::Get()->brightness_control_delegate();
+      if (delegate)
+        delegate->HandleBrightnessUp(accelerator);
+      break;
+    }
     case CYCLE_BACKWARD_MRU:
       HandleCycleBackwardMRU(accelerator);
       break;
     case CYCLE_FORWARD_MRU:
       HandleCycleForwardMRU(accelerator);
       break;
     case DEBUG_PRINT_LAYER_HIERARCHY:
     case DEBUG_PRINT_VIEW_HIERARCHY:
     case DEBUG_PRINT_WINDOW_HIERARCHY:
+    case DEBUG_SHOW_TOAST:
+    case DEBUG_TOGGLE_TOUCH_PAD:
+    case DEBUG_TOGGLE_TOUCH_SCREEN:
+    case DEBUG_TOGGLE_TOUCH_VIEW:
     case DEBUG_TOGGLE_WALLPAPER_MODE:
     case DEBUG_TRIGGER_CRASH:
       debug::PerformDebugActionIfEnabled(action);
       break;
+    case DISABLE_CAPS_LOCK:
+      HandleDisableCapsLock();
+      break;
     case EXIT:
       // UMA metrics are recorded in the handler.
       exit_warning_handler_.HandleAccelerator();
       break;
     case FOCUS_NEXT_PANE:
       HandleRotatePaneFocus(FocusCycler::FORWARD);
       break;
     case FOCUS_PREVIOUS_PANE:
       HandleRotatePaneFocus(FocusCycler::BACKWARD);
       break;
     case FOCUS_SHELF:
       HandleFocusShelf();
       break;
+    case KEYBOARD_BRIGHTNESS_DOWN: {
+      KeyboardBrightnessControlDelegate* delegate =
+          WmShell::Get()->keyboard_brightness_control_delegate();
+      if (delegate)
+        delegate->HandleKeyboardBrightnessDown(accelerator);
+      break;
+    }
+    case KEYBOARD_BRIGHTNESS_UP: {
+      KeyboardBrightnessControlDelegate* delegate =
+          WmShell::Get()->keyboard_brightness_control_delegate();
+      if (delegate)
+        delegate->HandleKeyboardBrightnessUp(accelerator);
+      break;
+    }
     case LAUNCH_APP_0:
       HandleLaunchAppN(0);
       break;
     case LAUNCH_APP_1:
       HandleLaunchAppN(1);
       break;
     case LAUNCH_APP_2:
       HandleLaunchAppN(2);
       break;
     case LAUNCH_APP_3:
       HandleLaunchAppN(3);
       break;
     case LAUNCH_APP_4:
       HandleLaunchAppN(4);
       break;
     case LAUNCH_APP_5:
       HandleLaunchAppN(5);
       break;
     case LAUNCH_APP_6:
       HandleLaunchAppN(6);
       break;
     case LAUNCH_APP_7:
       HandleLaunchAppN(7);
       break;
     case LAUNCH_LAST_APP:
       HandleLaunchLastApp();
       break;
+    case LOCK_SCREEN:
+      HandleLock();
+      break;
     case MEDIA_NEXT_TRACK:
       HandleMediaNextTrack();
       break;
     case MEDIA_PLAY_PAUSE:
       HandleMediaPlayPause();
       break;
     case MEDIA_PREV_TRACK:
       HandleMediaPrevTrack();
       break;
     case NEW_INCOGNITO_WINDOW:
       HandleNewIncognitoWindow();
       break;
     case NEW_TAB:
       HandleNewTab(accelerator);
       break;
     case NEW_WINDOW:
       HandleNewWindow();
       break;
     case NEXT_IME:
       HandleNextIme(ime_control_delegate_.get());
       break;
+    case OPEN_CROSH:
+      HandleCrosh();
+      break;
     case OPEN_FEEDBACK_PAGE:
       HandleOpenFeedbackPage();
       break;
+    case OPEN_FILE_MANAGER:
+      HandleFileManager();
+      break;
+    case OPEN_GET_HELP:
+      HandleGetHelp();
+      break;
     case PREVIOUS_IME:
       HandlePreviousIme(ime_control_delegate_.get(), accelerator);
       break;
     case PRINT_UI_HIERARCHIES:
       debug::PrintUIHierarchies();
       break;
     case RESTORE_TAB:
       HandleRestoreTab();
       break;
+    case SHOW_IME_MENU_BUBBLE:
+      HandleShowImeMenuBubble();
+      break;
     case SHOW_KEYBOARD_OVERLAY:
       HandleShowKeyboardOverlay();
       break;
     case SHOW_MESSAGE_CENTER_BUBBLE:
       HandleShowMessageCenterBubble();
       break;
+    case SHOW_STYLUS_TOOLS:
+      HandleShowStylusTools();
+      break;
     case SHOW_TASK_MANAGER:
       HandleShowTaskManager();
       break;
+    case SUSPEND:
+      HandleSuspend();
+      break;
     case SWITCH_IME:
       HandleSwitchIme(ime_control_delegate_.get(), accelerator);
       break;
+    case SWITCH_TO_NEXT_USER:
+      HandleCycleUser(SessionStateDelegate::CYCLE_TO_NEXT_USER);
+      break;
+    case SWITCH_TO_PREVIOUS_USER:
+      HandleCycleUser(SessionStateDelegate::CYCLE_TO_PREVIOUS_USER);
+      break;
     case TOGGLE_APP_LIST:
       HandleToggleAppList(accelerator);
       break;
+    case TOGGLE_CAPS_LOCK:
+      HandleToggleCapsLock();
+      break;
     case TOGGLE_FULLSCREEN:
       HandleToggleFullscreen(accelerator);
       break;
+    case TOGGLE_HIGH_CONTRAST:
+      HandleToggleHighContrast();
+      break;
     case TOGGLE_MAXIMIZED:
       accelerators::ToggleMaximized();
       break;
     case TOGGLE_OVERVIEW:
       HandleToggleOverview();
       break;
-    case WINDOW_CYCLE_SNAP_DOCK_LEFT:
-    case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
-      HandleWindowSnapOrDock(action);
-      break;
-    case WINDOW_MINIMIZE:
-      HandleWindowMinimize();
-      break;
-    case WINDOW_POSITION_CENTER:
-      HandlePositionCenter();
-      break;
-#if defined(OS_CHROMEOS)
-    case BRIGHTNESS_DOWN: {
-      BrightnessControlDelegate* delegate =
-          WmShell::Get()->brightness_control_delegate();
-      if (delegate)
-        delegate->HandleBrightnessDown(accelerator);
-      break;
-    }
-    case BRIGHTNESS_UP: {
-      BrightnessControlDelegate* delegate =
-          WmShell::Get()->brightness_control_delegate();
-      if (delegate)
-        delegate->HandleBrightnessUp(accelerator);
-      break;
-    }
-    case DEBUG_SHOW_TOAST:
-    case DEBUG_TOGGLE_TOUCH_PAD:
-    case DEBUG_TOGGLE_TOUCH_SCREEN:
-    case DEBUG_TOGGLE_TOUCH_VIEW:
-      debug::PerformDebugActionIfEnabled(action);
-      break;
-    case DISABLE_CAPS_LOCK:
-      HandleDisableCapsLock();
-      break;
-    case KEYBOARD_BRIGHTNESS_DOWN: {
-      KeyboardBrightnessControlDelegate* delegate =
-          WmShell::Get()->keyboard_brightness_control_delegate();
-      if (delegate)
-        delegate->HandleKeyboardBrightnessDown(accelerator);
-      break;
-    }
-    case KEYBOARD_BRIGHTNESS_UP: {
-      KeyboardBrightnessControlDelegate* delegate =
-          WmShell::Get()->keyboard_brightness_control_delegate();
-      if (delegate)
-        delegate->HandleKeyboardBrightnessUp(accelerator);
-      break;
-    }
-    case LOCK_SCREEN:
-      HandleLock();
-      break;
-    case SHOW_IME_MENU_BUBBLE:
-      HandleShowImeMenuBubble();
-      break;
-    case OPEN_CROSH:
-      HandleCrosh();
-      break;
-    case OPEN_FILE_MANAGER:
-      HandleFileManager();
-      break;
-    case OPEN_GET_HELP:
-      HandleGetHelp();
-      break;
-    case SHOW_STYLUS_TOOLS:
-      HandleShowStylusTools();
-      break;
-    case SUSPEND:
-      HandleSuspend();
-      break;
-    case SWITCH_TO_NEXT_USER:
-      HandleCycleUser(SessionStateDelegate::CYCLE_TO_NEXT_USER);
-      break;
-    case SWITCH_TO_PREVIOUS_USER:
-      HandleCycleUser(SessionStateDelegate::CYCLE_TO_PREVIOUS_USER);
-      break;
-    case TOGGLE_CAPS_LOCK:
-      HandleToggleCapsLock();
-      break;
-    case TOGGLE_HIGH_CONTRAST:
-      HandleToggleHighContrast();
-      break;
     case TOGGLE_SPOKEN_FEEDBACK:
       HandleToggleSpokenFeedback();
       break;
     case TOGGLE_WIFI:
       WmShell::Get()->system_tray_notifier()->NotifyRequestToggleWifi();
       break;
     case VOLUME_DOWN:
       HandleVolumeDown(volume_controller_.get(), accelerator);
       break;
     case VOLUME_MUTE:
       HandleVolumeMute(volume_controller_.get(), accelerator);
       break;
     case VOLUME_UP:
       HandleVolumeUp(volume_controller_.get(), accelerator);
       break;
-#else
-    case DUMMY_FOR_RESERVED:
-      NOTREACHED();
+    case WINDOW_CYCLE_SNAP_DOCK_LEFT:
+    case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
+      HandleWindowSnapOrDock(action);
       break;
-#endif
+    case WINDOW_MINIMIZE:
+      HandleWindowMinimize();
+      break;
+    case WINDOW_POSITION_CENTER:
+      HandlePositionCenter();
+      break;
     default:
       // Temporary until mash transition complete. Needed as some actions
       // don't yet work with mash.
       DCHECK(delegate_ && delegate_->HandlesAction(action));
       delegate_->PerformAction(action, accelerator);
       break;
   }
 }
 
 bool AcceleratorController::ShouldActionConsumeKeyEvent(
@@ skipping 78 matching lines @@
         data->old_shortcut_id, data->new_shortcut_id);
   }
 
   if (!data->deprecated_enabled)
     return AcceleratorProcessingStatus::STOP;
 
   return AcceleratorProcessingStatus::PROCEED;
 }
 
 }  // namespace ash