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 "base/macros.h" | 9 #include "base/macros.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
12 #include "ui/base/accelerators/accelerator.h" | 12 #include "ui/base/accelerators/accelerator.h" |
13 #include "ui/events/event_constants.h" | 13 #include "ui/events/event_constants.h" |
14 | 14 |
15 #if defined(USE_ASH) | 15 #if defined(USE_ASH) |
16 #include "ash/accelerators/accelerator_table.h" | 16 #include "ash/accelerators/accelerator_table.h" |
17 #endif | 17 #endif |
18 | 18 |
19 namespace chrome { | 19 namespace chrome { |
20 namespace { | 20 namespace { |
21 | 21 |
22 // For many commands, the Mac equivalent uses Cmd instead of Ctrl. We only need | 22 // 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. | 23 // 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. | 24 // only the ones in global_keyboard_shortcuts_mac.mm. |
25 // TODO(jackhou): If-def out the accelerators that should not be on Mac. | 25 // TODO(jackhou): If-def out the accelerators that should not be on Mac. |
tapted
2016/06/17 01:05:01
If things are complete after this, this TODO can p
themblsha
2016/06/21 15:57:49
Done.
| |
26 #if defined(OS_MACOSX) | 26 #if defined(OS_MACOSX) |
27 const ui::EventFlags kPlatformModifier = ui::EF_COMMAND_DOWN; | 27 const ui::EventFlags kPlatformModifier = ui::EF_COMMAND_DOWN; |
28 #else | 28 #else |
29 const ui::EventFlags kPlatformModifier = ui::EF_CONTROL_DOWN; | 29 const ui::EventFlags kPlatformModifier = ui::EF_CONTROL_DOWN; |
30 #endif | 30 #endif |
31 | 31 |
32 // NOTE: Keep this list in the same (mostly-alphabetical) order as | 32 // NOTE: Keep this list in the same (mostly-alphabetical) order as |
tapted
2016/06/17 01:05:01
Did you see this note? platform specific stuff sho
themblsha
2016/06/21 15:57:49
I saw "#if defined(OS_LINUX) && !defined(OS_CHROME
| |
33 // the Windows accelerators in ../../app/chrome_dll.rc. | 33 // 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: | 34 // 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 | 35 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx |
36 const AcceleratorMapping kAcceleratorMap[] = { | 36 const AcceleratorMapping kAcceleratorMap[] = { |
37 #if defined(OS_MACOSX) | |
38 { ui::VKEY_OEM_4, kPlatformModifier, IDC_BACK }, | |
tapted
2016/06/17 01:05:01
Stuff like OEM_4 needs a comment
themblsha
2016/06/21 15:57:49
Done.
| |
39 #else // !OS_MACOSX | |
37 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, | 40 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, |
38 { ui::VKEY_BACK, ui::EF_NONE, IDC_BACKSPACE_BACK }, | 41 #endif // !OS_MACOSX |
39 { ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE }, | 42 { ui::VKEY_D, kPlatformModifier, IDC_BOOKMARK_PAGE }, |
40 { ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 43 { ui::VKEY_D, ui::EF_SHIFT_DOWN | kPlatformModifier, |
41 IDC_BOOKMARK_ALL_TABS }, | 44 IDC_BOOKMARK_ALL_TABS }, |
42 { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 45 { ui::VKEY_W, kPlatformModifier, IDC_CLOSE_TAB }, |
43 { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, | 46 { ui::VKEY_W, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_CLOSE_WINDOW }, |
44 { ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND }, | 47 { ui::VKEY_F, kPlatformModifier, IDC_FIND }, |
45 { ui::VKEY_G, ui::EF_CONTROL_DOWN, IDC_FIND_NEXT }, | 48 { ui::VKEY_G, kPlatformModifier, IDC_FIND_NEXT }, |
46 { ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_FIND_PREVIOUS }, | 49 { ui::VKEY_G, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_FIND_PREVIOUS }, |
50 #if !defined(OS_MACOSX) | |
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 #endif // !OS_MACOSX |
53 { ui::VKEY_L, kPlatformModifier, IDC_FOCUS_LOCATION }, | |
54 #if defined(OS_MACOSX) | |
55 { ui::VKEY_F, kPlatformModifier | ui::EF_ALT_DOWN, IDC_FOCUS_SEARCH }, | |
56 #else // !OS_MACOSX | |
49 { ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, | 57 { ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, |
50 { ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, | 58 { 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 }, | 59 { 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 }, | 60 { 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 }, | 61 { ui::VKEY_A, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_INFOBARS }, |
62 #endif // !OS_MACOSX | |
63 #if defined(OS_MACOSX) | |
64 { ui::VKEY_OEM_6, kPlatformModifier, IDC_FORWARD }, | |
65 #else // !OS_MACOSX | |
54 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, | 66 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, |
55 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_BACKSPACE_FORWARD }, | 67 #endif // !OS_MACOSX |
68 #if defined(OS_MACOSX) | |
69 { ui::VKEY_I, kPlatformModifier | ui::EF_ALT_DOWN, IDC_DEV_TOOLS }, | |
70 { ui::VKEY_J, kPlatformModifier | ui::EF_ALT_DOWN, IDC_DEV_TOOLS_CONSOLE }, | |
71 #else // !OS_MACOSX | |
56 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, | 72 { 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 }, | 73 { ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE }, |
58 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 74 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
59 IDC_DEV_TOOLS_CONSOLE }, | 75 IDC_DEV_TOOLS_CONSOLE }, |
60 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 76 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
61 IDC_DEV_TOOLS_INSPECT }, | 77 IDC_DEV_TOOLS_INSPECT }, |
62 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE }, | 78 #endif // !OS_MACOSX |
63 { ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT}, | 79 { ui::VKEY_O, kPlatformModifier, IDC_OPEN_FILE }, |
80 { ui::VKEY_P, kPlatformModifier, IDC_PRINT }, | |
64 #if defined(ENABLE_BASIC_PRINTING) | 81 #if defined(ENABLE_BASIC_PRINTING) |
82 #if defined(OS_MACOSX) | |
83 { ui::VKEY_P, ui::EF_ALT_DOWN | kPlatformModifier, IDC_BASIC_PRINT}, | |
84 #else // !OS_MACOSX | |
65 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, | 85 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, |
86 #endif // !OS_MACOSX | |
66 #endif // ENABLE_BASIC_PRINTING | 87 #endif // ENABLE_BASIC_PRINTING |
67 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, | 88 { ui::VKEY_R, kPlatformModifier, IDC_RELOAD }, |
68 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 89 { ui::VKEY_R, ui::EF_SHIFT_DOWN | kPlatformModifier, |
69 IDC_RELOAD_BYPASSING_CACHE }, | 90 IDC_RELOAD_BYPASSING_CACHE }, |
91 #if defined(OS_MACOSX) | |
92 { ui::VKEY_H, kPlatformModifier | ui::EF_SHIFT_DOWN, IDC_HOME }, | |
93 #else // !OS_MACOSX | |
70 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, | 94 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, |
71 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, | 95 #endif // !OS_MACOSX |
96 { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, | |
97 #if !defined(OS_MACOSX) | |
72 { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, | 98 { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, |
73 { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, | 99 { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, |
100 #endif // !OS_MACOSX | |
74 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 101 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
75 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, | 102 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, |
76 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, | 103 { 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 }, | 104 { 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, | 105 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
79 IDC_MOVE_TAB_PREVIOUS }, | 106 IDC_MOVE_TAB_PREVIOUS }, |
80 #endif | 107 #endif |
108 #if defined(OS_MACOSX) | |
109 { ui::VKEY_RIGHT, kPlatformModifier | ui::EF_ALT_DOWN, IDC_SELECT_NEXT_TAB }, | |
110 { ui::VKEY_LEFT, kPlatformModifier | ui::EF_ALT_DOWN, | |
111 IDC_SELECT_PREVIOUS_TAB }, | |
112 #else // !OS_MACOSX | |
81 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, | 113 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, |
82 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, | 114 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, |
83 { ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 115 { ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
84 IDC_SELECT_PREVIOUS_TAB }, | 116 IDC_SELECT_PREVIOUS_TAB }, |
85 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB }, | 117 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB }, |
118 #endif // !OS_MACOSX | |
86 { ui::VKEY_1, kPlatformModifier, IDC_SELECT_TAB_0 }, | 119 { ui::VKEY_1, kPlatformModifier, IDC_SELECT_TAB_0 }, |
87 { ui::VKEY_NUMPAD1, kPlatformModifier, IDC_SELECT_TAB_0 }, | 120 { ui::VKEY_NUMPAD1, kPlatformModifier, IDC_SELECT_TAB_0 }, |
88 { ui::VKEY_2, kPlatformModifier, IDC_SELECT_TAB_1 }, | 121 { ui::VKEY_2, kPlatformModifier, IDC_SELECT_TAB_1 }, |
89 { ui::VKEY_NUMPAD2, kPlatformModifier, IDC_SELECT_TAB_1 }, | 122 { ui::VKEY_NUMPAD2, kPlatformModifier, IDC_SELECT_TAB_1 }, |
90 { ui::VKEY_3, kPlatformModifier, IDC_SELECT_TAB_2 }, | 123 { ui::VKEY_3, kPlatformModifier, IDC_SELECT_TAB_2 }, |
91 { ui::VKEY_NUMPAD3, kPlatformModifier, IDC_SELECT_TAB_2 }, | 124 { ui::VKEY_NUMPAD3, kPlatformModifier, IDC_SELECT_TAB_2 }, |
92 { ui::VKEY_4, kPlatformModifier, IDC_SELECT_TAB_3 }, | 125 { ui::VKEY_4, kPlatformModifier, IDC_SELECT_TAB_3 }, |
93 { ui::VKEY_NUMPAD4, kPlatformModifier, IDC_SELECT_TAB_3 }, | 126 { ui::VKEY_NUMPAD4, kPlatformModifier, IDC_SELECT_TAB_3 }, |
94 { ui::VKEY_5, kPlatformModifier, IDC_SELECT_TAB_4 }, | 127 { ui::VKEY_5, kPlatformModifier, IDC_SELECT_TAB_4 }, |
95 { ui::VKEY_NUMPAD5, kPlatformModifier, IDC_SELECT_TAB_4 }, | 128 { ui::VKEY_NUMPAD5, kPlatformModifier, IDC_SELECT_TAB_4 }, |
(...skipping 15 matching lines...) Expand all Loading... | |
111 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 144 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, |
112 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 145 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, |
113 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 146 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, |
114 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 147 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, |
115 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 148 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, |
116 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 149 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, |
117 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 150 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
118 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 151 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
119 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, | 152 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, |
120 #endif | 153 #endif |
121 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 154 { ui::VKEY_B, ui::EF_SHIFT_DOWN | kPlatformModifier, |
122 IDC_SHOW_BOOKMARK_BAR }, | 155 IDC_SHOW_BOOKMARK_BAR }, |
156 #if defined(OS_MACOSX) | |
157 { ui::VKEY_B, kPlatformModifier | ui::EF_ALT_DOWN, | |
158 IDC_SHOW_BOOKMARK_MANAGER }, | |
159 { ui::VKEY_J, kPlatformModifier | ui::EF_SHIFT_DOWN, IDC_SHOW_DOWNLOADS }, | |
160 { ui::VKEY_Y, kPlatformModifier, IDC_SHOW_HISTORY }, | |
161 #else // !OS_MACOSX | |
123 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 162 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
124 IDC_SHOW_BOOKMARK_MANAGER }, | 163 IDC_SHOW_BOOKMARK_MANAGER }, |
125 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, | 164 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, |
126 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, | 165 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, |
127 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 166 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
128 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 167 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
168 #endif // !OS_MACOSX | |
169 #if defined(OS_MACOSX) | |
170 { ui::VKEY_OEM_PERIOD, kPlatformModifier, IDC_STOP}, | |
171 #else // !OS_MACOSX | |
129 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, | 172 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, |
130 { ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE }, | 173 #endif // !OS_MACOSX |
131 { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 174 { ui::VKEY_U, kPlatformModifier | ui::EF_ALT_DOWN, IDC_VIEW_SOURCE }, |
132 { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 175 { ui::VKEY_OEM_MINUS, kPlatformModifier, IDC_ZOOM_MINUS }, |
133 { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 176 { ui::VKEY_SUBTRACT, kPlatformModifier, IDC_ZOOM_MINUS }, |
134 { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 177 { ui::VKEY_0, kPlatformModifier, IDC_ZOOM_NORMAL }, |
135 { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 178 { ui::VKEY_NUMPAD0, kPlatformModifier, IDC_ZOOM_NORMAL }, |
136 { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 179 { ui::VKEY_OEM_PLUS, kPlatformModifier, IDC_ZOOM_PLUS }, |
180 { ui::VKEY_ADD, kPlatformModifier, IDC_ZOOM_PLUS }, | |
181 #if !defined(OS_MACOSX) | |
137 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, | 182 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, |
138 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, | 183 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, |
139 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, | 184 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, |
140 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 185 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, |
141 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, | 186 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, |
142 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, | 187 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, |
143 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 188 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
144 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 189 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
145 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, | 190 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, |
146 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, | 191 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, |
147 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 192 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
148 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, | 193 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, |
194 #endif // !OS_MACOSX | |
149 | 195 |
150 // Platform-specific key maps. | 196 // Platform-specific key maps. |
151 #if defined(OS_LINUX) | 197 #if defined(OS_LINUX) |
152 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, | 198 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, |
153 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, | 199 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, |
154 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, | 200 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, |
155 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, | 201 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, |
156 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, | 202 { 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 }, | 203 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
158 #endif // defined(OS_LINUX) | 204 #endif // defined(OS_LINUX) |
159 | 205 |
160 #if defined(OS_CHROMEOS) | 206 #if defined(OS_CHROMEOS) |
161 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. | 207 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. |
162 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 208 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
163 IDC_CLEAR_BROWSING_DATA }, | 209 IDC_CLEAR_BROWSING_DATA }, |
164 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, | 210 { 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, | 211 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
166 IDC_HELP_PAGE_VIA_KEYBOARD }, | 212 IDC_HELP_PAGE_VIA_KEYBOARD }, |
167 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, | 213 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, |
168 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, | 214 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, |
169 { ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 215 { ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
170 IDC_TOUCH_HUD_PROJECTION_TOGGLE }, | 216 IDC_TOUCH_HUD_PROJECTION_TOGGLE }, |
171 #else // OS_CHROMEOS | 217 #elif defined(OS_MACOSX) |
218 { ui::VKEY_Q, kPlatformModifier, IDC_EXIT }, | |
219 { ui::VKEY_N, ui::EF_SHIFT_DOWN | kPlatformModifier, | |
220 IDC_NEW_INCOGNITO_WINDOW }, | |
221 { ui::VKEY_T, kPlatformModifier, IDC_NEW_TAB }, | |
222 { ui::VKEY_N, kPlatformModifier, IDC_NEW_WINDOW }, | |
223 { ui::VKEY_T, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_RESTORE_TAB }, | |
224 #else // !OS_MACOSX | |
172 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, | 225 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, |
173 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 226 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
174 IDC_CLEAR_BROWSING_DATA }, | 227 IDC_CLEAR_BROWSING_DATA }, |
175 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 228 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
176 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 229 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
177 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 230 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
178 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled | 231 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled |
179 // via WM_APPCOMMAND. | 232 // via WM_APPCOMMAND. |
180 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, | 233 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, |
181 { ui::VKEY_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU}, | 234 { ui::VKEY_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU }, |
182 // On ChromeOS, these keys are assigned to change UI scale. | 235 // On ChromeOS, these keys are assigned to change UI scale. |
183 { ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 236 { 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, | 237 { ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
185 IDC_ZOOM_MINUS }, | 238 IDC_ZOOM_MINUS }, |
186 // For each entry here add an entry into kChromeCmdId2AshActionId below | 239 // For each entry here add an entry into kChromeCmdId2AshActionId below |
187 // if Ash has a corresponding accelerator. | 240 // if Ash has a corresponding accelerator. |
188 #if defined(GOOGLE_CHROME_BUILD) | 241 #if defined(GOOGLE_CHROME_BUILD) |
189 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, | 242 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, |
190 #endif | 243 #endif |
191 { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT }, | 244 { 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, | 245 { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
193 IDC_NEW_INCOGNITO_WINDOW }, | 246 IDC_NEW_INCOGNITO_WINDOW }, |
194 { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, | 247 { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, |
195 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, | 248 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, |
196 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, | 249 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, |
197 #endif | 250 #endif // !OS_MACOSX |
251 | |
252 #if defined(OS_MACOSX) | |
253 { ui::VKEY_I, kPlatformModifier | ui::EF_SHIFT_DOWN, | |
254 IDC_EMAIL_PAGE_LOCATION }, | |
255 { ui::VKEY_OEM_2, kPlatformModifier | ui::EF_SHIFT_DOWN, | |
256 IDC_HELP_PAGE_VIA_MENU }, | |
257 { ui::VKEY_H, kPlatformModifier, IDC_HIDE_APP }, | |
258 { ui::VKEY_M, kPlatformModifier, IDC_MINIMIZE_WINDOW }, | |
259 | |
260 { ui::VKEY_Z, kPlatformModifier, IDC_CONTENT_CONTEXT_UNDO }, | |
261 { ui::VKEY_Z, kPlatformModifier | ui::EF_SHIFT_DOWN, | |
262 IDC_CONTENT_CONTEXT_REDO }, | |
263 { ui::VKEY_X, kPlatformModifier, IDC_CONTENT_CONTEXT_CUT }, | |
264 { ui::VKEY_C, kPlatformModifier, IDC_CONTENT_CONTEXT_COPY }, | |
265 { ui::VKEY_V, kPlatformModifier, IDC_CONTENT_CONTEXT_PASTE }, | |
266 { ui::VKEY_V, kPlatformModifier | ui::EF_SHIFT_DOWN, | |
267 IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE }, | |
268 { ui::VKEY_A, kPlatformModifier, IDC_CONTENT_CONTEXT_SELECTALL }, | |
269 #endif // OS_MACOSX | |
198 }; | 270 }; |
199 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 271 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
200 | 272 |
201 #if defined(USE_ASH) | 273 #if defined(USE_ASH) |
202 // Below we map Chrome command ids to Ash action ids for commands that have | 274 // Below we map Chrome command ids to Ash action ids for commands that have |
203 // an shortcut that is handled by Ash (instead of Chrome). Adding entries | 275 // an shortcut that is handled by Ash (instead of Chrome). Adding entries |
204 // here will show shortcut text on menus. See comment above. | 276 // here will show shortcut text on menus. See comment above. |
205 struct ChromeCmdId2AshActionId { | 277 struct ChromeCmdId2AshActionId { |
206 const int chrome_cmd_id; | 278 const int chrome_cmd_id; |
207 const ash::AcceleratorAction ash_action_id; | 279 const ash::AcceleratorAction ash_action_id; |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
249 #endif // defined(USE_ASH) | 321 #endif // defined(USE_ASH) |
250 return false; | 322 return false; |
251 } | 323 } |
252 | 324 |
253 bool GetStandardAcceleratorForCommandId(int command_id, | 325 bool GetStandardAcceleratorForCommandId(int command_id, |
254 ui::Accelerator* accelerator) { | 326 ui::Accelerator* accelerator) { |
255 // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators | 327 // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators |
256 // anywhere else. | 328 // anywhere else. |
257 switch (command_id) { | 329 switch (command_id) { |
258 case IDC_CUT: | 330 case IDC_CUT: |
259 *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN); | 331 *accelerator = ui::Accelerator(ui::VKEY_X, kPlatformModifier); |
260 return true; | 332 return true; |
261 case IDC_COPY: | 333 case IDC_COPY: |
262 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); | 334 *accelerator = ui::Accelerator(ui::VKEY_C, kPlatformModifier); |
263 return true; | 335 return true; |
264 case IDC_PASTE: | 336 case IDC_PASTE: |
265 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); | 337 *accelerator = ui::Accelerator(ui::VKEY_V, kPlatformModifier); |
266 return true; | 338 return true; |
267 } | 339 } |
268 return false; | 340 return false; |
269 } | 341 } |
270 | 342 |
271 } // namespace chrome | 343 } // namespace chrome |
OLD | NEW |