Process all global shortcuts for Ash after InputMethodEventFilter

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 "base/basictypes.h"
 
 namespace ash {
 
 const AcceleratorData kAcceleratorData[] = {
-  // EventType, KeyboardCode, shift, control, alt, AcceleratorAction
+  // trigger_on_press, KeyboardCode, shift, control, alt, AcceleratorAction
 
-  // Accelerators that should be processed before a key is sent to an IME.
-  { ui::ET_KEY_RELEASED, ui::VKEY_MENU, true, false, true, NEXT_IME },
-  { ui::ET_KEY_RELEASED, ui::VKEY_SHIFT, true, false, true, NEXT_IME },
-  { ui::ET_KEY_PRESSED, ui::VKEY_SPACE, false, true, false, PREVIOUS_IME },
+  { false, ui::VKEY_MENU, true, false, true, NEXT_IME },
+  { false, ui::VKEY_SHIFT, true, false, true, NEXT_IME },
+  { true, ui::VKEY_SPACE, false, true, false, PREVIOUS_IME },
   // Shortcuts for Japanese IME.
-  { ui::ET_KEY_PRESSED, ui::VKEY_CONVERT, false, false, false, SWITCH_IME },
-  { ui::ET_KEY_PRESSED, ui::VKEY_NONCONVERT, false, false, false, SWITCH_IME },
-  { ui::ET_KEY_PRESSED, ui::VKEY_DBE_SBCSCHAR, false, false, false,
-    SWITCH_IME },
-  { ui::ET_KEY_PRESSED, ui::VKEY_DBE_DBCSCHAR, false, false, false,
-    SWITCH_IME },
+  { true, ui::VKEY_CONVERT, false, false, false, SWITCH_IME },
+  { true, ui::VKEY_NONCONVERT, false, false, false, SWITCH_IME },
+  { true, ui::VKEY_DBE_SBCSCHAR, false, false, false, SWITCH_IME },
+  { true, ui::VKEY_DBE_DBCSCHAR, false, false, false, SWITCH_IME },
   // Shortcuts for Koren IME.
-  { ui::ET_KEY_PRESSED, ui::VKEY_HANGUL, false, false, false, SWITCH_IME },
-  { ui::ET_KEY_PRESSED, ui::VKEY_SPACE, true, false, false, SWITCH_IME },
+  { true, ui::VKEY_HANGUL, false, false, false, SWITCH_IME },
+  { true, ui::VKEY_SPACE, true, false, false, SWITCH_IME },
 
-  // Accelerators that should be processed after a key is sent to an IME.
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_TAB, false, false, true,
-    CYCLE_FORWARD_MRU },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_TAB, true, false, true,
-    CYCLE_BACKWARD_MRU },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F5, false, false, false,
-    CYCLE_FORWARD_LINEAR },
+  { true, ui::VKEY_TAB, false, false, true, CYCLE_FORWARD_MRU },
+  { true, ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD_MRU },
+  { true, ui::VKEY_F5, false, false, false, CYCLE_FORWARD_LINEAR },
 #if defined(OS_CHROMEOS)
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_BRIGHTNESS_DOWN, false, false, false,
-    BRIGHTNESS_DOWN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_BRIGHTNESS_UP, false, false, false,
-    BRIGHTNESS_UP },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, true, false, LOCK_SCREEN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_M, false, true, false,
-    OPEN_FILE_MANAGER },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_T, false, true, true, OPEN_CROSH },
+  { true, ui::VKEY_BRIGHTNESS_DOWN, false, false, false, BRIGHTNESS_DOWN },
+  { true, ui::VKEY_BRIGHTNESS_UP, false, false, false, BRIGHTNESS_UP },
+  { true, ui::VKEY_L, true, true, false, LOCK_SCREEN },
+  { true, ui::VKEY_M, false, true, false, OPEN_FILE_MANAGER },
+  { true, ui::VKEY_T, false, true, true, OPEN_CROSH },
 #endif
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_Q, true, true, false, EXIT },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_N, true, true, false,
-      NEW_INCOGNITO_WINDOW },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_N, false, true, false, NEW_WINDOW },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F5, true, false, false,
-    CYCLE_BACKWARD_LINEAR },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F5, false, true, false,
-    TAKE_SCREENSHOT },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F5, true, true, false,
-    TAKE_PARTIAL_SCREENSHOT },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_PRINT, false, false, false,
-    TAKE_SCREENSHOT },
+  { true, ui::VKEY_Q, true, true, false, EXIT },
+  { true, ui::VKEY_N, true, true, false, NEW_INCOGNITO_WINDOW },
+  { true, ui::VKEY_N, false, true, false, NEW_WINDOW },
+  { true, ui::VKEY_F5, true, false, false, CYCLE_BACKWARD_LINEAR },
+  { true, ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT },
+  { true, ui::VKEY_F5, true, true, false, TAKE_PARTIAL_SCREENSHOT },
+  { true, ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT },
   // On Chrome OS, Search key is mapped to LWIN.
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_LWIN, false, false, false,
-    SEARCH_KEY },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_LWIN, true, false, false,
-    TOGGLE_CAPS_LOCK },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F6, false, false, false,
-    BRIGHTNESS_DOWN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F7, false, false, false,
-    BRIGHTNESS_UP },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F8, false, false, false,
-    VOLUME_MUTE },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_VOLUME_MUTE, false, false, false,
-    VOLUME_MUTE },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F9, false, false, false,
-    VOLUME_DOWN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_VOLUME_DOWN, false, false, false,
-    VOLUME_DOWN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F10, false, false, false, VOLUME_UP },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_VOLUME_UP, false, false, false,
-    VOLUME_UP },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, false, true,
-    FOCUS_LAUNCHER },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_S, true, false, true, FOCUS_TRAY },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F1, true, true, false, SHOW_OAK },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_1, false, false, true,
-    SELECT_WIN_0 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_2, false, false, true,
-    SELECT_WIN_1 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_3, false, false, true,
-    SELECT_WIN_2 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_4, false, false, true,
-    SELECT_WIN_3 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_5, false, false, true,
-    SELECT_WIN_4 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_6, false, false, true,
-    SELECT_WIN_5 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_7, false, false, true,
-    SELECT_WIN_6 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_8, false, false, true,
-    SELECT_WIN_7 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_9, false, false, true,
-    SELECT_LAST_WIN },
+  { true, ui::VKEY_LWIN, false, false, false, SEARCH_KEY },
+  { true, ui::VKEY_LWIN, true, false, false, TOGGLE_CAPS_LOCK },
+  { true, ui::VKEY_F6, false, false, false, BRIGHTNESS_DOWN },
+  { true, ui::VKEY_F7, false, false, false, BRIGHTNESS_UP },
+  { true, ui::VKEY_F8, false, false, false, VOLUME_MUTE },
+  { true, ui::VKEY_VOLUME_MUTE, false, false, false, VOLUME_MUTE },
+  { true, ui::VKEY_F9, false, false, false, VOLUME_DOWN },
+  { true, ui::VKEY_VOLUME_DOWN, false, false, false, VOLUME_DOWN },
+  { true, ui::VKEY_F10, false, false, false, VOLUME_UP },
+  { true, ui::VKEY_VOLUME_UP, false, false, false, VOLUME_UP },
+  { true, ui::VKEY_L, true, false, true, FOCUS_LAUNCHER },
+  { true, ui::VKEY_S, true, false, true, FOCUS_TRAY },
+  { true, ui::VKEY_F1, true, true, false, SHOW_OAK },
+  { true, ui::VKEY_1, false, false, true, SELECT_WIN_0 },
+  { true, ui::VKEY_2, false, false, true, SELECT_WIN_1 },
+  { true, ui::VKEY_3, false, false, true, SELECT_WIN_2 },
+  { true, ui::VKEY_4, false, false, true, SELECT_WIN_3 },
+  { true, ui::VKEY_5, false, false, true, SELECT_WIN_4 },
+  { true, ui::VKEY_6, false, false, true, SELECT_WIN_5 },
+  { true, ui::VKEY_7, false, false, true, SELECT_WIN_6 },
+  { true, ui::VKEY_8, false, false, true, SELECT_WIN_7 },
+  { true, ui::VKEY_9, false, false, true, SELECT_LAST_WIN },
 
   // We need the number keys with and without shift since the French keyboard
   // does not have explicit number keys. Instead they have to press
   // 'Shift' + .. to access the keys. If we ever have an overlap of
   // functionality, we should think about either assembling this table
   // dynamically - or by decoding the keys properly (which is of course in
   // conflict with other keyboards since the Shift+ is missing then).
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_1, true, false, true,
-    SELECT_WIN_0 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_2, true, false, true,
-    SELECT_WIN_1 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_3, true, false, true,
-    SELECT_WIN_2 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_4, true, false, true,
-    SELECT_WIN_3 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_5, true, false, true,
-    SELECT_WIN_4 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_6, true, false, true,
-    SELECT_WIN_5 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_7, true, false, true,
-    SELECT_WIN_6 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_8, true, false, true,
-    SELECT_WIN_7 },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_9, true, false, true,
-    SELECT_LAST_WIN },
+  { true, ui::VKEY_1, true, false, true, SELECT_WIN_0 },
+  { true, ui::VKEY_2, true, false, true, SELECT_WIN_1 },
+  { true, ui::VKEY_3, true, false, true, SELECT_WIN_2 },
+  { true, ui::VKEY_4, true, false, true, SELECT_WIN_3 },
+  { true, ui::VKEY_5, true, false, true, SELECT_WIN_4 },
+  { true, ui::VKEY_6, true, false, true, SELECT_WIN_5 },
+  { true, ui::VKEY_7, true, false, true, SELECT_WIN_6 },
+  { true, ui::VKEY_8, true, false, true, SELECT_WIN_7 },
+  { true, ui::VKEY_9, true, false, true, SELECT_LAST_WIN },
 
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F3, true, true, true,
-    ROTATE_WINDOWS },
+  { true, ui::VKEY_F3, true, true, true, ROTATE_WINDOWS },
 #if !defined(NDEBUG)
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_HOME, false, true, false,
-    ROTATE_SCREEN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_B, false, true, true,
-    TOGGLE_DESKTOP_BACKGROUND_MODE },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F11, false, true, false,
-    TOGGLE_ROOT_WINDOW_FULL_SCREEN },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, true, true,
-    PRINT_LAYER_HIERARCHY },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, true, true, true,
-    PRINT_WINDOW_HIERARCHY },
+  { true, ui::VKEY_HOME, false, true, false, ROTATE_SCREEN },
+  { true, ui::VKEY_B, false, true, true, TOGGLE_DESKTOP_BACKGROUND_MODE },
+  { true, ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
+  { true, ui::VKEY_L, true, true, true, PRINT_LAYER_HIERARCHY },
+  { true, ui::VKEY_W, true, true, true, PRINT_WINDOW_HIERARCHY },
   // For testing on systems where Alt-Tab is already mapped.
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, false, false, true,
-    CYCLE_FORWARD_MRU },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, true, false, true,
-    CYCLE_BACKWARD_MRU },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F4, false, true, false,
-    ADD_REMOVE_MONITOR },
-  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F4, true, true, false,
-    CYCLE_MONITOR },
+  { true, ui::VKEY_W, false, false, true, CYCLE_FORWARD_MRU },
+  { true, ui::VKEY_W, true, false, true, CYCLE_BACKWARD_MRU },
+  { true, ui::VKEY_F4, false, true, false, ADD_REMOVE_MONITOR },
+  { true, ui::VKEY_F4, true, true, false, CYCLE_MONITOR },
 #endif
   // EventType, KeyboardCode, shift, control, alt, AcceleratorAction

[mazda, 2012/04/23 16:46:16]

nit: Please modify the comment here as well.

[Yusuke Sato, 2012/04/24 06:07:31]

Done.

 };
 
 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
 
 const AcceleratorAction kActionsAllowedAtLoginScreen[] = {
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
   NEXT_IME,
   PREVIOUS_IME,
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
   TAKE_SCREENSHOT,
   TAKE_PARTIAL_SCREENSHOT,
   TOGGLE_CAPS_LOCK,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
   ROTATE_WINDOWS,
 #if !defined(NDEBUG)
   PRINT_LAYER_HIERARCHY,
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
 #endif
 };
 
 const size_t kActionsAllowedAtLoginScreenLength =
     arraysize(kActionsAllowedAtLoginScreen);
 
 }  // namespace ash