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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments (Wez) Created 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc » ('j') | no next file with comments »
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..f233ff167f71449281acbef78840e528780f7432 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -169,23 +169,23 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
KeyTestCase pc_keyboard_tests[] = {
// VKEY_A, Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::UNIDENTIFIED},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::UNIDENTIFIED}},
// VKEY_A, Win modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_COMMAND_DOWN,
ui::DomKey::UNIDENTIFIED},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_COMMAND_DOWN,
ui::DomKey::UNIDENTIFIED}},
// VKEY_A, Alt+Win modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
ui::DomKey::UNIDENTIFIED},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
ui::DomKey::UNIDENTIFIED}},
// VKEY_LWIN (left Windows key), Alt modifier.
@@ -214,23 +214,23 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
KeyTestCase apple_keyboard_tests[] = {
// VKEY_A, Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::UNIDENTIFIED},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::UNIDENTIFIED}},
// VKEY_A, Win modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_COMMAND_DOWN,
ui::DomKey::UNIDENTIFIED},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character}},
// VKEY_A, Alt+Win modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
ui::DomKey::UNIDENTIFIED},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character}},
// VKEY_LWIN (left Windows key), Alt modifier.
@@ -625,11 +625,11 @@ TEST_F(EventRewriterTest, TestRewriteModifiersNoRemapMultipleKeys) {
// Press Shift+Ctrl+Alt+Search+A. Confirm the event is not rewritten.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_B, ui::DomCode::KEY_B,
+ {ui::VKEY_B, ui::DomCode::US_B,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'B'>::Character},
- {ui::VKEY_B, ui::DomCode::KEY_B,
+ {ui::VKEY_B, ui::DomCode::US_B,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'B'>::Character}},
@@ -688,17 +688,17 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Press Control+Search+a. Confirm the event is now VKEY_A without any
// modifiers.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_NONE,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character}},
// Press Control+Search+Alt+a. Confirm the event is now VKEY_A only with
// the Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::Constant<'a'>::Character}},
};
@@ -722,9 +722,9 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Press Alt+a. Confirm the event is now Control+a even though the Control
// key itself is disabled.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character}},
};
@@ -798,11 +798,11 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
// Press Shift+Control+Alt+Search+B. Confirm the event is now B with Shift
// and Control modifiers.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_B, ui::DomCode::KEY_B,
+ {ui::VKEY_B, ui::DomCode::US_B,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'B'>::Character},
- {ui::VKEY_B, ui::DomCode::KEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ {ui::VKEY_B, ui::DomCode::US_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'B'>::Character}},
};
@@ -927,11 +927,11 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Press Shift+Control+Alt+Search+B
{ui::ET_KEY_PRESSED,
- {ui::VKEY_B, ui::DomCode::KEY_B,
+ {ui::VKEY_B, ui::DomCode::US_B,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'B'>::Character},
- {ui::VKEY_B, ui::DomCode::KEY_B,
+ {ui::VKEY_B, ui::DomCode::US_B,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'B'>::Character}},
@@ -1083,9 +1083,9 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKey) {
// However, Mod2Mask should not be rewritten to CtrlMask when
// --has-chromeos-diamond-key is not specified.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_NONE,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_NONE,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character}},
};
@@ -1117,10 +1117,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Control is applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
// Release F15
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL,
@@ -1131,10 +1131,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Control is no longer applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
IntegerPrefMember diamond;
@@ -1149,10 +1149,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that no modifier is applied to another key.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
diamond.SetValue(chromeos::input_method::kControlKey);
@@ -1165,10 +1165,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Control is applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
// Release F15
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL,
@@ -1179,10 +1179,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Control is no longer applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
diamond.SetValue(chromeos::input_method::kAltKey);
@@ -1195,10 +1195,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Alt is applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_ALT_DOWN,
+ ui::DomCode::US_A, ui::EF_ALT_DOWN,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
// Release F15
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_RELEASED, ui::VKEY_MENU,
@@ -1209,10 +1209,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Alt is no longer applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
diamond.SetValue(chromeos::input_method::kCapsLockKey);
@@ -1226,11 +1226,11 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
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::DomCode::US_A,
ui::EF_CAPS_LOCK_DOWN | 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,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
// Release F15
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_RELEASED, ui::VKEY_CAPITAL,
@@ -1241,10 +1241,10 @@ TEST_F(EventRewriterTest, TestRewriteDiamondKeyWithFlag) {
ui::EF_NONE, ui::DomKey::F15));
// Check that Control is no longer applied to a subsequent key press.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
*base::CommandLine::ForCurrentProcess() = original_cl;
@@ -1266,25 +1266,25 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
// Press CapsLock+a. Confirm that Mod3Mask is rewritten to ControlMask.
// On Chrome OS, CapsLock works as a Mod3 modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_MOD3_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_MOD3_DOWN,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character}},
// Press Control+CapsLock+a. Confirm that Mod3Mask is rewritten to
// ControlMask
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN | ui::EF_MOD3_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN | ui::EF_MOD3_DOWN,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character}},
// Press Alt+CapsLock+a. Confirm that Mod3Mask is rewritten to
// ControlMask.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN | ui::EF_MOD3_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN | ui::EF_MOD3_DOWN,
ui::DomKey::Constant<'a'>::Character},
- {ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN,
+ {ui::VKEY_A, ui::DomCode::US_A, ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN,
ui::DomKey::Constant<'a'>::Character}},
};
@@ -1309,10 +1309,10 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
// Press CapsLock+a. Confirm that Mod3Mask is NOT rewritten to ControlMask
// when Mod3Mask is already in use by the current XKB layout.
EXPECT_EQ(GetExpectedResultAsString(ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_PRESSED, ui::VKEY_A,
- ui::DomCode::KEY_A, ui::EF_NONE,
+ ui::DomCode::US_A, ui::EF_NONE,
ui::DomKey::Constant<'a'>::Character));
input_method_manager_mock_->set_mod3_used(false);
@@ -2308,7 +2308,7 @@ TEST_F(EventRewriterAshTest, StickyKeyEventDispatchImpl) {
// Test key press event is correctly modified and modifier release
// event is sent.
- ui::KeyEvent press(ui::ET_KEY_PRESSED, ui::VKEY_C, ui::DomCode::KEY_C,
+ ui::KeyEvent press(ui::ET_KEY_PRESSED, ui::VKEY_C, ui::DomCode::US_C,
ui::EF_NONE, ui::DomKey::Constant<'c'>::Character,
ui::EventTimeForNow());
ui::EventDispatchDetails details = Send(&press);
@@ -2322,7 +2322,7 @@ TEST_F(EventRewriterAshTest, StickyKeyEventDispatchImpl) {
static_cast<ui::KeyEvent*>(events[1])->key_code());
// Test key release event is not modified.
- ui::KeyEvent release(ui::ET_KEY_RELEASED, ui::VKEY_C, ui::DomCode::KEY_C,
+ ui::KeyEvent release(ui::ET_KEY_RELEASED, ui::VKEY_C, ui::DomCode::US_C,
ui::EF_NONE, ui::DomKey::Constant<'c'>::Character,
ui::EventTimeForNow());
details = Send(&release);
@@ -2437,7 +2437,7 @@ TEST_F(StickyKeysOverlayTest, OneModifierEnabled) {
overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
// Pressing a normal key should hide overlay.
- SendActivateStickyKeyPattern(ui::VKEY_T, ui::DomCode::KEY_T,
+ SendActivateStickyKeyPattern(ui::VKEY_T, ui::DomCode::US_T,
ui::DomKey::Constant<'t'>::Character);
EXPECT_FALSE(overlay_->is_visible());
EXPECT_EQ(ash::STICKY_KEY_STATE_DISABLED,
@@ -2463,7 +2463,7 @@ TEST_F(StickyKeysOverlayTest, TwoModifiersEnabled) {
overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
// Pressing a normal key should hide overlay.
- SendActivateStickyKeyPattern(ui::VKEY_N, ui::DomCode::KEY_N,
+ SendActivateStickyKeyPattern(ui::VKEY_N, ui::DomCode::US_N,
ui::DomKey::Constant<'n'>::Character);
EXPECT_FALSE(overlay_->is_visible());
EXPECT_EQ(ash::STICKY_KEY_STATE_DISABLED,
@@ -2487,7 +2487,7 @@ TEST_F(StickyKeysOverlayTest, LockedModifier) {
overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
// Pressing a normal key should not hide overlay.
- SendActivateStickyKeyPattern(ui::VKEY_D, ui::DomCode::KEY_D,
+ SendActivateStickyKeyPattern(ui::VKEY_D, ui::DomCode::US_D,
ui::DomKey::Constant<'d'>::Character);
EXPECT_TRUE(overlay_->is_visible());
EXPECT_EQ(ash::STICKY_KEY_STATE_LOCKED,
@@ -2520,7 +2520,7 @@ TEST_F(StickyKeysOverlayTest, LockedAndNormalModifier) {
overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
// Pressing a normal key should not hide overlay but disable normal modifier.
- SendActivateStickyKeyPattern(ui::VKEY_D, ui::DomCode::KEY_D,
+ SendActivateStickyKeyPattern(ui::VKEY_D, ui::DomCode::US_D,
ui::DomKey::Constant<'d'>::Character);
EXPECT_TRUE(overlay_->is_visible());
EXPECT_EQ(ash::STICKY_KEY_STATE_LOCKED,
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698