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

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

Issue 8744009: Do not execute IME tests when USE_VIRTUAL_KEYBOARD is defined (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 06047468d655fa339fbf0de4bc8e2d5af3081565..6bc07d760900ba26bdb95a066b521421828ba524 100644
--- a/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
+++ b/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
@@ -17,15 +17,25 @@
#include <X11/Xlib.h> // should be here since it #defines lots of macros.
+#if defined(USE_VIRTUAL_KEYBOARD)
+// Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
+// skip the tests for now.
+#define TestInputMethod DISABLED_TestInputMethod
+#define TestInputMethodWithNumLock DISABLED_TestInputMethodWithNumLock
+#define TestKoreanInputMethod DISABLED_TestKoreanInputMethod
+#endif
+
namespace chromeos {
namespace {
static const char* active_input_methods[] = {
"xkb:us::eng", // The first one should be US Qwerty.
+#if !defined(USE_VIRTUAL_KEYBOARD)
"xkb:us:dvorak:eng",
"xkb:kr:kr104:kor", // for testing XK_space with ShiftMask.
// TODO(yusukes): Add "mozc-jp", "xkb:jp::jpn", and "mozc-hangul" to test
// more IME hot keys once build bots start supporting ibus-daemon.
+#endif
};
class CapsLockObserver : public SystemKeyEventListener::CapsLockObserver {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698