| 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 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 | 10 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 37 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 38 CYCLE_BACKWARD_MRU }, | 38 CYCLE_BACKWARD_MRU }, |
| 39 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, | 39 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, |
| 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, | 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, |
| 41 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
| 42 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, | 42 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, |
| 43 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, | 43 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, |
| 44 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, | 44 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, |
| 45 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, | 45 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, |
| 46 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, | 46 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, |
| 47 { true, ui::VKEY_F4, ui::EF_NONE, TOGGLE_MAXIMIZED }, |
| 47 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, | 48 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, |
| 48 { true, ui::VKEY_F4, ui::EF_NONE, TOGGLE_MAXIMIZED }, | 49 { true, ui::VKEY_F4, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY }, |
| 49 { 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 }, |
| 50 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, | 51 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, |
| 51 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, | 52 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, |
| 52 #if !defined(NDEBUG) | 53 #if !defined(NDEBUG) |
| 53 // Extra shortcut for debug build to activate lock screen on linux desktop. | 54 // Extra shortcut for debug build to activate lock screen on linux desktop. |
| 54 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, | 55 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, |
| 56 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. |
| 57 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
| 58 SWAP_PRIMARY_DISPLAY }, |
| 55 #endif | 59 #endif |
| 56 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, | 60 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, |
| 57 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, | 61 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, |
| 58 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 62 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
| 59 #endif | 63 #endif |
| 60 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, | 64 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, |
| 61 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 65 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, |
| 62 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 66 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 63 TOGGLE_SPOKEN_FEEDBACK }, | 67 TOGGLE_SPOKEN_FEEDBACK }, |
| 64 | 68 |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 arraysize(kActionsAllowedAtLoginOrLockScreen); | 231 arraysize(kActionsAllowedAtLoginOrLockScreen); |
| 228 | 232 |
| 229 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 233 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
| 230 EXIT, | 234 EXIT, |
| 231 }; | 235 }; |
| 232 | 236 |
| 233 const size_t kActionsAllowedAtLockScreenLength = | 237 const size_t kActionsAllowedAtLockScreenLength = |
| 234 arraysize(kActionsAllowedAtLockScreen); | 238 arraysize(kActionsAllowedAtLockScreen); |
| 235 | 239 |
| 236 } // namespace ash | 240 } // namespace ash |
| OLD | NEW |