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

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: impl. of review comments 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
« 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 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 const size_t kActionsAllowedAtLoginOrLockScreenLength = 246 const size_t kActionsAllowedAtLoginOrLockScreenLength =
247 arraysize(kActionsAllowedAtLoginOrLockScreen); 247 arraysize(kActionsAllowedAtLoginOrLockScreen);
248 248
249 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 249 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
250 EXIT, 250 EXIT,
251 }; 251 };
252 252
253 const size_t kActionsAllowedAtLockScreenLength = 253 const size_t kActionsAllowedAtLockScreenLength =
254 arraysize(kActionsAllowedAtLockScreen); 254 arraysize(kActionsAllowedAtLockScreen);
255 255
256 const AcceleratorAction kActionsAllowedAtModalWindow[] = {
257 BRIGHTNESS_DOWN,
258 BRIGHTNESS_UP,
259 DISABLE_CAPS_LOCK,
260 EXIT,
261 KEYBOARD_BRIGHTNESS_DOWN,
262 KEYBOARD_BRIGHTNESS_UP,
263 MAGNIFY_SCREEN_ZOOM_IN,
264 MAGNIFY_SCREEN_ZOOM_OUT,
265 MEDIA_NEXT_TRACK,
266 MEDIA_PLAY_PAUSE,
267 MEDIA_PREV_TRACK,
268 NEXT_IME,
269 OPEN_FEEDBACK_PAGE,
270 POWER_PRESSED,
271 POWER_RELEASED,
272 PREVIOUS_IME,
273 SHOW_KEYBOARD_OVERLAY,
274 SWAP_PRIMARY_DISPLAY,
275 SWITCH_IME,
276 TAKE_SCREENSHOT,
277 TAKE_PARTIAL_SCREENSHOT,
278 TOGGLE_CAPS_LOCK,
279 TOGGLE_SPOKEN_FEEDBACK,
280 TOGGLE_WIFI,
281 VOLUME_DOWN,
282 VOLUME_MUTE,
283 VOLUME_UP,
284 #if defined(OS_CHROMEOS)
285 CYCLE_DISPLAY_MODE,
286 LOCK_SCREEN,
287 #endif
288 };
289
290 const size_t kActionsAllowedAtModalWindowLength =
291 arraysize(kActionsAllowedAtModalWindow);
292
256 } // namespace ash 293 } // 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