Debug shortcut to toggle touch view

ash/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/accelerators/accelerator_table.h"
 
 #include "ash/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 },
@@ skipping 50 matching lines @@
     TOUCH_HUD_PROJECTION_TOGGLE },
   // Accessibility: Spoken feedback shortcuts. The first one is to toggle
   // spoken feedback on or off. The others are only valid when
   // spoken feedback is enabled.
   { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     TOGGLE_SPOKEN_FEEDBACK },
   { true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     SWITCH_TO_PREVIOUS_USER },
   { true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     SWITCH_TO_NEXT_USER },
-  // Turning the TouchView maximizing mode on via hotkey for the time being.
-  // TODO(skuhne): Remove once the test isn't needed anymore.
-  { true, ui::VKEY_8, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
-    TOGGLE_TOUCH_VIEW_TESTING },
   // Single shift release turns off caps lock.
   { false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK },
   { false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK },
   { false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK },
   { false, ui::VKEY_LWIN, ui::EF_ALT_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 },
@@ skipping 63 matching lines @@
   { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE },
   { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE },
 
   // Media Player shortcuts.
   { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK},
   { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE},
   { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK},
 
   // Debugging shortcuts that need to be available to end-users in
   // release builds.
-  { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
-    PRINT_UI_HIERARCHIES },
+  { true, ui::VKEY_U, kDebugModifier, PRINT_UI_HIERARCHIES },
 
   // TODO(yusukes): Handle VKEY_MEDIA_STOP, and
   // VKEY_MEDIA_LAUNCH_MAIL.
 };
 
 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
 
 // Instructions for how to deprecate and replace an Accelerator:
 //
 // 1- Replace the old deprecated accelerator from the above list with the new
@@ skipping 69 matching lines @@
     {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,
-     DEBUG_ADD_REMOVE_DISPLAY},

[oshima, 2016/06/23 06:06:01]

this is intentional

+    {true, ui::VKEY_D, kDebugModifier, DEBUG_ADD_REMOVE_DISPLAY},
     {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
      DEBUG_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_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, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
-     SWAP_PRIMARY_DISPLAY},

[oshima, 2016/06/23 06:06:01]

this is intentional

+    {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},
     // 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},
     {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_DESKTOP_BACKGROUND_MODE},
     {true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
      TOGGLE_FULLSCREEN},
     {true, ui::VKEY_L,
      ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      DEBUG_PRINT_LAYER_HIERARCHY},
     {true, ui::VKEY_V,
      ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      DEBUG_PRINT_VIEW_HIERARCHY},
     {true, ui::VKEY_W,
      ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      DEBUG_PRINT_WINDOW_HIERARCHY},
     {true, ui::VKEY_D,
      ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      DEBUG_TOGGLE_DEVICE_SCALE_FACTOR},
     {true, ui::VKEY_B,
      ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,

[Mr4D (OOO till 08-26), 2016/06/23 19:52:48]

Just wondering - these are also for debuigging and they use the same keys -
maybe you want to replace those also with kDebugModifier?

Same above

[oshima, 2016/06/23 23:39:35]

Not sure why I didn't do that. Probably sleeping. Done.

Thanks!

      DEBUG_TOGGLE_SHOW_DEBUG_BORDERS},
-    {true, ui::VKEY_F,
-     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-     DEBUG_TOGGLE_SHOW_FPS_COUNTER},
-    {true, ui::VKEY_P,
-     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-     DEBUG_TOGGLE_SHOW_PAINT_RECTS},
+    {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 AcceleratorAction kPreferredActions[] = {
   // Window cycling accelerators.
   CYCLE_BACKWARD_MRU,  // Shift+Alt+Tab
   CYCLE_FORWARD_MRU,  // Alt+Tab
 };
 
@@ skipping 28 matching lines @@
   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_ADD_REMOVE_DISPLAY,
   DEBUG_TOGGLE_TOUCH_PAD,
   DEBUG_TOGGLE_TOUCH_SCREEN,
+  DEBUG_TOGGLE_TOUCH_VIEW,
   DISABLE_CAPS_LOCK,
   DISABLE_GPU_WATCHDOG,
   KEYBOARD_BRIGHTNESS_DOWN,
   KEYBOARD_BRIGHTNESS_UP,
   TOGGLE_CAPS_LOCK,
   TOGGLE_SPOKEN_FEEDBACK,
-  TOGGLE_TOUCH_VIEW_TESTING,
   TOGGLE_MIRROR_MODE,
   TOGGLE_WIFI,
   TOUCH_HUD_CLEAR,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
 #endif
 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
   POWER_PRESSED,
   POWER_RELEASED,
@@ skipping 189 matching lines @@
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
 
 }  // namespace ash