ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/common/accelerators/accelerator_table.h

 // 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.
 
 #ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
 #define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
 
 #include <stddef.h>
 
 #include "ash/ash_export.h"
@@ skipping 34 matching lines @@
 // In particular, there is not an accelerator processing pass for Ash after
 // the browser gets the accelerator.  See crbug.com/285308 for details.
 //
 // There are also various restrictions on accelerators allowed at the login
 // screen, when running in "forced app mode" (like a kiosk), etc. See the
 // various kActionsAllowed* below.
 //
 // Please put if/def sections at the end of the bare section and keep the list
 // within each section in alphabetical order.
 enum AcceleratorAction {
+  BRIGHTNESS_DOWN,
+  BRIGHTNESS_UP,
   CYCLE_BACKWARD_MRU,
   CYCLE_FORWARD_MRU,
   DEBUG_PRINT_LAYER_HIERARCHY,
   DEBUG_PRINT_VIEW_HIERARCHY,
   DEBUG_PRINT_WINDOW_HIERARCHY,
+  DEBUG_SHOW_TOAST,
   DEBUG_TOGGLE_DEVICE_SCALE_FACTOR,
   DEBUG_TOGGLE_SHOW_DEBUG_BORDERS,
   DEBUG_TOGGLE_SHOW_FPS_COUNTER,
   DEBUG_TOGGLE_SHOW_PAINT_RECTS,
+  DEBUG_TOGGLE_TOUCH_PAD,
+  DEBUG_TOGGLE_TOUCH_SCREEN,
+  DEBUG_TOGGLE_TOUCH_VIEW,
   DEBUG_TOGGLE_WALLPAPER_MODE,
   DEBUG_TRIGGER_CRASH,  // Intentionally crash the ash process.
+  DEV_ADD_REMOVE_DISPLAY,
   DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN,
+  DEV_TOGGLE_UNIFIED_DESKTOP,
+  DISABLE_CAPS_LOCK,
   EXIT,
   FOCUS_NEXT_PANE,
   FOCUS_PREVIOUS_PANE,
   FOCUS_SHELF,
+  KEYBOARD_BRIGHTNESS_DOWN,
+  KEYBOARD_BRIGHTNESS_UP,
   LAUNCH_APP_0,
   LAUNCH_APP_1,
   LAUNCH_APP_2,
   LAUNCH_APP_3,
   LAUNCH_APP_4,
   LAUNCH_APP_5,
   LAUNCH_APP_6,
   LAUNCH_APP_7,
   LAUNCH_LAST_APP,
+  LOCK_PRESSED,
+  LOCK_RELEASED,
+  LOCK_SCREEN,
   MAGNIFY_SCREEN_ZOOM_IN,
   MAGNIFY_SCREEN_ZOOM_OUT,
   MEDIA_NEXT_TRACK,
   MEDIA_PLAY_PAUSE,
   MEDIA_PREV_TRACK,
   NEW_INCOGNITO_WINDOW,
   NEW_TAB,
   NEW_WINDOW,
   NEXT_IME,
+  OPEN_CROSH,
   OPEN_FEEDBACK_PAGE,
+  OPEN_FILE_MANAGER,
+  OPEN_GET_HELP,
+  POWER_PRESSED,
+  POWER_RELEASED,
   PREVIOUS_IME,
   PRINT_UI_HIERARCHIES,
   RESTORE_TAB,
   ROTATE_SCREEN,
   ROTATE_WINDOW,
   SCALE_UI_DOWN,
   SCALE_UI_RESET,
   SCALE_UI_UP,
+  SHOW_IME_MENU_BUBBLE,
   SHOW_KEYBOARD_OVERLAY,
   SHOW_MESSAGE_CENTER_BUBBLE,
+  SHOW_STYLUS_TOOLS,
   SHOW_SYSTEM_TRAY_BUBBLE,
   SHOW_TASK_MANAGER,
+  SUSPEND,
+  SWAP_PRIMARY_DISPLAY,
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
-  TAKE_WINDOW_SCREENSHOT,
+  SWITCH_TO_NEXT_USER,
+  SWITCH_TO_PREVIOUS_USER,
   TAKE_PARTIAL_SCREENSHOT,
   TAKE_SCREENSHOT,
+  TAKE_WINDOW_SCREENSHOT,
   TOGGLE_APP_LIST,
+  TOGGLE_CAPS_LOCK,
   TOGGLE_FULLSCREEN,
+  TOGGLE_HIGH_CONTRAST,
   TOGGLE_MAXIMIZED,
+  TOGGLE_MIRROR_MODE,
   TOGGLE_OVERVIEW,
-  UNPIN,
-  WINDOW_MINIMIZE,
-  WINDOW_POSITION_CENTER,
-  WINDOW_CYCLE_SNAP_DOCK_LEFT,
-  WINDOW_CYCLE_SNAP_DOCK_RIGHT,
-#if defined(OS_CHROMEOS)
-  BRIGHTNESS_DOWN,
-  BRIGHTNESS_UP,
-  DEBUG_SHOW_TOAST,
-  DEBUG_TOGGLE_TOUCH_PAD,
-  DEBUG_TOGGLE_TOUCH_SCREEN,
-  DEBUG_TOGGLE_TOUCH_VIEW,
-  DEV_ADD_REMOVE_DISPLAY,
-  DEV_TOGGLE_UNIFIED_DESKTOP,
-  DISABLE_CAPS_LOCK,
-  KEYBOARD_BRIGHTNESS_DOWN,
-  KEYBOARD_BRIGHTNESS_UP,
-  LOCK_PRESSED,
-  LOCK_RELEASED,
-  LOCK_SCREEN,
-  OPEN_CROSH,
-  OPEN_FILE_MANAGER,
-  OPEN_GET_HELP,
-  POWER_PRESSED,
-  POWER_RELEASED,
-  SHOW_IME_MENU_BUBBLE,
-  SUSPEND,
-  SHOW_STYLUS_TOOLS,
-  SWAP_PRIMARY_DISPLAY,
-  SWITCH_TO_NEXT_USER,
-  SWITCH_TO_PREVIOUS_USER,
-  TOGGLE_CAPS_LOCK,
-  TOGGLE_HIGH_CONTRAST,
-  TOGGLE_MIRROR_MODE,
   TOGGLE_SPOKEN_FEEDBACK,
   TOGGLE_WIFI,
   TOUCH_HUD_CLEAR,
   TOUCH_HUD_MODE_CHANGE,
   TOUCH_HUD_PROJECTION_TOGGLE,
+  UNPIN,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
-#else
-  DUMMY_FOR_RESERVED,
-#endif
+  WINDOW_CYCLE_SNAP_DOCK_LEFT,
+  WINDOW_CYCLE_SNAP_DOCK_RIGHT,
+  WINDOW_MINIMIZE,
+  WINDOW_POSITION_CENTER,
 };
 
 struct AcceleratorData {
   bool trigger_on_press;
   ui::KeyboardCode keycode;
   int modifiers;
   AcceleratorAction action;
 };
 
 // Gathers the needed data to handle deprecated accelerators.
