| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/accelerator_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, | 34 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, |
| 35 | 35 |
| 36 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, | 36 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, |
| 37 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 37 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 38 CYCLE_BACKWARD_MRU }, | 38 CYCLE_BACKWARD_MRU }, |
| 39 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, | 39 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, |
| 40 CYCLE_FORWARD_LINEAR }, | 40 CYCLE_FORWARD_LINEAR }, |
| 41 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
| 42 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, | 42 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, |
| 43 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, | 43 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, |
| 44 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, | |
| 45 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, | |
| 46 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, | 44 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, |
| 47 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, | 45 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, |
| 48 { true, ui::VKEY_F4, ui::EF_NONE, TOGGLE_MAXIMIZED }, | 46 // Maximize button. |
| 49 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, | 47 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, |
| 50 { true, ui::VKEY_F4, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY }, | 48 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY }, |
| 51 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, | 49 // Cycle windows button. |
| 52 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, | 50 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, |
| 53 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, | 51 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 54 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
| 55 TAKE_PARTIAL_SCREENSHOT }, | 52 TAKE_PARTIAL_SCREENSHOT }, |
| 56 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, | 53 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, |
| 57 { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN }, | 54 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN }, |
| 58 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, | 55 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, |
| 59 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, | 56 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, |
| 60 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 57 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 61 MAGNIFY_SCREEN_ZOOM_OUT}, | 58 MAGNIFY_SCREEN_ZOOM_OUT}, |
| 62 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 59 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 63 MAGNIFY_SCREEN_ZOOM_IN}, | 60 MAGNIFY_SCREEN_ZOOM_IN}, |
| 64 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 61 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
| 65 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, | |
| 66 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, | |
| 67 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, | |
| 68 // The lock key on Chrome OS keyboards produces F13 scancodes. | 62 // The lock key on Chrome OS keyboards produces F13 scancodes. |
| 69 { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED }, | 63 { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED }, |
| 70 { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED }, | 64 { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED }, |
| 71 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, | 65 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, |
| 72 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, | 66 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, |
| 73 #if !defined(NDEBUG) | 67 #if !defined(NDEBUG) |
| 74 // Extra shortcut for debug build to activate lock screen on linux desktop. | 68 // Extra shortcut for debug build to activate lock screen on linux desktop. |
| 75 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, | 69 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, |
| 76 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. | 70 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. |
| 77 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | 71 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
| 78 SWAP_PRIMARY_DISPLAY }, | 72 SWAP_PRIMARY_DISPLAY }, |
| 79 // Extra shortcut to exit on linux desktop. | |
| 80 { true, ui::VKEY_F11, ui::EF_NONE, POWER_PRESSED }, | |
| 81 { false, ui::VKEY_F11, ui::EF_NONE, POWER_RELEASED }, | |
| 82 // Extra shortcut to lock the screen on linux desktop. | 73 // Extra shortcut to lock the screen on linux desktop. |
| 83 { true, ui::VKEY_F11, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, | 74 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, |
| 84 { false, ui::VKEY_F11, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, | 75 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, |
| 85 #endif // !defined(NDEBUG) | 76 #endif // !defined(NDEBUG) |
| 86 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, | 77 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, |
| 87 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, | 78 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, |
| 88 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 79 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
| 89 #endif // !defined(OS_CHROMEOS) | 80 #endif // !defined(OS_CHROMEOS) |
| 90 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, | 81 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, |
| 91 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 82 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, |
| 92 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 83 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 93 TOGGLE_SPOKEN_FEEDBACK }, | 84 TOGGLE_SPOKEN_FEEDBACK }, |
| 94 | 85 |
| 95 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or | 86 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or |
| 96 // NEW_TAB, you also need to modify | 87 // NEW_TAB, you also need to modify |
| 97 // ToolbarView::GetAcceleratorForCommandId() in | 88 // ToolbarView::GetAcceleratorForCommandId() in |
| 98 // chrome/browser/ui/views/toolbar_view.cc. | 89 // chrome/browser/ui/views/toolbar_view.cc. |
| 99 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 90 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 100 NEW_INCOGNITO_WINDOW }, | 91 NEW_INCOGNITO_WINDOW }, |
| 101 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, | 92 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, |
| 102 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, | 93 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, |
| 103 | 94 |
| 104 { true, ui::VKEY_F3, | 95 { true, ui::VKEY_BROWSER_REFRESH, |
| 105 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 96 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 106 ROTATE_WINDOWS }, | 97 ROTATE_WINDOWS }, |
| 107 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, | 98 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, |
| 108 CYCLE_BACKWARD_LINEAR }, | 99 CYCLE_BACKWARD_LINEAR }, |
| 109 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, | 100 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, |
| 110 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, | 101 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, |
| 111 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should | 102 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should |
| 112 // act on release instead of press when using Search as a modifier key for | 103 // act on release instead of press when using Search as a modifier key for |
| 113 // extended keyboard shortcuts. | 104 // extended keyboard shortcuts. |
| 114 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, | 105 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, |
| 115 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, | 106 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, |
| 116 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_APP_LIST }, | 107 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED }, |
| 117 { true, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, | 108 { true, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, |
| 118 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, | 109 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, |
| 119 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, | 110 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, |
| 120 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, | 111 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, |
| 121 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, | 112 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, |
| 122 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, | 113 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, |
| 123 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 114 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
| 124 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 115 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 125 SHOW_KEYBOARD_OVERLAY }, | 116 SHOW_KEYBOARD_OVERLAY }, |
| 126 { true, ui::VKEY_OEM_2, | 117 { true, ui::VKEY_OEM_2, |
| 127 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 118 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 128 SHOW_KEYBOARD_OVERLAY }, | 119 SHOW_KEYBOARD_OVERLAY }, |
| 129 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 120 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
| 130 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, | 121 { true, ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 122 SHOW_OAK }, |
| 131 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, | 123 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, |
| 132 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, | 124 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, |
| 133 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, | 125 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, |
| 134 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, | 126 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, |
| 135 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, | 127 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, |
| 136 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, | 128 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, |
| 137 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, | 129 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, |
| 138 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, | 130 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, |
| 139 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, | 131 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, |
| 140 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, | 132 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, |
| 141 | 133 |
| 142 // Window management shortcuts. | 134 // Window management shortcuts. |
| 143 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, | 135 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, |
| 144 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, | 136 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, |
| 145 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, | 137 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, |
| 146 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED }, | 138 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED }, |
| 147 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 139 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 148 WINDOW_POSITION_CENTER }, | 140 WINDOW_POSITION_CENTER }, |
| 149 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, | 141 { true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, |
| 150 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, | 142 { true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, |
| 151 | 143 |
| 152 // Media Player shortcuts. | 144 // Media Player shortcuts. |
| 153 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, | 145 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, |
| 154 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, | 146 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, |
| 155 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, | 147 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, |
| 156 | 148 |
| 157 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and | 149 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and |
| 158 // VKEY_MEDIA_LAUNCH_MAIL. | 150 // VKEY_MEDIA_LAUNCH_MAIL. |
| 159 }; | 151 }; |
| 160 | 152 |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 CYCLE_BACKWARD_MRU, | 276 CYCLE_BACKWARD_MRU, |
| 285 CYCLE_FORWARD_LINEAR, | 277 CYCLE_FORWARD_LINEAR, |
| 286 CYCLE_FORWARD_MRU, | 278 CYCLE_FORWARD_MRU, |
| 287 TOGGLE_MAXIMIZED, | 279 TOGGLE_MAXIMIZED, |
| 288 }; | 280 }; |
| 289 | 281 |
| 290 const size_t kNonrepeatableActionsLength = | 282 const size_t kNonrepeatableActionsLength = |
| 291 arraysize(kNonrepeatableActions); | 283 arraysize(kNonrepeatableActions); |
| 292 | 284 |
| 293 } // namespace ash | 285 } // namespace ash |
| OLD | NEW |