| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 #if !defined(OS_CHROMEOS) | 87 #if !defined(OS_CHROMEOS) |
| 88 { ui::VKEY_F1, false, false, false, IDC_HELP_PAGE }, | 88 { ui::VKEY_F1, false, false, false, IDC_HELP_PAGE }, |
| 89 #else | 89 #else |
| 90 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, | 90 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, |
| 91 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, | 91 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, |
| 92 #endif | 92 #endif |
| 93 #if defined(OS_CHROMEOS) && !defined(USE_AURA) | 93 #if defined(OS_CHROMEOS) && !defined(USE_AURA) |
| 94 { ui::VKEY_L, true, true, false, IDC_LOCK_SCREEN }, | 94 { ui::VKEY_L, true, true, false, IDC_LOCK_SCREEN }, |
| 95 #endif | 95 #endif |
| 96 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS }, | 96 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS }, |
| 97 #if defined(OS_CHROMEOS) |
| 98 { ui::VKEY_I, false, true, true, IDC_FEEDBACK }, |
| 99 #endif |
| 97 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS }, | 100 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS }, |
| 98 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, | 101 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, |
| 99 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, | 102 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, |
| 100 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, | 103 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, |
| 101 { ui::VKEY_T, false, true, false, IDC_NEW_TAB }, | 104 { ui::VKEY_T, false, true, false, IDC_NEW_TAB }, |
| 102 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW }, | 105 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW }, |
| 103 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE }, | 106 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE }, |
| 104 { ui::VKEY_P, false, true, false, IDC_PRINT}, | 107 { ui::VKEY_P, false, true, false, IDC_PRINT}, |
| 105 { ui::VKEY_P, true, true, false, IDC_ADVANCED_PRINT}, | 108 { ui::VKEY_P, true, true, false, IDC_ADVANCED_PRINT}, |
| 106 { ui::VKEY_R, false, true, false, IDC_RELOAD }, | 109 { ui::VKEY_R, false, true, false, IDC_RELOAD }, |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, | 165 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, |
| 163 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, | 166 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, |
| 164 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, | 167 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, |
| 165 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, | 168 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, |
| 166 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, | 169 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, |
| 167 }; | 170 }; |
| 168 | 171 |
| 169 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 172 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
| 170 | 173 |
| 171 } // namespace browser | 174 } // namespace browser |
| OLD | NEW |