| 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/accelerators/accelerator.h" | 9 #include "ui/base/accelerators/accelerator.h" |
| 10 #include "ui/events/event_constants.h" | 10 #include "ui/events/event_constants.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 { ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 }, | 94 { ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 }, |
| 95 { ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 }, | 95 { ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 }, |
| 96 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 96 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, |
| 97 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 97 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, |
| 98 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 98 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, |
| 99 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 99 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, |
| 100 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 100 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, |
| 101 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 101 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, |
| 102 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 102 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
| 103 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 103 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
| 104 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, |
| 104 #endif | 105 #endif |
| 105 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 106 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 106 IDC_SHOW_BOOKMARK_BAR }, | 107 IDC_SHOW_BOOKMARK_BAR }, |
| 107 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 108 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 108 IDC_SHOW_BOOKMARK_MANAGER }, | 109 IDC_SHOW_BOOKMARK_MANAGER }, |
| 109 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, | 110 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, |
| 110 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, | 111 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, |
| 111 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 112 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
| 112 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 113 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
| 113 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, | 114 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 127 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, | 128 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, |
| 128 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, | 129 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, |
| 129 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 130 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 130 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 131 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 131 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, | 132 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, |
| 132 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, | 133 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, |
| 133 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 134 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
| 134 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, | 135 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, |
| 135 | 136 |
| 136 // Platform-specific key maps. | 137 // Platform-specific key maps. |
| 137 #if defined(OS_CHROMEOS) | 138 #if defined(OS_LINUX) |
| 138 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. | |
| 139 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, | 139 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, |
| 140 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
| 141 IDC_CLEAR_BROWSING_DATA }, | |
| 142 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, | 140 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, |
| 143 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, | |
| 144 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
| 145 IDC_HELP_PAGE_VIA_KEYBOARD }, | |
| 146 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, | 141 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, |
| 147 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, | 142 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, |
| 148 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 143 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 149 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 144 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, |
| 145 #endif // defined(OS_LINUX) |
| 146 |
| 147 #if defined(OS_CHROMEOS) |
| 148 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. |
| 149 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 150 IDC_CLEAR_BROWSING_DATA }, |
| 151 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, |
| 152 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 153 IDC_HELP_PAGE_VIA_KEYBOARD }, |
| 150 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, | 154 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, |
| 151 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, | 155 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, |
| 152 // Not implemented inside Ash to allow web pages to capture the key. | 156 // Not implemented inside Ash to allow web pages to capture the key. |
| 153 { ui::VKEY_M, ui::EF_CONTROL_DOWN, IDC_MINIMIZE_WINDOW }, | 157 { ui::VKEY_M, ui::EF_CONTROL_DOWN, IDC_MINIMIZE_WINDOW }, |
| 154 #else // OS_CHROMEOS | 158 #else // OS_CHROMEOS |
| 155 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 159 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 156 IDC_CLEAR_BROWSING_DATA }, | 160 IDC_CLEAR_BROWSING_DATA }, |
| 157 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 161 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
| 158 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 162 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
| 159 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 163 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); | 251 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); |
| 248 return true; | 252 return true; |
| 249 case IDC_PASTE: | 253 case IDC_PASTE: |
| 250 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); | 254 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); |
| 251 return true; | 255 return true; |
| 252 } | 256 } |
| 253 return false; | 257 return false; |
| 254 } | 258 } |
| 255 | 259 |
| 256 } // namespace chrome | 260 } // namespace chrome |
| OLD | NEW |