Upstream version 10.39.225.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 3d63595..a4a0c52 100644 (file)
--- a/src/ash/accelerators/accelerator_table.cc
+++ b/src/ash/accelerators/accelerator_table.cc
@@ -120,7 +120,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 },
@@ -231,13 +231,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
 };