| 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/keycodes/keyboard_codes.h" | 9 #include "ui/base/keycodes/keyboard_codes.h" |
| 10 | 10 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, | 113 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, |
| 114 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, | 114 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, |
| 115 #else | 115 #else |
| 116 { ui::VKEY_F3, false, false, false, IDC_RELOAD }, | 116 { ui::VKEY_F3, false, false, false, IDC_RELOAD }, |
| 117 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE }, | 117 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE }, |
| 118 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE }, | 118 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE }, |
| 119 #endif | 119 #endif |
| 120 { ui::VKEY_HOME, false, false, true, IDC_HOME }, | 120 { ui::VKEY_HOME, false, false, true, IDC_HOME }, |
| 121 { ui::VKEY_T, true, true, false, IDC_RESTORE_TAB }, | 121 { ui::VKEY_T, true, true, false, IDC_RESTORE_TAB }, |
| 122 { ui::VKEY_S, false, true, false, IDC_SAVE_PAGE }, | 122 { ui::VKEY_S, false, true, false, IDC_SAVE_PAGE }, |
| 123 #if defined(OS_CHROMEOS) && defined(USE_AURA) |
| 124 { ui::VKEY_T, false, true, true, IDC_NEW_CROSH_TAB }, |
| 125 #endif |
| 123 #if defined(OS_CHROMEOS) | 126 #if defined(OS_CHROMEOS) |
| 124 { ui::VKEY_M, false, true, false, IDC_FILE_MANAGER }, | 127 { ui::VKEY_M, false, true, false, IDC_FILE_MANAGER }, |
| 125 { ui::VKEY_LWIN, false, false, false, IDC_SEARCH }, | 128 { ui::VKEY_LWIN, false, false, false, IDC_SEARCH }, |
| 126 #endif | 129 #endif |
| 127 { ui::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB }, | 130 { ui::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB }, |
| 128 { ui::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB }, | 131 { ui::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB }, |
| 129 { ui::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB }, | 132 { ui::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB }, |
| 130 { ui::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB }, | 133 { ui::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB }, |
| 131 { ui::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB }, | 134 { ui::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB }, |
| 132 { ui::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB }, | 135 { ui::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB }, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, | 168 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, |
| 166 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, | 169 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, |
| 167 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, | 170 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, |
| 168 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, | 171 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, |
| 169 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, | 172 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, |
| 170 }; | 173 }; |
| 171 | 174 |
| 172 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 175 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
| 173 | 176 |
| 174 } // namespace browser | 177 } // namespace browser |
| OLD | NEW |