Separate debugging and developer accelerators

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 39 matching lines @@
 // 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 {
   CYCLE_BACKWARD_MRU,
   CYCLE_FORWARD_MRU,
   DEBUG_PRINT_LAYER_HIERARCHY,
   DEBUG_PRINT_VIEW_HIERARCHY,
   DEBUG_PRINT_WINDOW_HIERARCHY,
-  DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN,
+  DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN,

[oshima, 2016/09/15 20:55:53]

sort

[afakhry, 2016/09/15 21:57:40]

Done.

   DEBUG_TOGGLE_DEVICE_SCALE_FACTOR,
   DEBUG_TOGGLE_SHOW_DEBUG_BORDERS,
   DEBUG_TOGGLE_SHOW_FPS_COUNTER,
   DEBUG_TOGGLE_SHOW_PAINT_RECTS,
   DEBUG_TOGGLE_WALLPAPER_MODE,
   EXIT,
   FOCUS_NEXT_PANE,
   FOCUS_PREVIOUS_PANE,
   FOCUS_SHELF,
   LAUNCH_APP_0,
@@ skipping 36 matching lines @@
   TOGGLE_MAXIMIZED,
   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_ADD_REMOVE_DISPLAY,
+  DEV_ADD_REMOVE_DISPLAY,
   DEBUG_SHOW_TOAST,
   DEBUG_TOGGLE_TOUCH_PAD,
   DEBUG_TOGGLE_TOUCH_SCREEN,
-  DEBUG_TOGGLE_TOUCH_VIEW,
-  DEBUG_TOGGLE_UNIFIED_DESKTOP,
+  DEV_TOGGLE_TOUCH_VIEW,
+  DEV_TOGGLE_UNIFIED_DESKTOP,
   DISABLE_CAPS_LOCK,
   DISABLE_GPU_WATCHDOG,
   KEYBOARD_BRIGHTNESS_DOWN,
   KEYBOARD_BRIGHTNESS_UP,
   LOCK_PRESSED,
   LOCK_RELEASED,
   LOCK_SCREEN,
   OPEN_CROSH,
   OPEN_FILE_MANAGER,
   OPEN_GET_HELP,
@@ skipping 73 matching lines @@
 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).
 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-developer-shortcuts. They are always run similar to reserved actions.

[oshima, 2016/09/15 20:55:53]

-dev-

[afakhry, 2016/09/15 21:57:40]

Done.

+ASH_EXPORT extern const AcceleratorData kDeveloperAcceleratorData[];
+ASH_EXPORT extern const size_t kDeveloperAcceleratorDataLength;
+
 // Actions that should be handled very early in Ash unless the current target
 // window is full-screen.
 ASH_EXPORT extern const AcceleratorAction kPreferredActions[];
 ASH_EXPORT extern const size_t kPreferredActionsLength;
 
 // Actions that are always handled in Ash.
 ASH_EXPORT extern const AcceleratorAction kReservedActions[];
 ASH_EXPORT extern const size_t kReservedActionsLength;
 
 // Actions allowed while user is not signed in or screen is locked.
@@ skipping 28 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_