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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 1559163002: Clean up event flags a bit: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fix Created 4 years, 12 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/chromeos/events/event_rewriter.cc ('k') | chrome/browser/chromeos/input_method/input_method_engine.cc » ('j') | ui/content_accelerators/accelerator_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index 3723eddfa54bdc36f6ed38241fa1b2ebd03c7ac7..0da5417fe27836ff01205c473599f7c5899981a0 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -612,15 +612,15 @@ TEST_F(EventRewriterTest, TestRewriteModifiersNoRemapMultipleKeys) {
// Press Search with Caps Lock mask. Confirm the event is not rewritten.
{ui::ET_KEY_PRESSED,
{ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::OS},
+ ui::EF_CAPS_LOCK_ON | ui::EF_COMMAND_DOWN, ui::DomKey::OS},
{ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::OS}},
+ ui::EF_CAPS_LOCK_ON | ui::EF_COMMAND_DOWN, ui::DomKey::OS}},
// Release Search with Caps Lock mask. Confirm the event is not rewritten.
{ui::ET_KEY_RELEASED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_CAPS_LOCK_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_CAPS_LOCK_ON,
ui::DomKey::OS},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_CAPS_LOCK_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_CAPS_LOCK_ON,
ui::DomKey::OS}},
// Press Shift+Ctrl+Alt+Search+A. Confirm the event is not rewritten.
@@ -958,10 +958,9 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
// Press Search.
- EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL,
- ui::DomCode::CAPS_LOCK,
- ui::EF_MOD3_DOWN | ui::EF_CAPS_LOCK_DOWN,
- ui::DomKey::CAPS_LOCK),
+ EXPECT_EQ(GetExpectedResultAsString(
+ ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL, ui::DomCode::CAPS_LOCK,
+ ui::EF_MOD3_DOWN | ui::EF_CAPS_LOCK_ON, ui::DomKey::CAPS_LOCK),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED,
ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
ui::EF_COMMAND_DOWN, ui::DomKey::OS));
@@ -979,13 +978,13 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
EXPECT_TRUE(ime_keyboard.caps_lock_is_enabled_);
// Press Search.
- EXPECT_EQ(
- GetExpectedResultAsString(
- ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL, ui::DomCode::CAPS_LOCK,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN, ui::DomKey::CAPS_LOCK),
- GetRewrittenEventAsString(
- &rewriter, ui::ET_KEY_PRESSED, ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
- ui::EF_COMMAND_DOWN | ui::EF_CAPS_LOCK_DOWN, ui::DomKey::OS));
+ 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_LWIN, ui::DomCode::OS_LEFT,
+ ui::EF_COMMAND_DOWN | ui::EF_CAPS_LOCK_ON,
+ ui::DomKey::OS));
// Confirm that the Caps Lock status is changed.
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
@@ -1000,13 +999,12 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
// Press Caps Lock (on an external keyboard).
- EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL,
- ui::DomCode::CAPS_LOCK,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
- ui::DomKey::CAPS_LOCK),
+ 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_CAPITAL, ui::DomCode::CAPS_LOCK,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
+ ui::EF_CAPS_LOCK_ON | ui::EF_MOD3_DOWN,
ui::DomKey::CAPS_LOCK));
#if defined(USE_X11)
@@ -1047,10 +1045,9 @@ TEST_F(EventRewriterTest, TestRewriteCapsLock) {
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
// On Chrome OS, CapsLock is mapped to F16 with Mod3Mask.
- EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL,
- ui::DomCode::CAPS_LOCK,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
- ui::DomKey::CAPS_LOCK),
+ 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));
@@ -1217,17 +1214,16 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
diamond.SetValue(chromeos::input_method::kCapsLockKey);
- EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_CAPITAL,
- ui::DomCode::CAPS_LOCK,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
- ui::DomKey::CAPS_LOCK),
+ 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_F15, ui::DomCode::F15,
ui::EF_NONE, ui::DomKey::F15));
// Check that Caps is applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
ui::DomCode::KEY_A,
- ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
+ ui::EF_CAPS_LOCK_ON | ui::EF_MOD3_DOWN,
ui::DomKey::Constant<'A'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
ui::DomCode::KEY_A, ui::EF_NONE,
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | chrome/browser/chromeos/input_method/input_method_engine.cc » ('j') | ui/content_accelerators/accelerator_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698