chromeos: Remove F16 to CapsLock hack.
Historically, pressing CapsLock with an external keyboard on Chrome OS
generated F16 (XF86Launch7), in order to bypass limitation from the time
Chrome OS was still using X11. On Chrome side, F16 and CapsLock are
alerady treated as the same, and we can now remove handling of F16
completely.
XKB side change: https://crrev.com/c/1454437
TEST=manual (Confirmed an external keyboard CapsLock including remapping
keeps working with 1454437)
BUG=None
Change-Id: I99a18ffd99eec4b99a5e02031e52bd7693043f03
Reviewed-on: https://chromium-review.googlesource.com/c/1460215
Reviewed-by: Yusuke Sato <[email protected]>
Reviewed-by: Mitsuru Oshima <[email protected]>
Reviewed-by: Kevin Schoedel <[email protected]>
Commit-Queue: Tetsui Ohkubo <[email protected]>
Cr-Commit-Position: refs/heads/master@{#632062}diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index c7b1d1a4..dd1fb78 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -1276,21 +1276,21 @@
rewriter_->set_ime_keyboard_for_testing(&ime_keyboard);
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
- // On Chrome OS, CapsLock is mapped to F16 with Mod3Mask.
+ // On Chrome OS, CapsLock is mapped to CapsLock with Mod3Mask.
EXPECT_EQ(GetExpectedResultAsString(
ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL, ui::DomCode::CAPS_LOCK,
ui::EF_CAPS_LOCK_ON | ui::EF_MOD3_DOWN, ui::DomKey::CAPS_LOCK),
GetRewrittenEventAsString(rewriter_, ui::ET_KEY_PRESSED,
- ui::VKEY_F16, ui::DomCode::F16,
- ui::EF_MOD3_DOWN, ui::DomKey::F16));
+ ui::VKEY_CAPITAL, ui::DomCode::CAPS_LOCK,
+ ui::EF_MOD3_DOWN, ui::DomKey::CAPS_LOCK));
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_RELEASED, ui::VKEY_CAPITAL,
ui::DomCode::CAPS_LOCK, ui::EF_NONE,
ui::DomKey::CAPS_LOCK),
GetRewrittenEventAsString(rewriter_, ui::ET_KEY_RELEASED,
- ui::VKEY_F16, ui::DomCode::F16,
- ui::EF_MOD3_DOWN, ui::DomKey::F16));
+ ui::VKEY_CAPITAL, ui::DomCode::CAPS_LOCK,
+ ui::EF_MOD3_DOWN, ui::DomKey::CAPS_LOCK));
EXPECT_TRUE(ime_keyboard.caps_lock_is_enabled_);
// Remap Caps Lock to Control.
@@ -1314,22 +1314,6 @@
GetRewrittenEventAsString(rewriter_, ui::ET_KEY_RELEASED,
ui::VKEY_CAPITAL, ui::DomCode::CAPS_LOCK,
ui::EF_NONE, ui::DomKey::CAPS_LOCK));
-
- // Press F16.
- EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL,
- ui::DomCode::CONTROL_LEFT,
- ui::EF_CONTROL_DOWN, ui::DomKey::CONTROL),
- GetRewrittenEventAsString(rewriter_, ui::ET_KEY_PRESSED,
- ui::VKEY_F16, ui::DomCode::F16,
- ui::EF_MOD3_DOWN, ui::DomKey::F16));
-
- // Release F16.
- EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL,
- ui::DomCode::CONTROL_LEFT, ui::EF_NONE,
- ui::DomKey::CONTROL),
- GetRewrittenEventAsString(rewriter_, ui::ET_KEY_RELEASED,
- ui::VKEY_F16, ui::DomCode::F16,
- ui::EF_MOD3_DOWN, ui::DomKey::F16));
}
TEST_F(EventRewriterTest, TestRewriteDiamondKey) {
