| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 PRINT_LAYER_HIERARCHY }, | 107 PRINT_LAYER_HIERARCHY }, |
| 108 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 108 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 109 PRINT_WINDOW_HIERARCHY }, | 109 PRINT_WINDOW_HIERARCHY }, |
| 110 // For testing on systems where Alt-Tab is already mapped. | 110 // For testing on systems where Alt-Tab is already mapped. |
| 111 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, | 111 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, |
| 112 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, | 112 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, |
| 113 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, MONITOR_CYCLE }, | 113 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, MONITOR_CYCLE }, |
| 114 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, MONITOR_ADD_REMOVE }, | 114 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, MONITOR_ADD_REMOVE }, |
| 115 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 115 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 116 MONITOR_TOGGLE_SCALE }, | 116 MONITOR_TOGGLE_SCALE }, |
| 117 { true, ui::VKEY_OEM_4, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, |
| 118 { true, ui::VKEY_OEM_6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT}, |
| 117 #endif | 119 #endif |
| 118 | 120 |
| 119 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, | 121 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, |
| 120 // VKEY_MEDIA_LAUNCH_MAIL, and VKEY_MEDIA_LAUNCH_APP2 (aka Calculator button). | 122 // VKEY_MEDIA_LAUNCH_MAIL, and VKEY_MEDIA_LAUNCH_APP2 (aka Calculator button). |
| 121 }; | 123 }; |
| 122 | 124 |
| 123 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); | 125 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); |
| 124 | 126 |
| 125 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { | 127 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { |
| 126 BRIGHTNESS_DOWN, | 128 BRIGHTNESS_DOWN, |
| (...skipping 23 matching lines...) Expand all Loading... |
| 150 arraysize(kActionsAllowedAtLoginOrLockScreen); | 152 arraysize(kActionsAllowedAtLoginOrLockScreen); |
| 151 | 153 |
| 152 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 154 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
| 153 EXIT, | 155 EXIT, |
| 154 }; | 156 }; |
| 155 | 157 |
| 156 const size_t kActionsAllowedAtLockScreenLength = | 158 const size_t kActionsAllowedAtLockScreenLength = |
| 157 arraysize(kActionsAllowedAtLockScreen); | 159 arraysize(kActionsAllowedAtLockScreen); |
| 158 | 160 |
| 159 } // namespace ash | 161 } // namespace ash |
| OLD | NEW |