Chromium Code Reviews| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 51 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 52 TAKE_PARTIAL_SCREENSHOT }, | 52 TAKE_PARTIAL_SCREENSHOT }, |
| 53 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, | 53 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, |
| 54 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN }, | 54 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN }, |
| 55 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, | 55 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, |
| 56 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, | 56 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, |
| 57 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 57 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 58 MAGNIFY_SCREEN_ZOOM_OUT}, | 58 MAGNIFY_SCREEN_ZOOM_OUT}, |
| 59 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 59 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 60 MAGNIFY_SCREEN_ZOOM_IN}, | 60 MAGNIFY_SCREEN_ZOOM_IN}, |
| 61 #if !defined(NDEBUG) | |
|
sky
2012/12/04 22:25:04
Can you move this with the other !NDEBUG section @
yoshiki
2012/12/05 02:00:06
Done.
| |
| 62 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT}, | |
| 63 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, | |
| 64 #endif // !defined(NDEBUG) | |
| 61 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 65 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
| 62 // The lock key on Chrome OS keyboards produces F13 scancodes. | 66 // The lock key on Chrome OS keyboards produces F13 scancodes. |
| 63 { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED }, | 67 { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED }, |
| 64 { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED }, | 68 { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED }, |
| 65 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, | 69 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, |
| 66 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, | 70 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, |
| 67 #if !defined(NDEBUG) | 71 #if !defined(NDEBUG) |
| 68 // Extra shortcut for debug build to activate lock screen on linux desktop. | 72 // Extra shortcut for debug build to activate lock screen on linux desktop. |
| 69 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, | 73 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, |
| 70 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. | 74 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 279 CYCLE_BACKWARD_MRU, | 283 CYCLE_BACKWARD_MRU, |
| 280 CYCLE_FORWARD_LINEAR, | 284 CYCLE_FORWARD_LINEAR, |
| 281 CYCLE_FORWARD_MRU, | 285 CYCLE_FORWARD_MRU, |
| 282 TOGGLE_MAXIMIZED, | 286 TOGGLE_MAXIMIZED, |
| 283 }; | 287 }; |
| 284 | 288 |
| 285 const size_t kNonrepeatableActionsLength = | 289 const size_t kNonrepeatableActionsLength = |
| 286 arraysize(kNonrepeatableActions); | 290 arraysize(kNonrepeatableActions); |
| 287 | 291 |
| 288 } // namespace ash | 292 } // namespace ash |
| OLD | NEW |