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

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: Created 8 years, 3 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
Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index ce399d774bd988c1c9d9e7e2eb4e396aeaff9f3b..502d5ff3bd5e46045c76678aa2c5ed83205a1c7a 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -228,4 +228,41 @@ const AcceleratorAction kActionsAllowedAtLockScreen[] = {
const size_t kActionsAllowedAtLockScreenLength =
arraysize(kActionsAllowedAtLockScreen);
+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
+ 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,
+ PREVIOUS_IME,
+ POWER_PRESSED,
+ POWER_RELEASED,
+ PREVIOUS_IME,
+ 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.
+ 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.
+ 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,
Yusuke Sato 2012/09/29 00:54:33 the same.
sschmitz 2012/10/15 23:50:34 Yes, this works. Done.
+ LOCK_SCREEN,
+#endif
+};
+
+const size_t kActionsAllowedAtModalWindowLength =
+ arraysize(kActionsAllowedAtModalWindow);
+
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698