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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3354005: Re-lands 58186: (Closed)
Patch Set: Created 10 years, 3 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
« no previous file with comments | « chrome/browser/views/accelerator_table_gtk.h ('k') | chrome/browser/views/accessible_toolbar_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/accelerator_table_gtk.h" 5 #include "chrome/browser/views/accelerator_table_gtk.h"
6 6
7 #include "app/keyboard_codes.h"
7 #include "base/basictypes.h" 8 #include "base/basictypes.h"
8 #include "base/keyboard_codes.h"
9 #include "chrome/app/chrome_dll_resource.h" 9 #include "chrome/app/chrome_dll_resource.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 { base::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, 17 { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT },
18 { base::VKEY_LEFT, false, false, true, IDC_BACK }, 18 { app::VKEY_LEFT, false, false, true, IDC_BACK },
19 { base::VKEY_BACK, false, false, false, IDC_BACK }, 19 { app::VKEY_BACK, false, false, false, IDC_BACK },
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 { base::VKEY_F1, false, false, false, IDC_BACK }, 21 { app::VKEY_F1, false, false, false, IDC_BACK },
22 #endif 22 #endif
23 { base::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE }, 23 { app::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE },
24 { base::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS }, 24 { app::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS },
25 { base::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA }, 25 { app::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA },
26 #if !defined(OS_CHROMEOS) 26 #if !defined(OS_CHROMEOS)
27 { base::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, 27 { app::VKEY_F4, false, true, false, IDC_CLOSE_TAB },
28 #endif 28 #endif
29 { base::VKEY_W, false, true, false, IDC_CLOSE_TAB }, 29 { app::VKEY_W, false, true, false, IDC_CLOSE_TAB },
30 { base::VKEY_W, true, true, false, IDC_CLOSE_WINDOW }, 30 { app::VKEY_W, true, true, false, IDC_CLOSE_WINDOW },
31 #if !defined(OS_CHROMEOS) 31 #if !defined(OS_CHROMEOS)
32 { base::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW }, 32 { app::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW },
33 #endif 33 #endif
34 { base::VKEY_Q, true, true, false, IDC_EXIT }, 34 { app::VKEY_Q, true, true, false, IDC_EXIT },
35 { base::VKEY_F, false, true, false, IDC_FIND }, 35 { app::VKEY_F, false, true, false, IDC_FIND },
36 { base::VKEY_G, false, true, false, IDC_FIND_NEXT }, 36 { app::VKEY_G, false, true, false, IDC_FIND_NEXT },
37 #if !defined(OS_CHROMEOS) 37 #if !defined(OS_CHROMEOS)
38 { base::VKEY_F3, false, false, false, IDC_FIND_NEXT }, 38 { app::VKEY_F3, false, false, false, IDC_FIND_NEXT },
39 #endif 39 #endif
40 { base::VKEY_G, true, true, false, IDC_FIND_PREVIOUS }, 40 { app::VKEY_G, true, true, false, IDC_FIND_PREVIOUS },
41 #if !defined(OS_CHROMEOS) 41 #if !defined(OS_CHROMEOS)
42 { base::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS }, 42 { app::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS },
43 #endif 43 #endif
44 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
45 { base::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS }, 45 { app::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS },
46 #endif 46 #endif
47 { base::VKEY_D, false, false, true, IDC_FOCUS_LOCATION }, 47 { app::VKEY_D, false, false, true, IDC_FOCUS_LOCATION },
48 { base::VKEY_L, false, true, false, IDC_FOCUS_LOCATION }, 48 { app::VKEY_L, false, true, false, IDC_FOCUS_LOCATION },
49 #if !defined(OS_CHROMEOS) 49 #if !defined(OS_CHROMEOS)
50 { base::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR }, 50 { app::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR },
51 #endif 51 #endif
52 { base::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR }, 52 { app::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR },
53 #if !defined(OS_CHROMEOS) 53 #if !defined(OS_CHROMEOS)
54 { base::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE }, 54 { app::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE },
55 #endif 55 #endif
56 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
57 { base::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE }, 57 { app::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE },
58 #endif 58 #endif
59 #if !defined(OS_CHROMEOS) 59 #if !defined(OS_CHROMEOS)
60 { base::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE }, 60 { app::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE },
61 #endif 61 #endif
62 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
63 { base::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE }, 63 { app::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE },
64 #endif 64 #endif
65 { base::VKEY_K, false, true, false, IDC_FOCUS_SEARCH }, 65 { app::VKEY_K, false, true, false, IDC_FOCUS_SEARCH },
66 { base::VKEY_E, false, true, false, IDC_FOCUS_SEARCH }, 66 { app::VKEY_E, false, true, false, IDC_FOCUS_SEARCH },
67 { base::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH }, 67 { app::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
68 { base::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR }, 68 { app::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR },
69 { base::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS }, 69 { app::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS },
70 { base::VKEY_RIGHT, false, false, true, IDC_FORWARD }, 70 { app::VKEY_RIGHT, false, false, true, IDC_FORWARD },
71 { base::VKEY_BACK, true, false, false, IDC_FORWARD }, 71 { app::VKEY_BACK, true, false, false, IDC_FORWARD },
72 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
73 { base::VKEY_F2, false, false, false, IDC_FORWARD }, 73 { app::VKEY_F2, false, false, false, IDC_FORWARD },
74 #endif 74 #endif
75 #if !defined(OS_CHROMEOS) 75 #if !defined(OS_CHROMEOS)
76 { base::VKEY_F11, false, false, false, IDC_FULLSCREEN }, 76 { app::VKEY_F11, false, false, false, IDC_FULLSCREEN },
77 #endif 77 #endif
78 #if defined(OS_CHROMEOS) 78 #if defined(OS_CHROMEOS)
79 { base::VKEY_F4, false, false, false, IDC_FULLSCREEN }, 79 { app::VKEY_F4, false, false, false, IDC_FULLSCREEN },
80 #endif 80 #endif
81 #if !defined(OS_CHROMEOS) 81 #if !defined(OS_CHROMEOS)
82 { base::VKEY_F1, false, false, false, IDC_HELP_PAGE }, 82 { app::VKEY_F1, false, false, false, IDC_HELP_PAGE },
83 #endif 83 #endif
84 { base::VKEY_I, true, true, false, IDC_DEV_TOOLS }, 84 { app::VKEY_I, true, true, false, IDC_DEV_TOOLS },
85 { base::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, 85 { app::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
86 { base::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, 86 { app::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
87 { base::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, 87 { app::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
88 { base::VKEY_T, false, true, false, IDC_NEW_TAB }, 88 { app::VKEY_T, false, true, false, IDC_NEW_TAB },
89 { base::VKEY_N, false, true, false, IDC_NEW_WINDOW }, 89 { app::VKEY_N, false, true, false, IDC_NEW_WINDOW },
90 { base::VKEY_O, false, true, false, IDC_OPEN_FILE }, 90 { app::VKEY_O, false, true, false, IDC_OPEN_FILE },
91 { base::VKEY_P, false, true, false, IDC_PRINT}, 91 { app::VKEY_P, false, true, false, IDC_PRINT},
92 { base::VKEY_R, false, true, false, IDC_RELOAD }, 92 { app::VKEY_R, false, true, false, IDC_RELOAD },
93 { base::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE }, 93 { app::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
94 #if !defined(OS_CHROMEOS) 94 #if !defined(OS_CHROMEOS)
95 { base::VKEY_F5, false, false, false, IDC_RELOAD }, 95 { app::VKEY_F5, false, false, false, IDC_RELOAD },
96 { base::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 96 { app::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
97 { base::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 97 { app::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
98 #endif 98 #endif
99 { base::VKEY_HOME, false, false, true, IDC_HOME }, 99 { app::VKEY_HOME, false, false, true, IDC_HOME },
100 { base::VKEY_T, true, true, false, IDC_RESTORE_TAB }, 100 { app::VKEY_T, true, true, false, IDC_RESTORE_TAB },
101 { base::VKEY_S, false, true, false, IDC_SAVE_PAGE }, 101 { app::VKEY_S, false, true, false, IDC_SAVE_PAGE },
102 #if defined(OS_CHROMEOS) 102 #if defined(OS_CHROMEOS)
103 { base::VKEY_LWIN, false, false, false, IDC_SEARCH }, 103 { app::VKEY_LWIN, false, false, false, IDC_SEARCH },
104 #endif 104 #endif
105 { base::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB }, 105 { app::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB },
106 { base::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB }, 106 { app::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB },
107 { base::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB }, 107 { app::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB },
108 { base::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB }, 108 { app::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB },
109 { base::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB }, 109 { app::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB },
110 { base::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB }, 110 { app::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB },
111 { base::VKEY_1, false, true, false, IDC_SELECT_TAB_0 }, 111 { app::VKEY_1, false, true, false, IDC_SELECT_TAB_0 },
112 { base::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 }, 112 { app::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 },
113 { base::VKEY_2, false, true, false, IDC_SELECT_TAB_1 }, 113 { app::VKEY_2, false, true, false, IDC_SELECT_TAB_1 },
114 { base::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 }, 114 { app::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 },
115 { base::VKEY_3, false, true, false, IDC_SELECT_TAB_2 }, 115 { app::VKEY_3, false, true, false, IDC_SELECT_TAB_2 },
116 { base::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 }, 116 { app::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 },
117 { base::VKEY_4, false, true, false, IDC_SELECT_TAB_3 }, 117 { app::VKEY_4, false, true, false, IDC_SELECT_TAB_3 },
118 { base::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 }, 118 { app::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 },
119 { base::VKEY_5, false, true, false, IDC_SELECT_TAB_4 }, 119 { app::VKEY_5, false, true, false, IDC_SELECT_TAB_4 },
120 { base::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 }, 120 { app::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 },
121 { base::VKEY_6, false, true, false, IDC_SELECT_TAB_5 }, 121 { app::VKEY_6, false, true, false, IDC_SELECT_TAB_5 },
122 { base::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 }, 122 { app::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 },
123 { base::VKEY_7, false, true, false, IDC_SELECT_TAB_6 }, 123 { app::VKEY_7, false, true, false, IDC_SELECT_TAB_6 },
124 { base::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 }, 124 { app::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 },
125 { base::VKEY_8, false, true, false, IDC_SELECT_TAB_7 }, 125 { app::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
126 { base::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 }, 126 { app::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
127 { base::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR }, 127 { app::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
128 { base::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS }, 128 { app::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
129 { base::VKEY_H, false, true, false, IDC_SHOW_HISTORY }, 129 { app::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
130 { base::VKEY_F, false, false, true, IDC_SHOW_APP_MENU}, 130 { app::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},
131 { base::VKEY_E, false, false, true, IDC_SHOW_APP_MENU}, 131 { app::VKEY_E, false, false, true, IDC_SHOW_APP_MENU},
132 { base::VKEY_ESCAPE, false, false, false, IDC_STOP }, 132 { app::VKEY_ESCAPE, false, false, false, IDC_STOP },
133 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
134 { base::VKEY_F5, false, false, false, IDC_SYSTEM_OPTIONS }, 134 { app::VKEY_F5, false, false, false, IDC_SYSTEM_OPTIONS },
135 #endif 135 #endif
136 { base::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER }, 136 { app::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER },
137 { base::VKEY_U, false, true, false, IDC_VIEW_SOURCE }, 137 { app::VKEY_U, false, true, false, IDC_VIEW_SOURCE },
138 { base::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS }, 138 { app::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS },
139 { base::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS }, 139 { app::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS },
140 { base::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS }, 140 { app::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS },
141 { base::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 141 { app::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
142 { base::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 142 { app::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
143 { base::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 143 { app::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
144 { base::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 144 { app::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
145 { base::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 145 { app::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
146 }; 146 };
147 147
148 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 148 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
149 149
150 } // namespace browser 150 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/views/accelerator_table_gtk.h ('k') | chrome/browser/views/accessible_toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698