| 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 // Extra shortcut for debug build to control magnifier on linux desktop. | 180 // Extra shortcut for debug build to control magnifier on linux desktop. |
| 181 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, | 181 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, |
| 182 MAGNIFY_SCREEN_ZOOM_OUT}, | 182 MAGNIFY_SCREEN_ZOOM_OUT}, |
| 183 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, | 183 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, |
| 184 // Extra shortcuts to lock the screen on linux desktop. | 184 // Extra shortcuts to lock the screen on linux desktop. |
| 185 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, | 185 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, |
| 186 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, | 186 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, |
| 187 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, | 187 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, |
| 188 { true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | 188 { true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
| 189 ADD_REMOVE_DISPLAY }, | 189 ADD_REMOVE_DISPLAY }, |
| 190 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
| 191 TOGGLE_MIRROR_MODE }, |
| 190 #endif | 192 #endif |
| 191 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. | 193 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. |
| 192 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 194 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 193 SWAP_PRIMARY_DISPLAY }, | 195 SWAP_PRIMARY_DISPLAY }, |
| 194 // Extra shortcut to rotate/scale up/down the screen on linux desktop. | 196 // Extra shortcut to rotate/scale up/down the screen on linux desktop. |
| 195 { true, ui::VKEY_R, | 197 { true, ui::VKEY_R, |
| 196 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN }, | 198 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN }, |
| 197 // For testing on systems where Alt-Tab is already mapped. | 199 // For testing on systems where Alt-Tab is already mapped. |
| 198 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, | 200 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, |
| 199 | 201 |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 ADD_REMOVE_DISPLAY, | 402 ADD_REMOVE_DISPLAY, |
| 401 DISABLE_GPU_WATCHDOG, | 403 DISABLE_GPU_WATCHDOG, |
| 402 TOGGLE_MIRROR_MODE, | 404 TOGGLE_MIRROR_MODE, |
| 403 #endif // defined(OS_CHROMEOS) | 405 #endif // defined(OS_CHROMEOS) |
| 404 }; | 406 }; |
| 405 | 407 |
| 406 const size_t kActionsAllowedInAppModeLength = | 408 const size_t kActionsAllowedInAppModeLength = |
| 407 arraysize(kActionsAllowedInAppMode); | 409 arraysize(kActionsAllowedInAppMode); |
| 408 | 410 |
| 409 } // namespace ash | 411 } // namespace ash |
| OLD | NEW |