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 "ash/accelerators/accelerator_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "ui/base/events.h" | 8 #include "ui/base/events.h" |
9 | 9 |
10 namespace ash { | 10 namespace ash { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, | 45 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, |
46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
47 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, | 47 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, |
48 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, | 48 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, |
49 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, | 49 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, |
50 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 50 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
51 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, | 51 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, |
52 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, | 52 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, |
53 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 53 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
54 #endif | 54 #endif |
| 55 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, |
55 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 56 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, |
56 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 57 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
57 TOGGLE_SPOKEN_FEEDBACK }, | 58 TOGGLE_SPOKEN_FEEDBACK }, |
58 | 59 |
59 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or | 60 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or |
60 // NEW_TAB, you also need to modify | 61 // NEW_TAB, you also need to modify |
61 // ToolbarView::GetAcceleratorForCommandId() in | 62 // ToolbarView::GetAcceleratorForCommandId() in |
62 // chrome/browser/ui/views/toolbar_view.cc. | 63 // chrome/browser/ui/views/toolbar_view.cc. |
63 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 64 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
64 NEW_INCOGNITO_WINDOW }, | 65 NEW_INCOGNITO_WINDOW }, |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 arraysize(kActionsAllowedAtLoginOrLockScreen); | 184 arraysize(kActionsAllowedAtLoginOrLockScreen); |
184 | 185 |
185 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 186 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
186 EXIT, | 187 EXIT, |
187 }; | 188 }; |
188 | 189 |
189 const size_t kActionsAllowedAtLockScreenLength = | 190 const size_t kActionsAllowedAtLockScreenLength = |
190 arraysize(kActionsAllowedAtLockScreen); | 191 arraysize(kActionsAllowedAtLockScreen); |
191 | 192 |
192 } // namespace ash | 193 } // namespace ash |
OLD | NEW |