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

Unified Diff: chrome/browser/chromeos/system_key_event_listener_browsertest.cc

Issue 9297027: (On behalf of yusukes) Handle Caps Lock short cut (Shift+Search) in ash [part 2 of 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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: chrome/browser/chromeos/system_key_event_listener_browsertest.cc
diff --git a/chrome/browser/chromeos/system_key_event_listener_browsertest.cc b/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
index fb116da0c13dbd07d16cbff24f68e64c0692a115..d6094fea3a35f3601c911ea540c40dfe4c83386b 100644
--- a/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
+++ b/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
@@ -27,6 +27,12 @@
#define TestKoreanInputMethod DISABLED_TestKoreanInputMethod
#endif
+#if defined(USE_AURA)
+// When Aura is in use, the shortcut is handled in Ash.
+#define TestCapsLock DISABLED_TestCapsLock
+#define TestCapsLockWithNumLock DISABLED_TestCapsLockWithNumLock
+#endif
+
namespace chromeos {
namespace {
« no previous file with comments | « chrome/browser/chromeos/system_key_event_listener.cc ('k') | chrome/browser/ui/views/aura/caps_lock_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698