| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 20 matching lines...) Expand all Loading... |
| 31 { ui::VKEY_BACK, true, true, false, IDC_CLEAR_BROWSING_DATA }, | 31 { ui::VKEY_BACK, true, true, false, IDC_CLEAR_BROWSING_DATA }, |
| 32 #endif | 32 #endif |
| 33 #if !defined(OS_CHROMEOS) | 33 #if !defined(OS_CHROMEOS) |
| 34 { ui::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, | 34 { ui::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, |
| 35 #endif | 35 #endif |
| 36 { ui::VKEY_W, false, true, false, IDC_CLOSE_TAB }, | 36 { ui::VKEY_W, false, true, false, IDC_CLOSE_TAB }, |
| 37 { ui::VKEY_W, true, true, false, IDC_CLOSE_WINDOW }, | 37 { ui::VKEY_W, true, true, false, IDC_CLOSE_WINDOW }, |
| 38 #if !defined(OS_CHROMEOS) | 38 #if !defined(OS_CHROMEOS) |
| 39 { ui::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW }, | 39 { ui::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW }, |
| 40 #endif | 40 #endif |
| 41 #if !defined(USE_AURA) |
| 41 { ui::VKEY_Q, true, true, false, IDC_EXIT }, | 42 { ui::VKEY_Q, true, true, false, IDC_EXIT }, |
| 43 #endif |
| 42 { ui::VKEY_F, false, true, false, IDC_FIND }, | 44 { ui::VKEY_F, false, true, false, IDC_FIND }, |
| 43 { ui::VKEY_G, false, true, false, IDC_FIND_NEXT }, | 45 { ui::VKEY_G, false, true, false, IDC_FIND_NEXT }, |
| 44 #if !defined(OS_CHROMEOS) | 46 #if !defined(OS_CHROMEOS) |
| 45 { ui::VKEY_F3, false, false, false, IDC_FIND_NEXT }, | 47 { ui::VKEY_F3, false, false, false, IDC_FIND_NEXT }, |
| 46 #endif | 48 #endif |
| 47 { ui::VKEY_G, true, true, false, IDC_FIND_PREVIOUS }, | 49 { ui::VKEY_G, true, true, false, IDC_FIND_PREVIOUS }, |
| 48 #if !defined(OS_CHROMEOS) | 50 #if !defined(OS_CHROMEOS) |
| 49 { ui::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS }, | 51 { ui::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS }, |
| 50 #endif | 52 #endif |
| 51 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, | 162 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, |
| 161 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, | 163 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, |
| 162 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, | 164 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, |
| 163 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, | 165 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, |
| 164 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, | 166 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, |
| 165 }; | 167 }; |
| 166 | 168 |
| 167 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 169 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
| 168 | 170 |
| 169 } // namespace browser | 171 } // namespace browser |
| OLD | NEW |