Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / ash / accelerators / accelerator_table.cc

diff --git a/src/ash/accelerators/accelerator_table.cc b/src/ash/accelerators/accelerator_table.cc
index 4dccc5a..3d0b30e 100644 (file)
--- a/src/ash/accelerators/accelerator_table.cc
+++ b/src/ash/accelerators/accelerator_table.cc
@@ -57,6 +57,9 @@ const AcceleratorData kAcceleratorData[] = {
   // The lock key on Chrome OS keyboards produces F13 scancodes.
   { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED },
   { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED },
+  // Generic keyboards can use VKEY_SLEEP to mimic ChromeOS keyboard's lock key.
+  { true, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_PRESSED },
+  { false, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_RELEASED },
   { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
   { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
   { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
@@ -68,7 +71,7 @@ const AcceleratorData kAcceleratorData[] = {
     TOUCH_HUD_MODE_CHANGE },
   { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
     TOUCH_HUD_CLEAR },
-  { true, ui::VKEY_9, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+  { true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     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
@@ -82,7 +85,7 @@ const AcceleratorData kAcceleratorData[] = {
     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_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
+  { 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 },
@@ -120,7 +123,7 @@ const AcceleratorData kAcceleratorData[] = {
   { 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_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
+  { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF },
   { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
   { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     SHOW_KEYBOARD_OVERLAY },
@@ -146,14 +149,6 @@ const AcceleratorData kAcceleratorData[] = {
   // Window management shortcuts.
   { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT },
   { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT },
-  // The same accelerator is defined in
-  // c/b/ui/views/accelerator_table.cc in order for the web page to
-  // intercept and process this shortcut. This accelerator is used if the
-  // focused window isn't browser window nor web content.
-  // TODO(stevet/jamescook): Remove this in M33, as well as the copy
-  // referenced above. We want to move away from shortcuts bound to Ctrl
-  // because web content often uses them.
-  { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, WINDOW_MINIMIZE },
   { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE },
   { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED },
   { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
@@ -239,13 +234,20 @@ const AcceleratorData kDebugAcceleratorData[] = {
 
 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
 
-const AcceleratorAction kReservedActions[] = {
+const AcceleratorAction kPreferredActions[] = {
   // Window cycling accelerators.
   CYCLE_BACKWARD_MRU,  // Shift+Alt+Tab
   CYCLE_FORWARD_MRU,  // Alt+Tab
+};
+
+const size_t kPreferredActionsLength = arraysize(kPreferredActions);
+
+const AcceleratorAction kReservedActions[] = {
 #if defined(OS_CHROMEOS)
   POWER_PRESSED,
   POWER_RELEASED,
+#else
+  DUMMY_FOR_RESERVED,
 #endif
 };
 
@@ -289,6 +291,7 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   VOLUME_MUTE,
   VOLUME_UP,
 #if defined(OS_CHROMEOS)
+  TOGGLE_TOUCH_VIEW_TESTING,
   TOGGLE_SPOKEN_FEEDBACK,
   ADD_REMOVE_DISPLAY,
   DISABLE_GPU_WATCHDOG,
@@ -328,6 +331,10 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
   POWER_RELEASED,
   PREVIOUS_IME,
   PRINT_UI_HIERARCHIES,
+  ROTATE_SCREEN,
+  SCALE_UI_UP,
+  SCALE_UI_DOWN,
+  SCALE_UI_RESET,
   SHOW_KEYBOARD_OVERLAY,
   SWITCH_IME,
   TAKE_PARTIAL_SCREENSHOT,