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

Issues Search
    My Issues | Starred     Open | Closed | All

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

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
« ash/common/accelerators/accelerator_table.h ('K') | « ash/common/accelerators/accelerator_table.h ('k') | ash/common/accelerators/debug_commands.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/accelerator_table.cc
diff --git a/ash/common/accelerators/accelerator_table.cc b/ash/common/accelerators/accelerator_table.cc
index 6c62e745af251cf34f3ce93de562ebecb713d042..67c5236c9cfe613cac19145a905c3715f4f85a5b 100644
--- a/ash/common/accelerators/accelerator_table.cc
+++ b/ash/common/accelerators/accelerator_table.cc
@@ -238,11 +238,32 @@ const size_t kDeprecatedAcceleratorsDataLength =
const AcceleratorData kDebugAcceleratorData[] = {
#if defined(OS_CHROMEOS)
- // Extra shortcut for debug build to control magnifier on linux desktop.
+ {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},
+#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},
+};
+
+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.
+ // 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},
@@ -250,43 +271,29 @@ const AcceleratorData kDebugAcceleratorData[] = {
{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,
- DEBUG_ADD_REMOVE_DISPLAY},
- {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST},
+ DEV_ADD_REMOVE_DISPLAY},
{true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
- DEBUG_TOGGLE_UNIFIED_DESKTOP},
+ DEV_TOGGLE_UNIFIED_DESKTOP},
{true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
TOGGLE_MIRROR_MODE},
- {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},
+ {true, ui::VKEY_T, kDebugModifier, DEV_TOGGLE_TOUCH_VIEW},
oshima 2016/09/15 20:55:53 Sorry, I missed this in the first review. This sho
afakhry 2016/09/15 21:57:40 Moved it back to debug.
{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.
+ // Extra shortcut for display swapping as Alt-F4 is taken on Linux desktop.
{true, ui::VKEY_S, kDebugModifier, SWAP_PRIMARY_DISPLAY},
-#endif
- // Extra shortcut to rotate/scale up/down the screen on linux desktop.
- {true, ui::VKEY_R,
- ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN},
+#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,
- DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN},
+ DEV_TOGGLE_ROOT_WINDOW_FULL_SCREEN},
{true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU},
- {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
- DEBUG_TOGGLE_WALLPAPER_MODE},
{true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
TOGGLE_FULLSCREEN},
- {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},
};
-const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
+const size_t kDeveloperAcceleratorDataLength =
+ arraysize(kDeveloperAcceleratorData);
const AcceleratorAction kPreferredActions[] = {
// Window cycling accelerators.
@@ -327,10 +334,10 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
#if defined(OS_CHROMEOS)
BRIGHTNESS_DOWN,
BRIGHTNESS_UP,
- DEBUG_ADD_REMOVE_DISPLAY,
+ DEV_ADD_REMOVE_DISPLAY,
DEBUG_TOGGLE_TOUCH_PAD,
DEBUG_TOGGLE_TOUCH_SCREEN,
- DEBUG_TOGGLE_TOUCH_VIEW,
+ DEV_TOGGLE_TOUCH_VIEW,
DISABLE_CAPS_LOCK,
DISABLE_GPU_WATCHDOG,
KEYBOARD_BRIGHTNESS_DOWN,
@@ -386,7 +393,7 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
#if defined(OS_CHROMEOS)
BRIGHTNESS_DOWN,
BRIGHTNESS_UP,
- DEBUG_ADD_REMOVE_DISPLAY,
+ DEV_ADD_REMOVE_DISPLAY,
oshima 2016/09/15 20:55:53 sort
afakhry 2016/09/15 21:57:40 Done.
DEBUG_TOGGLE_TOUCH_PAD,
DEBUG_TOGGLE_TOUCH_SCREEN,
DISABLE_CAPS_LOCK,
@@ -451,7 +458,7 @@ const AcceleratorAction kActionsAllowedInAppModeOrPinnedMode[] = {
#if defined(OS_CHROMEOS)
BRIGHTNESS_DOWN,
BRIGHTNESS_UP,
- DEBUG_ADD_REMOVE_DISPLAY,
+ DEV_ADD_REMOVE_DISPLAY,
DEBUG_TOGGLE_TOUCH_PAD,
DEBUG_TOGGLE_TOUCH_SCREEN,
DISABLE_CAPS_LOCK,
« ash/common/accelerators/accelerator_table.h ('K') | « ash/common/accelerators/accelerator_table.h ('k') | ash/common/accelerators/debug_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698