@@ skipping 25 matching lines @@
 enum DeprecatedAcceleratorUsage {
   DEPRECATED_USED = 0,     // The deprecated accelerator is used.
   NEW_USED,                // The new accelerator is used.
   DEPRECATED_USAGE_COUNT,  // Maximum value of this enum for histogram use.
 };
 
 // Accelerators handled by AcceleratorController.
 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
 ASH_EXPORT extern const size_t kAcceleratorDataLength;
 
-#if defined(OS_CHROMEOS)
 // The list of the deprecated accelerators.
 ASH_EXPORT extern const AcceleratorData kDeprecatedAccelerators[];
 ASH_EXPORT extern const size_t kDeprecatedAcceleratorsLength;
 
 // The list of the actions with deprecated accelerators and the needed data to
 // handle them.
 ASH_EXPORT extern const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[];
 ASH_EXPORT extern const size_t kDeprecatedAcceleratorsDataLength;
-#endif  // defined(OS_CHROMEOS)
 
 // Debug accelerators. Debug accelerators are only enabled when the "Debugging
 // keyboard shortcuts" flag (--ash-debug-shortcuts) is enabled. Debug actions
 // are always run (similar to reserved actions). Debug accelerators can be
 // enabled in about:flags.
 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[];
 ASH_EXPORT extern const size_t kDebugAcceleratorDataLength;
 
 // Developer accelerators that are enabled only with the command-line switch
 // --ash-dev-shortcuts. They are always run similar to reserved actions.
@@ skipping 41 matching lines @@
 ASH_EXPORT extern const AcceleratorAction kActionsNeedingWindow[];
 ASH_EXPORT extern const size_t kActionsNeedingWindowLength;
 
 // Actions that can be performed while keeping the menu open.
 ASH_EXPORT extern const AcceleratorAction kActionsKeepingMenuOpen[];
 ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength;
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_