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 "chrome/browser/ui/views/accelerator_table.h" | 5 #include "chrome/browser/ui/views/accelerator_table.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | |
10 #include <initializer_list> | |
11 #include <set> | |
12 #include <tuple> | |
13 | |
9 #include "base/macros.h" | 14 #include "base/macros.h" |
10 #include "build/build_config.h" | 15 #include "build/build_config.h" |
11 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
12 #include "ui/base/accelerators/accelerator.h" | 17 #include "ui/base/accelerators/accelerator.h" |
13 #include "ui/events/event_constants.h" | 18 #include "ui/events/event_constants.h" |
14 | 19 |
15 #if defined(USE_ASH) | 20 #if defined(USE_ASH) |
16 #include "ash/common/accelerators/accelerator_table.h" // nogncheck | 21 #include "ash/common/accelerators/accelerator_table.h" // nogncheck |
17 #endif | 22 #endif |
18 | 23 |
19 namespace chrome { | 24 namespace chrome { |
20 namespace { | 25 namespace { |
21 | 26 |
22 // For many commands, the Mac equivalent uses Cmd instead of Ctrl. We only need | 27 // For many commands, the Mac equivalent uses Cmd instead of Ctrl. We only need |
23 // to list the ones that do not have a key equivalent in the main menu, i.e. | 28 // to list the ones that do not have a key equivalent in the main menu, i.e. |
24 // only the ones in global_keyboard_shortcuts_mac.mm. | 29 // only the ones in global_keyboard_shortcuts_mac.mm. |
25 // TODO(jackhou): If-def out the accelerators that should not be on Mac. | |
26 #if defined(OS_MACOSX) | 30 #if defined(OS_MACOSX) |
27 const ui::EventFlags kPlatformModifier = ui::EF_COMMAND_DOWN; | 31 const ui::EventFlags kPlatformModifier = ui::EF_COMMAND_DOWN; |
28 #else | 32 #else |
29 const ui::EventFlags kPlatformModifier = ui::EF_CONTROL_DOWN; | 33 const ui::EventFlags kPlatformModifier = ui::EF_CONTROL_DOWN; |
30 #endif | 34 #endif |
31 | 35 |
32 // NOTE: Keep this list in the same (mostly-alphabetical) order as | 36 // NOTE: Keep this list in the same (mostly-alphabetical) order as |
33 // the Windows accelerators in ../../app/chrome_dll.rc. | 37 // the Windows accelerators in ../../app/chrome_dll.rc. |
34 // Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards: | 38 // Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards: |
35 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx | 39 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx |
36 const AcceleratorMapping kAcceleratorMap[] = { | 40 const AcceleratorMapping kAcceleratorMap[] = { |
37 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, | 41 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, |
38 { ui::VKEY_BACK, ui::EF_NONE, IDC_BACKSPACE_BACK }, | 42 { ui::VKEY_BACK, ui::EF_NONE, IDC_BACKSPACE_BACK }, |
39 { ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE }, | 43 { ui::VKEY_D, kPlatformModifier, IDC_BOOKMARK_PAGE }, |
40 { ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 44 { ui::VKEY_D, ui::EF_SHIFT_DOWN | kPlatformModifier, |
41 IDC_BOOKMARK_ALL_TABS }, | 45 IDC_BOOKMARK_ALL_TABS }, |
42 { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 46 { ui::VKEY_W, kPlatformModifier, IDC_CLOSE_TAB }, |
43 { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, | 47 { ui::VKEY_W, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_CLOSE_WINDOW }, |
44 { ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND }, | 48 { ui::VKEY_F, kPlatformModifier, IDC_FIND }, |
45 { ui::VKEY_G, ui::EF_CONTROL_DOWN, IDC_FIND_NEXT }, | 49 { ui::VKEY_G, kPlatformModifier, IDC_FIND_NEXT }, |
46 { ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_FIND_PREVIOUS }, | 50 { ui::VKEY_G, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_FIND_PREVIOUS }, |
47 { ui::VKEY_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION }, | 51 { ui::VKEY_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION }, |
48 { ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION }, | 52 { ui::VKEY_L, kPlatformModifier, IDC_FOCUS_LOCATION }, |
49 { ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, | 53 { ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, |
50 { ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, | 54 { ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, |
51 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_TOOLBAR }, | 55 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_TOOLBAR }, |
52 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_BOOKMARKS }, | 56 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_BOOKMARKS }, |
53 { ui::VKEY_A, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_INFOBARS }, | 57 { ui::VKEY_A, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_INFOBARS }, |
54 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, | 58 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, |
55 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_BACKSPACE_FORWARD }, | 59 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_BACKSPACE_FORWARD }, |
56 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, | 60 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, |
57 { ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE }, | 61 { ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE }, |
58 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 62 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
59 IDC_DEV_TOOLS_CONSOLE }, | 63 IDC_DEV_TOOLS_CONSOLE }, |
60 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 64 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
61 IDC_DEV_TOOLS_INSPECT }, | 65 IDC_DEV_TOOLS_INSPECT }, |
62 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE }, | 66 { ui::VKEY_O, kPlatformModifier, IDC_OPEN_FILE }, |
63 { ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT}, | 67 { ui::VKEY_P, kPlatformModifier, IDC_PRINT }, |
64 #if defined(ENABLE_BASIC_PRINTING) | 68 #if defined(ENABLE_BASIC_PRINTING) |
65 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, | 69 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, |
66 #endif // ENABLE_BASIC_PRINTING | 70 #endif // ENABLE_BASIC_PRINTING |
67 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, | 71 { ui::VKEY_R, kPlatformModifier, IDC_RELOAD }, |
68 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 72 { ui::VKEY_R, ui::EF_SHIFT_DOWN | kPlatformModifier, |
69 IDC_RELOAD_BYPASSING_CACHE }, | 73 IDC_RELOAD_BYPASSING_CACHE }, |
70 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, | 74 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, |
71 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, | 75 { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, |
72 { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, | 76 { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, |
73 { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, | 77 { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, |
74 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 78 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
75 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, | 79 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, |
76 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, | 80 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, |
77 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT }, | 81 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT }, |
78 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | 82 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
79 IDC_MOVE_TAB_PREVIOUS }, | 83 IDC_MOVE_TAB_PREVIOUS }, |
80 #endif | 84 #endif |
81 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, | 85 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, |
(...skipping 29 matching lines...) Expand all Loading... | |
111 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 115 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, |
112 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 116 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, |
113 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 117 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, |
114 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 118 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, |
115 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 119 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, |
116 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 120 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, |
117 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 121 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
118 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 122 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
119 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, | 123 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, |
120 #endif | 124 #endif |
121 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 125 { ui::VKEY_B, ui::EF_SHIFT_DOWN | kPlatformModifier, |
122 IDC_SHOW_BOOKMARK_BAR }, | 126 IDC_SHOW_BOOKMARK_BAR }, |
123 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 127 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
124 IDC_SHOW_BOOKMARK_MANAGER }, | 128 IDC_SHOW_BOOKMARK_MANAGER }, |
125 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, | 129 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, |
126 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, | 130 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, |
127 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 131 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
128 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 132 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
129 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, | 133 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, |
130 { ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE }, | 134 { ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE }, |
131 { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 135 { ui::VKEY_OEM_MINUS, kPlatformModifier, IDC_ZOOM_MINUS }, |
132 { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 136 { ui::VKEY_SUBTRACT, kPlatformModifier, IDC_ZOOM_MINUS }, |
133 { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 137 { ui::VKEY_0, kPlatformModifier, IDC_ZOOM_NORMAL }, |
134 { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 138 { ui::VKEY_NUMPAD0, kPlatformModifier, IDC_ZOOM_NORMAL }, |
135 { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 139 { ui::VKEY_OEM_PLUS, kPlatformModifier, IDC_ZOOM_PLUS }, |
136 { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 140 { ui::VKEY_ADD, kPlatformModifier, IDC_ZOOM_PLUS }, |
141 | |
142 #if !defined(OS_MACOSX) // Function keys aren't mapped on Mac. | |
137 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, | 143 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, |
138 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, | 144 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, |
139 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, | 145 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, |
140 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 146 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, |
141 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, | 147 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, |
142 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, | 148 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, |
143 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 149 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
144 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 150 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
145 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, | 151 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, |
146 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, | 152 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, |
147 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 153 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
148 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, | 154 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, |
155 #endif // !OS_MACOSX | |
149 | 156 |
150 // Platform-specific key maps. | 157 // Platform-specific key maps. |
151 #if defined(OS_LINUX) | 158 #if defined(OS_LINUX) |
152 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, | 159 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, |
153 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, | 160 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, |
154 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, | 161 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, |
155 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, | 162 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, |
156 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 163 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
157 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 164 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
158 #endif // defined(OS_LINUX) | 165 #endif // defined(OS_LINUX) |
159 | 166 |
160 #if defined(OS_CHROMEOS) | 167 #if defined(OS_CHROMEOS) |
161 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. | 168 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. |
162 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 169 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
163 IDC_CLEAR_BROWSING_DATA }, | 170 IDC_CLEAR_BROWSING_DATA }, |
164 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, | 171 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, |
165 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 172 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
166 IDC_HELP_PAGE_VIA_KEYBOARD }, | 173 IDC_HELP_PAGE_VIA_KEYBOARD }, |
167 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, | 174 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, |
168 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, | 175 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, |
169 { ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 176 { ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
170 IDC_TOUCH_HUD_PROJECTION_TOGGLE }, | 177 IDC_TOUCH_HUD_PROJECTION_TOGGLE }, |
171 #else // OS_CHROMEOS | 178 #else |
172 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, | 179 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, |
173 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 180 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
174 IDC_CLEAR_BROWSING_DATA }, | 181 IDC_CLEAR_BROWSING_DATA }, |
175 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 182 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
176 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 183 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
177 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 184 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
178 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled | 185 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled |
179 // via WM_APPCOMMAND. | 186 // via WM_APPCOMMAND. |
180 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, | 187 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, |
181 { ui::VKEY_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU}, | 188 { ui::VKEY_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU }, |
182 // On Chrome OS, these keys are assigned to change UI scale. | 189 // On Chrome OS, these keys are assigned to change UI scale. |
183 { ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 190 { ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, |
184 { ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 191 { ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
185 IDC_ZOOM_MINUS }, | 192 IDC_ZOOM_MINUS }, |
186 // For each entry here add an entry into kChromeCmdId2AshActionId below | 193 // For each entry here add an entry into kChromeCmdId2AshActionId below |
187 // if Ash has a corresponding accelerator. | 194 // if Ash has a corresponding accelerator. |
188 #if defined(GOOGLE_CHROME_BUILD) | 195 #if defined(GOOGLE_CHROME_BUILD) |
189 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, | 196 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, |
190 #endif | 197 #endif |
191 { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT }, | 198 { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT }, |
192 { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 199 { ui::VKEY_N, ui::EF_SHIFT_DOWN | kPlatformModifier, |
193 IDC_NEW_INCOGNITO_WINDOW }, | 200 IDC_NEW_INCOGNITO_WINDOW }, |
194 { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, | 201 { ui::VKEY_T, kPlatformModifier, IDC_NEW_TAB }, |
195 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, | 202 { ui::VKEY_N, kPlatformModifier, IDC_NEW_WINDOW }, |
196 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, | 203 { ui::VKEY_T, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_RESTORE_TAB }, |
197 #endif | 204 #endif // !OS_CHROMEOS |
205 | |
206 #if defined(OS_MACOSX) | |
207 // VKEY_OEM_4 is Left Brace '[{' key. | |
208 { ui::VKEY_OEM_4, ui::EF_COMMAND_DOWN, IDC_BACK }, | |
209 { ui::VKEY_LEFT, ui::EF_COMMAND_DOWN, IDC_BACK }, | |
210 #if defined(ENABLE_BASIC_PRINTING) | |
211 { ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_BASIC_PRINT }, | |
212 #endif // ENABLE_BASIC_PRINTING | |
213 { ui::VKEY_BACK, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | |
214 IDC_CLEAR_BROWSING_DATA }, | |
215 { ui::VKEY_V, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | |
216 IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE }, | |
217 { ui::VKEY_Z, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | |
218 IDC_CONTENT_CONTEXT_REDO }, | |
219 { ui::VKEY_A, ui::EF_COMMAND_DOWN, IDC_CONTENT_CONTEXT_SELECTALL }, | |
220 { ui::VKEY_Z, ui::EF_COMMAND_DOWN, IDC_CONTENT_CONTEXT_UNDO }, | |
221 { ui::VKEY_I, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_DEV_TOOLS }, | |
222 { ui::VKEY_J, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_DEV_TOOLS_CONSOLE }, | |
223 { ui::VKEY_C, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, IDC_DEV_TOOLS_INSPECT}, | |
224 { ui::VKEY_I, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | |
225 IDC_EMAIL_PAGE_LOCATION }, | |
226 { ui::VKEY_Q, ui::EF_COMMAND_DOWN, IDC_EXIT }, | |
227 { ui::VKEY_F, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_SEARCH }, | |
228 // VKEY_OEM_6 is Right Brace ']}' key. | |
229 { ui::VKEY_OEM_6, ui::EF_COMMAND_DOWN, IDC_FORWARD }, | |
230 { ui::VKEY_RIGHT, ui::EF_COMMAND_DOWN, IDC_FORWARD }, | |
231 { ui::VKEY_F, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN, IDC_FULLSCREEN }, | |
232 // VKEY_OEM_2 is Slash '/?' key. | |
233 { ui::VKEY_OEM_2, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | |
234 IDC_HELP_PAGE_VIA_MENU }, | |
235 { ui::VKEY_H, ui::EF_COMMAND_DOWN, IDC_HIDE_APP }, | |
236 { ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, IDC_HOME }, | |
237 { ui::VKEY_M, ui::EF_COMMAND_DOWN, IDC_MINIMIZE_WINDOW }, | |
238 { ui::VKEY_RIGHT, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, | |
239 IDC_SELECT_NEXT_TAB }, | |
240 { ui::VKEY_LEFT, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, | |
241 IDC_SELECT_PREVIOUS_TAB }, | |
242 { ui::VKEY_B, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, | |
243 IDC_SHOW_BOOKMARK_MANAGER }, | |
244 { ui::VKEY_J, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, IDC_SHOW_DOWNLOADS }, | |
245 { ui::VKEY_L, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_SHOW_DOWNLOADS }, | |
246 { ui::VKEY_Y, ui::EF_COMMAND_DOWN, IDC_SHOW_HISTORY }, | |
247 { ui::VKEY_OEM_PERIOD, ui::EF_COMMAND_DOWN, IDC_STOP }, | |
248 { ui::VKEY_U, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_VIEW_SOURCE }, | |
249 #endif // OS_MACOSX | |
198 }; | 250 }; |
199 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | |
200 | 251 |
201 const int kRepeatableCommandIds[] = { | 252 const int kRepeatableCommandIds[] = { |
202 IDC_FIND_NEXT, | 253 IDC_FIND_NEXT, |
203 IDC_FIND_PREVIOUS, | 254 IDC_FIND_PREVIOUS, |
204 IDC_FOCUS_NEXT_PANE, | 255 IDC_FOCUS_NEXT_PANE, |
205 IDC_FOCUS_PREVIOUS_PANE, | 256 IDC_FOCUS_PREVIOUS_PANE, |
206 IDC_MOVE_TAB_NEXT, | 257 IDC_MOVE_TAB_NEXT, |
207 IDC_MOVE_TAB_PREVIOUS, | 258 IDC_MOVE_TAB_PREVIOUS, |
208 IDC_SELECT_NEXT_TAB, | 259 IDC_SELECT_NEXT_TAB, |
209 IDC_SELECT_PREVIOUS_TAB, | 260 IDC_SELECT_PREVIOUS_TAB, |
(...skipping 21 matching lines...) Expand all Loading... | |
231 #if defined(OS_CHROMEOS) | 282 #if defined(OS_CHROMEOS) |
232 { IDC_TOUCH_HUD_PROJECTION_TOGGLE, ash::TOUCH_HUD_PROJECTION_TOGGLE }, | 283 { IDC_TOUCH_HUD_PROJECTION_TOGGLE, ash::TOUCH_HUD_PROJECTION_TOGGLE }, |
233 #endif | 284 #endif |
234 }; | 285 }; |
235 const size_t kChromeCmdId2AshActionIdLength = | 286 const size_t kChromeCmdId2AshActionIdLength = |
236 arraysize(kChromeCmdId2AshActionId); | 287 arraysize(kChromeCmdId2AshActionId); |
237 #endif // defined(USE_ASH) | 288 #endif // defined(USE_ASH) |
238 | 289 |
239 } // namespace | 290 } // namespace |
240 | 291 |
292 std::vector<AcceleratorMapping> GetUnfilteredAcceleratorListForTesting() { | |
293 return std::vector<AcceleratorMapping>(std::begin(kAcceleratorMap), | |
294 std::end(kAcceleratorMap)); | |
295 } | |
296 | |
241 std::vector<AcceleratorMapping> GetAcceleratorList() { | 297 std::vector<AcceleratorMapping> GetAcceleratorList() { |
242 return std::vector<AcceleratorMapping>( | 298 static bool is_accelerator_list_initialized = false; |
243 kAcceleratorMap, kAcceleratorMap + kAcceleratorMapLength); | 299 CR_DEFINE_STATIC_LOCAL(std::vector<AcceleratorMapping>, accelerators, |
300 (GetUnfilteredAcceleratorListForTesting())); | |
sky
2016/11/08 18:34:10
Having a non-testing function call a for-testing f
themblsha
2016/11/09 14:54:02
Good idea, done.
| |
301 if (is_accelerator_list_initialized) | |
302 return accelerators; | |
303 | |
304 is_accelerator_list_initialized = true; | |
305 #if defined(OS_MACOSX) | |
306 // Control modifier is rarely used on Mac, so we allow it only in several | |
307 // whitelisted cases. | |
308 const std::set<int> kControlWhitelist = { | |
sky
2016/11/08 18:34:09
optional: the style guide says you can optionally
themblsha
2016/11/09 14:54:02
pkasting originally asked me to use the kCamelCase
Peter Kasting
2016/11/09 18:39:12
Scott, can you point to the relevant style guide t
sky
2016/11/09 18:42:43
I said the style guide allows it. My comment was m
Peter Kasting
2016/11/09 18:52:56
OK.
I don't know that we commonly have const non-
| |
309 IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB, IDC_FULLSCREEN, | |
310 }; | |
311 | |
312 auto remove_accelerators = [&kControlWhitelist](const AcceleratorMapping& m) { | |
sky
2016/11/08 18:34:10
It seems like you're trying to allow for accelerat
themblsha
2016/11/09 14:54:02
Originally I was doing this, but it resulted in a
Peter Kasting
2016/11/09 18:39:12
Personally, I much prefer the current solution if
sky
2016/11/09 18:42:43
That's right. I'm hoping removing of accelerators
themblsha
2016/11/10 14:18:05
Ah! Okay, I pruned the accelerator list some more,
| |
313 // Alt by itself (or with just shift) is never used on Mac since it's used | |
314 // to generate non-ASCII characters. Such commands are given Mac-specific | |
315 // bindings as well, so remove the mappings with Alt, but not those with | |
316 // Command or Control. | |
317 constexpr int kNonShiftMask = | |
318 ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN; | |
319 if ((m.modifiers & kNonShiftMask) == ui::EF_ALT_DOWN) | |
320 return true; | |
321 | |
322 // If command uses Control modifier it has to be whitelisted. | |
323 if ((m.modifiers & ui::EF_CONTROL_DOWN) != 0 && | |
324 kControlWhitelist.count(m.command_id) == 0) | |
325 return true; | |
326 | |
327 return false; | |
328 }; | |
329 accelerators.erase(std::remove_if(accelerators.begin(), accelerators.end(), | |
330 remove_accelerators), | |
331 accelerators.end()); | |
332 #endif // OS_MACOSX | |
333 return accelerators; | |
244 } | 334 } |
245 | 335 |
246 bool GetAshAcceleratorForCommandId(int command_id, | 336 bool GetAshAcceleratorForCommandId(int command_id, |
247 ui::Accelerator* accelerator) { | 337 ui::Accelerator* accelerator) { |
248 #if defined(USE_ASH) | 338 #if defined(USE_ASH) |
249 for (size_t i = 0; i < kChromeCmdId2AshActionIdLength; ++i) { | 339 for (size_t i = 0; i < kChromeCmdId2AshActionIdLength; ++i) { |
250 if (command_id == kChromeCmdId2AshActionId[i].chrome_cmd_id) { | 340 if (command_id == kChromeCmdId2AshActionId[i].chrome_cmd_id) { |
251 for (size_t j = 0; j < ash::kAcceleratorDataLength; ++j) { | 341 for (size_t j = 0; j < ash::kAcceleratorDataLength; ++j) { |
252 if (kChromeCmdId2AshActionId[i].ash_action_id == | 342 if (kChromeCmdId2AshActionId[i].ash_action_id == |
253 ash::kAcceleratorData[j].action) { | 343 ash::kAcceleratorData[j].action) { |
254 *accelerator = ui::Accelerator(ash::kAcceleratorData[j].keycode, | 344 *accelerator = ui::Accelerator(ash::kAcceleratorData[j].keycode, |
255 ash::kAcceleratorData[j].modifiers); | 345 ash::kAcceleratorData[j].modifiers); |
256 return true; | 346 return true; |
257 } | 347 } |
258 } | 348 } |
259 } | 349 } |
260 } | 350 } |
261 #endif // defined(USE_ASH) | 351 #endif // defined(USE_ASH) |
262 return false; | 352 return false; |
263 } | 353 } |
264 | 354 |
265 bool GetStandardAcceleratorForCommandId(int command_id, | 355 bool GetStandardAcceleratorForCommandId(int command_id, |
266 ui::Accelerator* accelerator) { | 356 ui::Accelerator* accelerator) { |
267 // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators | 357 // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators |
268 // anywhere else. | 358 // anywhere else. |
269 switch (command_id) { | 359 switch (command_id) { |
270 case IDC_CUT: | 360 case IDC_CUT: |
271 *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN); | 361 *accelerator = ui::Accelerator(ui::VKEY_X, kPlatformModifier); |
272 return true; | 362 return true; |
273 case IDC_COPY: | 363 case IDC_COPY: |
274 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); | 364 *accelerator = ui::Accelerator(ui::VKEY_C, kPlatformModifier); |
275 return true; | 365 return true; |
276 case IDC_PASTE: | 366 case IDC_PASTE: |
277 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); | 367 *accelerator = ui::Accelerator(ui::VKEY_V, kPlatformModifier); |
278 return true; | 368 return true; |
279 } | 369 } |
280 return false; | 370 return false; |
281 } | 371 } |
282 | 372 |
283 bool IsCommandRepeatable(int command_id) { | 373 bool IsCommandRepeatable(int command_id) { |
284 for (size_t i = 0; i < kRepeatableCommandIdsLength; ++i) { | 374 for (size_t i = 0; i < kRepeatableCommandIdsLength; ++i) { |
285 if (kRepeatableCommandIds[i] == command_id) | 375 if (kRepeatableCommandIds[i] == command_id) |
286 return true; | 376 return true; |
287 } | 377 } |
288 return false; | 378 return false; |
289 } | 379 } |
290 | 380 |
291 } // namespace chrome | 381 } // namespace chrome |
OLD | NEW |