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

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

Issue 10977088: Fix for Ash shortcuts unexpectedly working in system model dialog (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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
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 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 const size_t kActionsAllowedAtLoginOrLockScreenLength = 221 const size_t kActionsAllowedAtLoginOrLockScreenLength =
222 arraysize(kActionsAllowedAtLoginOrLockScreen); 222 arraysize(kActionsAllowedAtLoginOrLockScreen);
223 223
224 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 224 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
225 EXIT, 225 EXIT,
226 }; 226 };
227 227
228 const size_t kActionsAllowedAtLockScreenLength = 228 const size_t kActionsAllowedAtLockScreenLength =
229 arraysize(kActionsAllowedAtLockScreen); 229 arraysize(kActionsAllowedAtLockScreen);
230 230
231 const AcceleratorAction kActionsAllowedAtModalWindow[] = {
Yusuke Sato 2012/09/29 00:54:33 I'm wondering if it's okay to omit OPEN_FEEDBACK_P
sschmitz 2012/10/15 23:50:34 I experimented with this and talked to kuscher@. I
232 BRIGHTNESS_DOWN,
233 BRIGHTNESS_UP,
234 DISABLE_CAPS_LOCK,
235 EXIT,
236 KEYBOARD_BRIGHTNESS_DOWN,
237 KEYBOARD_BRIGHTNESS_UP,
238 MAGNIFY_SCREEN_ZOOM_IN,
239 MAGNIFY_SCREEN_ZOOM_OUT,
240 MEDIA_NEXT_TRACK,
241 MEDIA_PLAY_PAUSE,
242 MEDIA_PREV_TRACK,
243 NEXT_IME,
244 PREVIOUS_IME,
245 POWER_PRESSED,
246 POWER_RELEASED,
247 PREVIOUS_IME,
248 SHOW_KEYBOARD_OVERLAY,
Yusuke Sato 2012/09/29 00:54:33 does this work fine when a modal window is up? ple
sschmitz 2012/10/15 23:50:34 Yes, it works. Done.
249 SWAP_PRIMARY_DISPLAY,
Yusuke Sato 2012/09/29 00:54:33 please also check if this works fine (you might ne
sschmitz 2012/10/15 23:50:34 Yes, it works. Done.
250 SWITCH_IME,
251 TAKE_SCREENSHOT,
252 TAKE_PARTIAL_SCREENSHOT,
253 TOGGLE_CAPS_LOCK,
254 TOGGLE_SPOKEN_FEEDBACK,
255 TOGGLE_WIFI,
256 VOLUME_DOWN,
257 VOLUME_MUTE,
258 VOLUME_UP,
259 #if defined(OS_CHROMEOS)
260 CYCLE_DISPLAY_MODE,
Yusuke Sato 2012/09/29 00:54:33 the same.
sschmitz 2012/10/15 23:50:34 Yes, this works. Done.
261 LOCK_SCREEN,
262 #endif
263 };
264
265 const size_t kActionsAllowedAtModalWindowLength =
266 arraysize(kActionsAllowedAtModalWindow);
267
231 } // namespace ash 268 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698