Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 10388230: Allow Control+Shift+Q on lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 121 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
122 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, MONITOR_ADD_REMOVE }, 122 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, MONITOR_ADD_REMOVE },
123 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, MONITOR_CYCLE }, 123 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, MONITOR_CYCLE },
124 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 124 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
125 MONITOR_TOGGLE_SCALE }, 125 MONITOR_TOGGLE_SCALE },
126 #endif 126 #endif
127 }; 127 };
128 128
129 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 129 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
130 130
131 const AcceleratorAction kActionsAllowedAtLoginScreen[] = { 131 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
132 BRIGHTNESS_DOWN, 132 BRIGHTNESS_DOWN,
133 BRIGHTNESS_UP, 133 BRIGHTNESS_UP,
134 NEXT_IME, 134 NEXT_IME,
135 PREVIOUS_IME, 135 PREVIOUS_IME,
136 SWITCH_IME, // Switch to another IME depending on the accelerator. 136 SWITCH_IME, // Switch to another IME depending on the accelerator.
137 TAKE_SCREENSHOT, 137 TAKE_SCREENSHOT,
138 TAKE_PARTIAL_SCREENSHOT, 138 TAKE_PARTIAL_SCREENSHOT,
139 TOGGLE_CAPS_LOCK, 139 TOGGLE_CAPS_LOCK,
140 TOGGLE_SPOKEN_FEEDBACK, 140 TOGGLE_SPOKEN_FEEDBACK,
141 VOLUME_DOWN, 141 VOLUME_DOWN,
142 VOLUME_MUTE, 142 VOLUME_MUTE,
143 VOLUME_UP, 143 VOLUME_UP,
144 ROTATE_WINDOWS, 144 ROTATE_WINDOWS,
145 #if !defined(NDEBUG) 145 #if !defined(NDEBUG)
146 PRINT_LAYER_HIERARCHY, 146 PRINT_LAYER_HIERARCHY,
147 PRINT_WINDOW_HIERARCHY, 147 PRINT_WINDOW_HIERARCHY,
148 ROTATE_SCREEN, 148 ROTATE_SCREEN,
149 #endif 149 #endif
150 }; 150 };
151 151
152 const size_t kActionsAllowedAtLoginScreenLength = 152 const size_t kActionsAllowedAtLoginOrLockScreenLength =
153 arraysize(kActionsAllowedAtLoginScreen); 153 arraysize(kActionsAllowedAtLoginOrLockScreen);
154
155 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
156 EXIT,
157 };
158
159 const size_t kActionsAllowedAtLockScreenLength =
160 arraysize(kActionsAllowedAtLockScreen);
154 161
155 } // namespace ash 162 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698