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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 35a60ae5e3f6f572acd0545ca283cace2a4f7991..bd50541879028df7a0748a1462a0f5236de45988 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -253,4 +253,41 @@ const AcceleratorAction kActionsAllowedAtLockScreen[] = {
const size_t kActionsAllowedAtLockScreenLength =
arraysize(kActionsAllowedAtLockScreen);
+const AcceleratorAction kActionsAllowedAtModalWindow[] = {
+ BRIGHTNESS_DOWN,
+ BRIGHTNESS_UP,
+ DISABLE_CAPS_LOCK,
+ EXIT,
+ KEYBOARD_BRIGHTNESS_DOWN,
+ KEYBOARD_BRIGHTNESS_UP,
+ MAGNIFY_SCREEN_ZOOM_IN,
+ MAGNIFY_SCREEN_ZOOM_OUT,
+ MEDIA_NEXT_TRACK,
+ MEDIA_PLAY_PAUSE,
+ MEDIA_PREV_TRACK,
+ NEXT_IME,
+ OPEN_FEEDBACK_PAGE,
+ POWER_PRESSED,
+ POWER_RELEASED,
+ PREVIOUS_IME,
+ SHOW_KEYBOARD_OVERLAY,
+ SWAP_PRIMARY_DISPLAY,
+ SWITCH_IME,
+ TAKE_SCREENSHOT,
+ TAKE_PARTIAL_SCREENSHOT,
+ TOGGLE_CAPS_LOCK,
+ TOGGLE_SPOKEN_FEEDBACK,
+ TOGGLE_WIFI,
+ VOLUME_DOWN,
+ VOLUME_MUTE,
+ VOLUME_UP,
+#if defined(OS_CHROMEOS)
+ CYCLE_DISPLAY_MODE,
+ LOCK_SCREEN,
+#endif
+};
+
+const size_t kActionsAllowedAtModalWindowLength =
+ arraysize(kActionsAllowedAtModalWindow);
+
} // namespace ash
« 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