Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/views/accelerator_table_gtk.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/accelerator_table_gtk.h ('k') | chrome/browser/ui/views/accessible_pane_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_gtk.h" 5 #include "chrome/browser/ui/views/accelerator_table_gtk.h"
6 6
7 #include "app/keyboard_codes.h"
8 #include "base/basictypes.h" 7 #include "base/basictypes.h"
9 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "ui/base/keycodes/keyboard_codes.h"
10 10
11 namespace browser { 11 namespace browser {
12 12
13 // NOTE: Keep this list in the same (mostly-alphabetical) order as 13 // NOTE: Keep this list in the same (mostly-alphabetical) order as
14 // the Windows accelerators in ../../app/chrome_dll.rc. 14 // the Windows accelerators in ../../app/chrome_dll.rc.
15 const AcceleratorMapping kAcceleratorMap[] = { 15 const AcceleratorMapping kAcceleratorMap[] = {
16 // Keycode Shift Ctrl Alt Command ID 16 // Keycode Shift Ctrl Alt Command ID
17 { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, 17 { ui::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT },
18 { app::VKEY_LEFT, false, false, true, IDC_BACK }, 18 { ui::VKEY_LEFT, false, false, true, IDC_BACK },
19 { app::VKEY_BACK, false, false, false, IDC_BACK }, 19 { ui::VKEY_BACK, false, false, false, IDC_BACK },
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 { app::VKEY_F1, false, false, false, IDC_BACK }, 21 { ui::VKEY_F1, false, false, false, IDC_BACK },
22 // TODO(mazda): Change VKEY_1 to VKEY_OME_2 once the new version of the 22 // TODO(mazda): Change VKEY_1 to VKEY_OME_2 once the new version of the
23 // keyboard overlay is ready. 23 // keyboard overlay is ready.
24 { app::VKEY_1, false, true, true, IDC_SHOW_KEYBOARD_OVERLAY }, 24 { ui::VKEY_1, false, true, true, IDC_SHOW_KEYBOARD_OVERLAY },
25 #endif 25 #endif
26 { app::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE }, 26 { ui::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE },
27 { app::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS }, 27 { ui::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS },
28 { app::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA }, 28 { ui::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA },
29 #if !defined(OS_CHROMEOS) 29 #if !defined(OS_CHROMEOS)
30 { app::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, 30 { ui::VKEY_F4, false, true, false, IDC_CLOSE_TAB },
31 #endif 31 #endif
32 { app::VKEY_W, false, true, false, IDC_CLOSE_TAB }, 32 { ui::VKEY_W, false, true, false, IDC_CLOSE_TAB },
33 { app::VKEY_W, true, true, false, IDC_CLOSE_WINDOW }, 33 { ui::VKEY_W, true, true, false, IDC_CLOSE_WINDOW },
34 #if !defined(OS_CHROMEOS) 34 #if !defined(OS_CHROMEOS)
35 { app::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW }, 35 { ui::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW },
36 #endif 36 #endif
37 { app::VKEY_Q, true, true, false, IDC_EXIT }, 37 { ui::VKEY_Q, true, true, false, IDC_EXIT },
38 { app::VKEY_F, false, true, false, IDC_FIND }, 38 { ui::VKEY_F, false, true, false, IDC_FIND },
39 { app::VKEY_G, false, true, false, IDC_FIND_NEXT }, 39 { ui::VKEY_G, false, true, false, IDC_FIND_NEXT },
40 #if !defined(OS_CHROMEOS) 40 #if !defined(OS_CHROMEOS)
41 { app::VKEY_F3, false, false, false, IDC_FIND_NEXT }, 41 { ui::VKEY_F3, false, false, false, IDC_FIND_NEXT },
42 #endif 42 #endif
43 { app::VKEY_G, true, true, false, IDC_FIND_PREVIOUS }, 43 { ui::VKEY_G, true, true, false, IDC_FIND_PREVIOUS },
44 #if !defined(OS_CHROMEOS) 44 #if !defined(OS_CHROMEOS)
45 { app::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS }, 45 { ui::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS },
46 #endif 46 #endif
47 #if defined(OS_CHROMEOS) 47 #if defined(OS_CHROMEOS)
48 { app::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS }, 48 { ui::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS },
49 #endif 49 #endif
50 { app::VKEY_D, false, false, true, IDC_FOCUS_LOCATION }, 50 { ui::VKEY_D, false, false, true, IDC_FOCUS_LOCATION },
51 { app::VKEY_L, false, true, false, IDC_FOCUS_LOCATION }, 51 { ui::VKEY_L, false, true, false, IDC_FOCUS_LOCATION },
52 #if !defined(OS_CHROMEOS) 52 #if !defined(OS_CHROMEOS)
53 { app::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR }, 53 { ui::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR },
54 #endif 54 #endif
55 { app::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR }, 55 { ui::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR },
56 #if !defined(OS_CHROMEOS) 56 #if !defined(OS_CHROMEOS)
57 { app::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE }, 57 { ui::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE },
58 #endif 58 #endif
59 #if defined(OS_CHROMEOS) 59 #if defined(OS_CHROMEOS)
60 { app::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE }, 60 { ui::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE },
61 #endif 61 #endif
62 #if !defined(OS_CHROMEOS) 62 #if !defined(OS_CHROMEOS)
63 { app::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE }, 63 { ui::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE },
64 #endif 64 #endif
65 #if defined(OS_CHROMEOS) 65 #if defined(OS_CHROMEOS)
66 { app::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE }, 66 { ui::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE },
67 #endif 67 #endif
68 { app::VKEY_K, false, true, false, IDC_FOCUS_SEARCH }, 68 { ui::VKEY_K, false, true, false, IDC_FOCUS_SEARCH },
69 { app::VKEY_E, false, true, false, IDC_FOCUS_SEARCH }, 69 { ui::VKEY_E, false, true, false, IDC_FOCUS_SEARCH },
70 { app::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH }, 70 { ui::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
71 { app::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR }, 71 { ui::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR },
72 { app::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS }, 72 { ui::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS },
73 { app::VKEY_RIGHT, false, false, true, IDC_FORWARD }, 73 { ui::VKEY_RIGHT, false, false, true, IDC_FORWARD },
74 { app::VKEY_BACK, true, false, false, IDC_FORWARD }, 74 { ui::VKEY_BACK, true, false, false, IDC_FORWARD },
75 #if defined(OS_CHROMEOS) 75 #if defined(OS_CHROMEOS)
76 { app::VKEY_F2, false, false, false, IDC_FORWARD }, 76 { ui::VKEY_F2, false, false, false, IDC_FORWARD },
77 #endif 77 #endif
78 #if !defined(OS_CHROMEOS) 78 #if !defined(OS_CHROMEOS)
79 { app::VKEY_F11, false, false, false, IDC_FULLSCREEN }, 79 { ui::VKEY_F11, false, false, false, IDC_FULLSCREEN },
80 #endif 80 #endif
81 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
82 { app::VKEY_F4, false, false, false, IDC_FULLSCREEN }, 82 { ui::VKEY_F4, false, false, false, IDC_FULLSCREEN },
83 #endif 83 #endif
84 #if !defined(OS_CHROMEOS) 84 #if !defined(OS_CHROMEOS)
85 { app::VKEY_F1, false, false, false, IDC_HELP_PAGE }, 85 { ui::VKEY_F1, false, false, false, IDC_HELP_PAGE },
86 #endif 86 #endif
87 #if defined(OS_CHROMEOS) 87 #if defined(OS_CHROMEOS)
88 { app::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, 88 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE },
89 { app::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, 89 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE },
90 #endif 90 #endif
91 { app::VKEY_I, true, true, false, IDC_DEV_TOOLS }, 91 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS },
92 { app::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, 92 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
93 { app::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, 93 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
94 { app::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, 94 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
95 { app::VKEY_T, false, true, false, IDC_NEW_TAB }, 95 { ui::VKEY_T, false, true, false, IDC_NEW_TAB },
96 { app::VKEY_N, false, true, false, IDC_NEW_WINDOW }, 96 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW },
97 { app::VKEY_O, false, true, false, IDC_OPEN_FILE }, 97 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE },
98 { app::VKEY_P, false, true, false, IDC_PRINT}, 98 { ui::VKEY_P, false, true, false, IDC_PRINT},
99 { app::VKEY_R, false, true, false, IDC_RELOAD }, 99 { ui::VKEY_R, false, true, false, IDC_RELOAD },
100 { app::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE }, 100 { ui::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
101 #if !defined(OS_CHROMEOS) 101 #if !defined(OS_CHROMEOS)
102 { app::VKEY_F5, false, false, false, IDC_RELOAD }, 102 { ui::VKEY_F5, false, false, false, IDC_RELOAD },
103 { app::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 103 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
104 { app::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 104 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
105 #endif 105 #endif
106 #if defined(OS_CHROMEOS) 106 #if defined(OS_CHROMEOS)
107 { app::VKEY_F3, false, false, false, IDC_RELOAD }, 107 { ui::VKEY_F3, false, false, false, IDC_RELOAD },
108 { app::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 108 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE },
109 { app::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 109 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE },
110 #endif 110 #endif
111 { app::VKEY_HOME, false, false, true, IDC_HOME }, 111 { ui::VKEY_HOME, false, false, true, IDC_HOME },
112 { app::VKEY_T, true, true, false, IDC_RESTORE_TAB }, 112 { ui::VKEY_T, true, true, false, IDC_RESTORE_TAB },
113 { app::VKEY_S, false, true, false, IDC_SAVE_PAGE }, 113 { ui::VKEY_S, false, true, false, IDC_SAVE_PAGE },
114 #if defined(OS_CHROMEOS) 114 #if defined(OS_CHROMEOS)
115 { app::VKEY_LWIN, false, false, false, IDC_SEARCH }, 115 { ui::VKEY_LWIN, false, false, false, IDC_SEARCH },
116 #endif 116 #endif
117 { app::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB }, 117 { ui::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB },
118 { app::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB }, 118 { ui::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB },
119 { app::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB }, 119 { ui::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB },
120 { app::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB }, 120 { ui::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB },
121 { app::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB }, 121 { ui::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB },
122 { app::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB }, 122 { ui::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB },
123 { app::VKEY_1, false, true, false, IDC_SELECT_TAB_0 }, 123 { ui::VKEY_1, false, true, false, IDC_SELECT_TAB_0 },
124 { app::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 }, 124 { ui::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 },
125 { app::VKEY_2, false, true, false, IDC_SELECT_TAB_1 }, 125 { ui::VKEY_2, false, true, false, IDC_SELECT_TAB_1 },
126 { app::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 }, 126 { ui::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 },
127 { app::VKEY_3, false, true, false, IDC_SELECT_TAB_2 }, 127 { ui::VKEY_3, false, true, false, IDC_SELECT_TAB_2 },
128 { app::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 }, 128 { ui::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 },
129 { app::VKEY_4, false, true, false, IDC_SELECT_TAB_3 }, 129 { ui::VKEY_4, false, true, false, IDC_SELECT_TAB_3 },
130 { app::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 }, 130 { ui::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 },
131 { app::VKEY_5, false, true, false, IDC_SELECT_TAB_4 }, 131 { ui::VKEY_5, false, true, false, IDC_SELECT_TAB_4 },
132 { app::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 }, 132 { ui::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 },
133 { app::VKEY_6, false, true, false, IDC_SELECT_TAB_5 }, 133 { ui::VKEY_6, false, true, false, IDC_SELECT_TAB_5 },
134 { app::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 }, 134 { ui::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 },
135 { app::VKEY_7, false, true, false, IDC_SELECT_TAB_6 }, 135 { ui::VKEY_7, false, true, false, IDC_SELECT_TAB_6 },
136 { app::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 }, 136 { ui::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 },
137 { app::VKEY_8, false, true, false, IDC_SELECT_TAB_7 }, 137 { ui::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
138 { app::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 }, 138 { ui::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
139 { app::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR }, 139 { ui::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
140 { app::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS }, 140 { ui::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
141 { app::VKEY_H, false, true, false, IDC_SHOW_HISTORY }, 141 { ui::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
142 { app::VKEY_F, false, false, true, IDC_SHOW_APP_MENU}, 142 { ui::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},
143 { app::VKEY_E, false, false, true, IDC_SHOW_APP_MENU}, 143 { ui::VKEY_E, false, false, true, IDC_SHOW_APP_MENU},
144 { app::VKEY_ESCAPE, false, false, false, IDC_STOP }, 144 { ui::VKEY_ESCAPE, false, false, false, IDC_STOP },
145 { app::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER }, 145 { ui::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER },
146 { app::VKEY_U, false, true, false, IDC_VIEW_SOURCE }, 146 { ui::VKEY_U, false, true, false, IDC_VIEW_SOURCE },
147 { app::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS }, 147 { ui::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS },
148 { app::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS }, 148 { ui::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS },
149 { app::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS }, 149 { ui::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS },
150 { app::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 150 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
151 { app::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 151 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
152 { app::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 152 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
153 { app::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 153 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
154 { app::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 154 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
155 }; 155 };
156 156
157 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 157 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
158 158
159 } // namespace browser 159 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table_gtk.h ('k') | chrome/browser/ui/views/accessible_pane_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698