ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/common/accelerators/accelerator_table.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_table.h"
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "base/macros.h"
 
 namespace ash {
 
 const int kDebugModifier =
     ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN;
 
 const AcceleratorData kAcceleratorData[] = {
     {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME},
     {false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME},
     // Shortcuts for Japanese IME.
     {true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME},
     {true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME},
     {true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME},
     {true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME},
     // Shortcut for Koren IME.
     {true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME},
 
     {true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU},
     {true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
      CYCLE_BACKWARD_MRU},
     {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, TOGGLE_OVERVIEW},
-#if defined(OS_CHROMEOS)
     {true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST},
     {true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI},
     {true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN},
     {true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP},
     // Maximize button.
     {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, TOGGLE_MIRROR_MODE},
     {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY},
     // Cycle windows button.
     {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT},
     {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
@@ skipping 49 matching lines @@
     {false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK},
     // The following is triggered when Alt is released while search is still
     // down. The key_code here is MENU (for Alt) and Search is a modifier
     // (EF_COMMAND_DOWN is used for Search as a modifier).
     {false, ui::VKEY_MENU, ui::EF_COMMAND_DOWN, TOGGLE_CAPS_LOCK},
     {true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE},
     {true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN},
     {true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP},
     {true, ui::VKEY_ESCAPE, ui::EF_COMMAND_DOWN, SHOW_TASK_MANAGER},
     {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, NEXT_IME},
-#else
-    // This key has been deprecated on CrOS. It is instead included below in the
-    // |kDeprecatedAccelerators|, and above in the CrOS accelerators as
-    // Search+Esc.
-    {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER},
-#endif  // defined(OS_CHROMEOS)
     {true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE},
-#if !defined(OS_WIN)
     {true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT},
-#endif
     {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
      NEW_INCOGNITO_WINDOW},
     {true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW},
     {true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB},
     {true, ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
      SCALE_UI_UP},
     {true, ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
      SCALE_UI_DOWN},
     {true, ui::VKEY_0, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, SCALE_UI_RESET},
     {true, ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
@@ skipping 12 matching lines @@
     {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF},
     {true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY},
     {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      SHOW_KEYBOARD_OVERLAY},
     {true, ui::VKEY_OEM_2,
      ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      SHOW_KEYBOARD_OVERLAY},
     {true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY},
     {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
      SHOW_MESSAGE_CENTER_BUBBLE},
-#if defined(OS_CHROMEOS)
     {true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, SHOW_STYLUS_TOOLS},
-#endif
     {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
      SHOW_SYSTEM_TRAY_BUBBLE},
-#if defined(OS_CHROMEOS)
     {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
      SHOW_IME_MENU_BUBBLE},
-#endif
     {true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0},
     {true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1},
     {true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2},
     {true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3},
     {true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4},
     {true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5},
     {true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6},
     {true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7},
     {true, ui::VKEY_9, ui::EF_ALT_DOWN, LAUNCH_LAST_APP},
 
@@ skipping 37 matching lines @@
 //      same notification.
 //    - The ID of the localized notification message to give the users telling
 //      them about the deprecation (Add one in |ash_chromeos_strings.grdp|.
 //      Search for the comment <!-- Deprecated Accelerators Messages -->).
 //    - The IDs of the localized old and new shortcut text to be used to fill
 //      the notification text. Also found in |ash_chromeos_strings.grdp|.
 //    - {true or false} whether the deprecated accelerator is still enabled (we
 //      don't disable a deprecated accelerator abruptly).
 // 5- Don't forget to update the keyboard overlay. Find 'shortcut' in the file
 //    keyboard_overlay_data.js.
-#if defined(OS_CHROMEOS)
-
 const AcceleratorData kDeprecatedAccelerators[] = {
     {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN},
     {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}};
 
 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators);
 
 const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = {
     {
         LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen",
         IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD,
         IDS_SHORTCUT_LOCK_SCREEN_NEW,
         false  // Old accelerator was disabled in M56.
     },
     {SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager",
      IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, IDS_SHORTCUT_TASK_MANAGER_OLD,
      IDS_SHORTCUT_TASK_MANAGER_NEW, true}};
 
 const size_t kDeprecatedAcceleratorsDataLength =
     arraysize(kDeprecatedAcceleratorsData);
 
-#endif  // defined(OS_CHROMEOS)
-
 const AcceleratorData kDebugAcceleratorData[] = {
-#if defined(OS_CHROMEOS)
     {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI},
     {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST},
     {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
      DEBUG_TOGGLE_TOUCH_PAD},
     {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
      DEBUG_TOGGLE_TOUCH_SCREEN},
     {true, ui::VKEY_T, kDebugModifier, DEBUG_TOGGLE_TOUCH_VIEW},
-#endif  // defined(OS_CHROMEOS)
     {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      DEBUG_TOGGLE_WALLPAPER_MODE},
     {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY},
     {true, ui::VKEY_V, kDebugModifier, DEBUG_PRINT_VIEW_HIERARCHY},
     {true, ui::VKEY_W, kDebugModifier, DEBUG_PRINT_WINDOW_HIERARCHY},
     {true, ui::VKEY_D, kDebugModifier, DEBUG_TOGGLE_DEVICE_SCALE_FACTOR},
     {true, ui::VKEY_B, kDebugModifier, DEBUG_TOGGLE_SHOW_DEBUG_BORDERS},
     {true, ui::VKEY_F, kDebugModifier, DEBUG_TOGGLE_SHOW_FPS_COUNTER},
     {true, ui::VKEY_P, kDebugModifier, DEBUG_TOGGLE_SHOW_PAINT_RECTS},
     {true, ui::VKEY_K, kDebugModifier, DEBUG_TRIGGER_CRASH},
 };
 
 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
 
 const AcceleratorData kDeveloperAcceleratorData[] = {
-#if defined(OS_CHROMEOS)
     // Extra shortcut for debug build to control magnifier on Linux desktop.
     {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
      MAGNIFY_SCREEN_ZOOM_OUT},
     {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
     // Extra shortcuts to lock the screen on Linux desktop.
     {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_PRESSED},
     {false, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_RELEASED},
     {true, ui::VKEY_P, ui::EF_ALT_DOWN, POWER_PRESSED},
     {false, ui::VKEY_P, ui::EF_ALT_DOWN, POWER_RELEASED},
     {true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED},
     {false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED},
     {true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
      DEV_ADD_REMOVE_DISPLAY},
     {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
      DEV_TOGGLE_UNIFIED_DESKTOP},
     {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
      TOGGLE_MIRROR_MODE},
     {true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI},
     // Extra shortcut for display swapping as Alt-F4 is taken on Linux desktop.
     {true, ui::VKEY_S, kDebugModifier, SWAP_PRIMARY_DISPLAY},
-#endif  // defined(OS_CHROMEOS)
     // Extra shortcut to rotate/scale up/down the screen on Linux desktop.
     {true, ui::VKEY_R, kDebugModifier, ROTATE_SCREEN},
     // For testing on systems where Alt-Tab is already mapped.
     {true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU},
     {true, ui::VKEY_F11, ui::EF_CONTROL_DOWN,
      DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN},
     {true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU},
     {true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
      TOGGLE_FULLSCREEN},
 };
 
 const size_t kDeveloperAcceleratorDataLength =
     arraysize(kDeveloperAcceleratorData);
 
 const AcceleratorAction kPreferredActions[] = {
     // Window cycling accelerators.
     CYCLE_BACKWARD_MRU,  // Shift+Alt+Tab
     CYCLE_FORWARD_MRU,   // Alt+Tab
 };
 
 const size_t kPreferredActionsLength = arraysize(kPreferredActions);
 
 const AcceleratorAction kReservedActions[] = {
-#if defined(OS_CHROMEOS)
     POWER_PRESSED, POWER_RELEASED, SUSPEND,
-#else
-    DUMMY_FOR_RESERVED,
-#endif
 };
 
 const size_t kReservedActionsLength = arraysize(kReservedActions);
 
 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
+    BRIGHTNESS_DOWN,
+    BRIGHTNESS_UP,
     DEBUG_PRINT_LAYER_HIERARCHY,
     DEBUG_PRINT_VIEW_HIERARCHY,
     DEBUG_PRINT_WINDOW_HIERARCHY,
-    MAGNIFY_SCREEN_ZOOM_IN,   // Control+F7
-    MAGNIFY_SCREEN_ZOOM_OUT,  // Control+F6
-    NEXT_IME,
-    PREVIOUS_IME,
-    PRINT_UI_HIERARCHIES,
-    ROTATE_SCREEN,
-    SCALE_UI_UP,
-    SCALE_UI_DOWN,
-    SCALE_UI_RESET,
-    SHOW_SYSTEM_TRAY_BUBBLE,
-    SWITCH_IME,  // Switch to another IME depending on the accelerator.
-    TAKE_WINDOW_SCREENSHOT,
-    TAKE_PARTIAL_SCREENSHOT,
-    TAKE_SCREENSHOT,
-#if defined(OS_CHROMEOS)
-    BRIGHTNESS_DOWN,
-    BRIGHTNESS_UP,
     DEBUG_TOGGLE_TOUCH_PAD,
     DEBUG_TOGGLE_TOUCH_SCREEN,
     DEBUG_TOGGLE_TOUCH_VIEW,
     DEV_ADD_REMOVE_DISPLAY,
     DISABLE_CAPS_LOCK,
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
+    MAGNIFY_SCREEN_ZOOM_IN,   // Control+F7
+    MAGNIFY_SCREEN_ZOOM_OUT,  // Control+F6
+    NEXT_IME,
+    PREVIOUS_IME,
+    PRINT_UI_HIERARCHIES,
+    ROTATE_SCREEN,
+    SCALE_UI_DOWN,
+    SCALE_UI_RESET,
+    SCALE_UI_UP,
     SHOW_IME_MENU_BUBBLE,
+    SHOW_SYSTEM_TRAY_BUBBLE,
+    SWITCH_IME,  // Switch to another IME depending on the accelerator.
+    TAKE_PARTIAL_SCREENSHOT,
+    TAKE_SCREENSHOT,
+    TAKE_WINDOW_SCREENSHOT,
     TOGGLE_CAPS_LOCK,
     TOGGLE_HIGH_CONTRAST,
+    TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
-    TOGGLE_MIRROR_MODE,
     TOGGLE_WIFI,
     TOUCH_HUD_CLEAR,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
-#endif
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
+#if !defined(NDEBUG)
     POWER_PRESSED,
     POWER_RELEASED,
-#endif  // defined(OS_CHROMEOS)
+#endif  // !defined(NDEBUG)
 };
 
 const size_t kActionsAllowedAtLoginOrLockScreenLength =
     arraysize(kActionsAllowedAtLoginOrLockScreen);
 
 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
-    EXIT,
-#if defined(OS_CHROMEOS)
-    SUSPEND,
-#endif  // defined(OS_CHROMEOS)
+    EXIT, SUSPEND,
 };
 
 const size_t kActionsAllowedAtLockScreenLength =
     arraysize(kActionsAllowedAtLockScreen);
 
 const AcceleratorAction kActionsAllowedAtModalWindow[] = {
+    BRIGHTNESS_DOWN,
+    BRIGHTNESS_UP,
+    DEBUG_TOGGLE_TOUCH_PAD,
+    DEBUG_TOGGLE_TOUCH_SCREEN,
+    DEV_ADD_REMOVE_DISPLAY,
+    DISABLE_CAPS_LOCK,
     EXIT,
+    KEYBOARD_BRIGHTNESS_DOWN,
+    KEYBOARD_BRIGHTNESS_UP,
+    LOCK_SCREEN,
     MAGNIFY_SCREEN_ZOOM_IN,
     MAGNIFY_SCREEN_ZOOM_OUT,
     MEDIA_NEXT_TRACK,
     MEDIA_PLAY_PAUSE,
     MEDIA_PREV_TRACK,
     NEXT_IME,
     OPEN_FEEDBACK_PAGE,
+    POWER_PRESSED,
+    POWER_RELEASED,
     PREVIOUS_IME,
     PRINT_UI_HIERARCHIES,
     ROTATE_SCREEN,
-    SCALE_UI_UP,
     SCALE_UI_DOWN,
     SCALE_UI_RESET,
+    SCALE_UI_UP,
+    SHOW_IME_MENU_BUBBLE,
     SHOW_KEYBOARD_OVERLAY,
+    SUSPEND,
+    SWAP_PRIMARY_DISPLAY,
     SWITCH_IME,
-    TAKE_WINDOW_SCREENSHOT,
     TAKE_PARTIAL_SCREENSHOT,
     TAKE_SCREENSHOT,
-#if defined(OS_CHROMEOS)
-    BRIGHTNESS_DOWN,
-    BRIGHTNESS_UP,
-    DEBUG_TOGGLE_TOUCH_PAD,
-    DEBUG_TOGGLE_TOUCH_SCREEN,
-    DEV_ADD_REMOVE_DISPLAY,
-    DISABLE_CAPS_LOCK,
-    KEYBOARD_BRIGHTNESS_DOWN,
-    KEYBOARD_BRIGHTNESS_UP,
-    LOCK_SCREEN,
-    POWER_PRESSED,
-    POWER_RELEASED,
-    SHOW_IME_MENU_BUBBLE,
-    SUSPEND,
-    SWAP_PRIMARY_DISPLAY,
+    TAKE_WINDOW_SCREENSHOT,
     TOGGLE_CAPS_LOCK,
     TOGGLE_HIGH_CONTRAST,
     TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
-#endif
 };
 
 const size_t kActionsAllowedAtModalWindowLength =
     arraysize(kActionsAllowedAtModalWindow);
 
 const AcceleratorAction kRepeatableActions[] = {
+    BRIGHTNESS_DOWN,
+    BRIGHTNESS_UP,
     FOCUS_NEXT_PANE,
     FOCUS_PREVIOUS_PANE,
+    KEYBOARD_BRIGHTNESS_DOWN,
+    KEYBOARD_BRIGHTNESS_UP,
     MAGNIFY_SCREEN_ZOOM_IN,
     MAGNIFY_SCREEN_ZOOM_OUT,
     MEDIA_NEXT_TRACK,
     MEDIA_PREV_TRACK,
     RESTORE_TAB,
-#if defined(OS_CHROMEOS)
-    BRIGHTNESS_DOWN,
-    BRIGHTNESS_UP,
-    KEYBOARD_BRIGHTNESS_DOWN,
-    KEYBOARD_BRIGHTNESS_UP,
     VOLUME_DOWN,
     VOLUME_UP,
-#endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kRepeatableActionsLength = arraysize(kRepeatableActions);
 
 const AcceleratorAction kActionsAllowedInAppModeOrPinnedMode[] = {
+    BRIGHTNESS_DOWN,
+    BRIGHTNESS_UP,
     DEBUG_PRINT_LAYER_HIERARCHY,
     DEBUG_PRINT_VIEW_HIERARCHY,
     DEBUG_PRINT_WINDOW_HIERARCHY,
+    DEBUG_TOGGLE_TOUCH_PAD,
+    DEBUG_TOGGLE_TOUCH_SCREEN,
+    DEV_ADD_REMOVE_DISPLAY,
+    DISABLE_CAPS_LOCK,
+    KEYBOARD_BRIGHTNESS_DOWN,
+    KEYBOARD_BRIGHTNESS_UP,
     MAGNIFY_SCREEN_ZOOM_IN,   // Control+F7
     MAGNIFY_SCREEN_ZOOM_OUT,  // Control+F6
     MEDIA_NEXT_TRACK,
     MEDIA_PLAY_PAUSE,
     MEDIA_PREV_TRACK,
     NEXT_IME,
+    POWER_PRESSED,
+    POWER_RELEASED,
     PREVIOUS_IME,
     PRINT_UI_HIERARCHIES,
     ROTATE_SCREEN,
     SCALE_UI_DOWN,
     SCALE_UI_RESET,
     SCALE_UI_UP,
+    SWAP_PRIMARY_DISPLAY,
     SWITCH_IME,  // Switch to another IME depending on the accelerator.
-#if defined(OS_CHROMEOS)
-    BRIGHTNESS_DOWN,
-    BRIGHTNESS_UP,
-    DEV_ADD_REMOVE_DISPLAY,
-    DEBUG_TOGGLE_TOUCH_PAD,
-    DEBUG_TOGGLE_TOUCH_SCREEN,
-    DISABLE_CAPS_LOCK,
-    KEYBOARD_BRIGHTNESS_DOWN,
-    KEYBOARD_BRIGHTNESS_UP,
-    POWER_PRESSED,
-    POWER_RELEASED,
-    SWAP_PRIMARY_DISPLAY,
     TOGGLE_CAPS_LOCK,
     TOGGLE_HIGH_CONTRAST,
     TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     TOUCH_HUD_CLEAR,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
-#endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsAllowedInAppModeOrPinnedModeLength =
     arraysize(kActionsAllowedInAppModeOrPinnedMode);
 
 const AcceleratorAction kActionsAllowedInPinnedMode[] = {
-    TAKE_WINDOW_SCREENSHOT,
+    LOCK_SCREEN,
+    SUSPEND,
     TAKE_PARTIAL_SCREENSHOT,
     TAKE_SCREENSHOT,
+    TAKE_WINDOW_SCREENSHOT,
     UNPIN,
-#if defined(OS_CHROMEOS)
-    LOCK_SCREEN,
-    SUSPEND,
-#endif
 };
 
 const size_t kActionsAllowedInPinnedModeLength =
     arraysize(kActionsAllowedInPinnedMode);
 
 const AcceleratorAction kActionsNeedingWindow[] = {
     CYCLE_BACKWARD_MRU,
     CYCLE_FORWARD_MRU,
     TOGGLE_OVERVIEW,
     WINDOW_CYCLE_SNAP_DOCK_LEFT,
     WINDOW_CYCLE_SNAP_DOCK_RIGHT,
     WINDOW_MINIMIZE,
     TOGGLE_FULLSCREEN,
     TOGGLE_MAXIMIZED,
     WINDOW_POSITION_CENTER,
     ROTATE_WINDOW,
 };
 
 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
 
 const AcceleratorAction kActionsKeepingMenuOpen[] = {
+    BRIGHTNESS_DOWN,
+    BRIGHTNESS_UP,
+    DEBUG_TOGGLE_TOUCH_PAD,
+    DEBUG_TOGGLE_TOUCH_SCREEN,
+    DISABLE_CAPS_LOCK,
+    KEYBOARD_BRIGHTNESS_DOWN,
+    KEYBOARD_BRIGHTNESS_UP,
     MEDIA_NEXT_TRACK,
     MEDIA_PLAY_PAUSE,
     MEDIA_PREV_TRACK,
     NEXT_IME,
     PREVIOUS_IME,
     PRINT_UI_HIERARCHIES,
     SWITCH_IME,
-    TAKE_WINDOW_SCREENSHOT,
     TAKE_PARTIAL_SCREENSHOT,
     TAKE_SCREENSHOT,
-#if defined(OS_CHROMEOS)
-    BRIGHTNESS_DOWN,
-    BRIGHTNESS_UP,
-    DEBUG_TOGGLE_TOUCH_PAD,
-    DEBUG_TOGGLE_TOUCH_SCREEN,
-    DISABLE_CAPS_LOCK,
-    KEYBOARD_BRIGHTNESS_DOWN,
-    KEYBOARD_BRIGHTNESS_UP,
+    TAKE_WINDOW_SCREENSHOT,
     TOGGLE_APP_LIST,
     TOGGLE_CAPS_LOCK,
     TOGGLE_HIGH_CONTRAST,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
-#endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
 
 }  // namespace ash