| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, | 49 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, |
| 50 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, | 50 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, |
| 51 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, | 51 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, |
| 52 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 52 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
| 53 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, | 53 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, |
| 54 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, | 54 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, |
| 55 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 55 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
| 56 #endif | 56 #endif |
| 57 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, |
| 57 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 58 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, |
| 58 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 59 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 59 TOGGLE_SPOKEN_FEEDBACK }, | 60 TOGGLE_SPOKEN_FEEDBACK }, |
| 60 | 61 |
| 61 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or | 62 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or |
| 62 // NEW_TAB, you also need to modify | 63 // NEW_TAB, you also need to modify |
| 63 // ToolbarView::GetAcceleratorForCommandId() in | 64 // ToolbarView::GetAcceleratorForCommandId() in |
| 64 // chrome/browser/ui/views/toolbar_view.cc. | 65 // chrome/browser/ui/views/toolbar_view.cc. |
| 65 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 66 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 66 NEW_INCOGNITO_WINDOW }, | 67 NEW_INCOGNITO_WINDOW }, |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 arraysize(kActionsAllowedAtLoginOrLockScreen); | 186 arraysize(kActionsAllowedAtLoginOrLockScreen); |
| 186 | 187 |
| 187 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 188 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
| 188 EXIT, | 189 EXIT, |
| 189 }; | 190 }; |
| 190 | 191 |
| 191 const size_t kActionsAllowedAtLockScreenLength = | 192 const size_t kActionsAllowedAtLockScreenLength = |
| 192 arraysize(kActionsAllowedAtLockScreen); | 193 arraysize(kActionsAllowedAtLockScreen); |
| 193 | 194 |
| 194 } // namespace ash | 195 } // namespace ash |
| OLD | NEW |