| 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "ui/base/events.h" | 9 #include "ui/base/events.h" |
| 10 #include "ui/base/keycodes/keyboard_codes.h" | 10 #include "ui/base/keycodes/keyboard_codes.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, | 99 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, |
| 100 { ui::VKEY_F1, ui::EF_NONE, IDC_BACK }, | 100 { ui::VKEY_F1, ui::EF_NONE, IDC_BACK }, |
| 101 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 101 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 102 IDC_CLEAR_BROWSING_DATA }, | 102 IDC_CLEAR_BROWSING_DATA }, |
| 103 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, | 103 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, |
| 104 { ui::VKEY_F2, ui::EF_CONTROL_DOWN, IDC_FOCUS_NEXT_PANE }, | 104 { ui::VKEY_F2, ui::EF_CONTROL_DOWN, IDC_FOCUS_NEXT_PANE }, |
| 105 { ui::VKEY_F1, ui::EF_CONTROL_DOWN, IDC_FOCUS_PREVIOUS_PANE }, | 105 { ui::VKEY_F1, ui::EF_CONTROL_DOWN, IDC_FOCUS_PREVIOUS_PANE }, |
| 106 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, | 106 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, |
| 107 { ui::VKEY_F2, ui::EF_NONE, IDC_FORWARD }, | 107 { ui::VKEY_F2, ui::EF_NONE, IDC_FORWARD }, |
| 108 { ui::VKEY_F4, ui::EF_NONE, IDC_FULLSCREEN }, | 108 { ui::VKEY_F4, ui::EF_NONE, IDC_FULLSCREEN }, |
| 109 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE }, | 109 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, |
| 110 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_HELP_PAGE }, | 110 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 111 IDC_HELP_PAGE_VIA_KEYBOARD }, |
| 111 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, | 112 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, |
| 112 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, | 113 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, |
| 113 { ui::VKEY_F3, ui::EF_NONE, IDC_RELOAD }, | 114 { ui::VKEY_F3, ui::EF_NONE, IDC_RELOAD }, |
| 114 { ui::VKEY_F3, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 115 { ui::VKEY_F3, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 115 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 116 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 116 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, | 117 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, |
| 117 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, | 118 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, |
| 118 #else // OS_CHROMEOS | 119 #else // OS_CHROMEOS |
| 119 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 120 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 120 IDC_CLEAR_BROWSING_DATA }, | 121 IDC_CLEAR_BROWSING_DATA }, |
| 121 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 122 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, |
| 122 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, | 123 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, |
| 123 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, | 124 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, |
| 124 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, | 125 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, |
| 125 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 126 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
| 126 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 127 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
| 127 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, | 128 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, |
| 128 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, | 129 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, |
| 129 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled | 130 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled |
| 130 // via WM_APPCOMMAND. | 131 // via WM_APPCOMMAND. |
| 131 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, | 132 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, |
| 132 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, | 133 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, |
| 133 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE }, | 134 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, |
| 134 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, | 135 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, |
| 135 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 136 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 136 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 137 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 137 { ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU}, | 138 { ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU}, |
| 138 #endif // OS_CHROMEOS | 139 #endif // OS_CHROMEOS |
| 139 #if !defined(USE_ASH) | 140 #if !defined(USE_ASH) |
| 140 { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT }, | 141 { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT }, |
| 141 { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 142 { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 142 IDC_NEW_INCOGNITO_WINDOW }, | 143 IDC_NEW_INCOGNITO_WINDOW }, |
| 143 { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, | 144 { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, |
| 144 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, | 145 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, |
| 145 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, | 146 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, |
| 146 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, | 147 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, |
| 147 #endif | 148 #endif |
| 148 }; | 149 }; |
| 149 | 150 |
| 150 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 151 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
| 151 | 152 |
| 152 } // namespace browser | 153 } // namespace browser |
| OLD | NEW |