Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: ash/common/accelerators/accelerator_table.h

Issue 2323863002: Separate debugging and developer accelerators (Closed)
Patch Set: Oshima's comments AND Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/accelerators/accelerator_table.h
diff --git a/ash/common/accelerators/accelerator_table.h b/ash/common/accelerators/accelerator_table.h
index e6a6beebf533166f900aaac45d9ced7cac692c87..9c4f43146c27ca2c8d7de680490e860a83aca355 100644
--- a/ash/common/accelerators/accelerator_table.h
+++ b/ash/common/accelerators/accelerator_table.h
@@ -57,7 +57,7 @@ enum AcceleratorAction {
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,
@@ -114,12 +114,12 @@ enum AcceleratorAction {
#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,
@@ -213,6 +213,11 @@ ASH_EXPORT extern const size_t kDeprecatedAcceleratorsDataLength;
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[];

Powered by Google App Engine
This is Rietveld 408576698