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

Unified Diff: chrome/browser/ui/ash/event_rewriter_unittest.cc

Issue 23866008: Allow remapping Search/Ctrl/Alt to Esc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/ui/ash/event_rewriter.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/event_rewriter_unittest.cc
diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc
index 26b442e07346421aa8819f43e3a7b8c791fe9de5..d24774f1fe9baee7656cd9e6c8b230bfdc2fa4ac 100644
--- a/chrome/browser/ui/ash/event_rewriter_unittest.cc
+++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc
@@ -118,6 +118,7 @@ class EventRewriterTest : public testing::Test {
keycode_next_(XKeysymToKeycode(display_, XK_Next)),
keycode_home_(XKeysymToKeycode(display_, XK_Home)),
keycode_end_(XKeysymToKeycode(display_, XK_End)),
+ keycode_escape_(XKeysymToKeycode(display_, XK_Escape)),
keycode_launch6_(XKeysymToKeycode(display_, XF86XK_Launch6)),
keycode_launch7_(XKeysymToKeycode(display_, XF86XK_Launch7)),
keycode_f1_(XKeysymToKeycode(display_, XK_F1)),
@@ -231,6 +232,7 @@ class EventRewriterTest : public testing::Test {
const KeyCode keycode_next_;
const KeyCode keycode_home_;
const KeyCode keycode_end_;
+ const KeyCode keycode_escape_;
const KeyCode keycode_launch6_; // F15
const KeyCode keycode_launch7_; // F16
const KeyCode keycode_f1_;
@@ -1379,6 +1381,32 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
ShiftMask | ControlMask | Mod1Mask));
}
+TEST_F(EventRewriterTest, TestRewriteModifiersRemapToEscape) {
+ // Remap Search to ESC.
+ TestingPrefServiceSyncable prefs;
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
+ IntegerPrefMember search;
+ search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
+ search.SetValue(chromeos::input_method::kEscapeKey);
+
+ EventRewriter rewriter;
+ rewriter.set_pref_service_for_testing(&prefs);
+
+ // Press Search. Confirm the event is now VKEY_ESCAPE.
+ EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_ESCAPE,
+ ui::EF_NONE,
+ ui::ET_KEY_PRESSED,
+ keycode_escape_,
+ 0U,
+ KeyPress),
+ GetRewrittenEventAsString(&rewriter,
+ ui::VKEY_LWIN,
+ 0,
+ ui::ET_KEY_PRESSED,
+ keycode_super_l_,
+ 0U));
+}
+
TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Remap Search to Alt.
TestingPrefServiceSyncable prefs;
« no previous file with comments | « chrome/browser/ui/ash/event_rewriter.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698