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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1908683002: Replace OS_LEFT/RIGHT with META_LEFT/RIGHT (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/ui/blocked_content/popup_blocker_browsertest.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 dbab19f63042a9c67031e4c38e12c766a7df4d92..263ff680e0554ce239bdb02c48837a9eed8c8108 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -189,16 +189,16 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
// VKEY_LWIN (left Windows key), Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::META},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::META}},
// VKEY_RWIN (right Windows key), Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_RWIN, ui::DomCode::OS_RIGHT,
+ {ui::VKEY_RWIN, ui::DomCode::META_RIGHT,
ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::META},
- {ui::VKEY_RWIN, ui::DomCode::OS_RIGHT,
+ {ui::VKEY_RWIN, ui::DomCode::META_RIGHT,
ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::META}},
};
@@ -234,14 +234,14 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
// VKEY_LWIN (left Windows key), Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_LEFT,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ui::DomKey::CONTROL}},
// VKEY_RWIN (right Windows key), Alt modifier.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_RWIN, ui::DomCode::OS_RIGHT,
+ {ui::VKEY_RWIN, ui::DomCode::META_RIGHT,
ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_RIGHT,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ui::DomKey::CONTROL}},
@@ -287,7 +287,7 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControlWithControlRemapped) {
// VKEY_LWIN (left Command key) with Alt modifier. The remapped Command
// key should never be re-remapped to Alt.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_LEFT,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ui::DomKey::CONTROL}},
@@ -295,7 +295,7 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControlWithControlRemapped) {
// VKEY_RWIN (right Command key) with Alt modifier. The remapped Command
// key should never be re-remapped to Alt.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_RWIN, ui::DomCode::OS_RIGHT,
+ {ui::VKEY_RWIN, ui::DomCode::META_RIGHT,
ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_RIGHT,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ui::DomKey::CONTROL}},
@@ -552,8 +552,8 @@ TEST_F(EventRewriterTest, TestRewriteModifiersNoRemap) {
KeyTestCase tests[] = {
// Press Search. Confirm the event is not rewritten.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_NONE, ui::DomKey::META},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_NONE, ui::DomKey::META},
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_COMMAND_DOWN,
ui::DomKey::META}},
// Press left Control. Confirm the event is not rewritten.
@@ -585,8 +585,8 @@ TEST_F(EventRewriterTest, TestRewriteModifiersNoRemap) {
// Test KeyRelease event, just in case.
// Release Search. Confirm the release event is not rewritten.
{ui::ET_KEY_RELEASED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_NONE, ui::DomKey::META},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_NONE, ui::DomKey::META}},
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_NONE, ui::DomKey::META},
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_NONE, ui::DomKey::META}},
};
for (const auto& test : tests) {
@@ -610,16 +610,16 @@ 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::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_CAPS_LOCK_ON | ui::EF_COMMAND_DOWN, ui::DomKey::META},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_CAPS_LOCK_ON | ui::EF_COMMAND_DOWN, ui::DomKey::META}},
// 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_ON,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_CAPS_LOCK_ON,
ui::DomKey::META},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_CAPS_LOCK_ON,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_CAPS_LOCK_ON,
ui::DomKey::META}},
// Press Shift+Ctrl+Alt+Search+A. Confirm the event is not rewritten.
@@ -665,7 +665,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Press Search. Confirm the event is now VKEY_UNKNOWN.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_NONE, ui::DomKey::META},
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_NONE, ui::DomKey::META},
{ui::VKEY_UNKNOWN, ui::DomCode::NONE, ui::EF_NONE,
ui::DomKey::UNIDENTIFIED}},
@@ -679,7 +679,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Press Control+Search. Confirm the event is now VKEY_UNKNOWN
// without any modifiers.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_CONTROL_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_CONTROL_DOWN,
ui::DomKey::META},
{ui::VKEY_UNKNOWN, ui::DomCode::NONE, ui::EF_NONE,
ui::DomKey::UNIDENTIFIED}},
@@ -747,7 +747,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
KeyTestCase s_tests[] = {
// Press Search. Confirm the event is now VKEY_CONTROL.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_COMMAND_DOWN,
ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN,
ui::DomKey::CONTROL}},
@@ -771,14 +771,14 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
// Press Alt+Search. Confirm the event is now VKEY_CONTROL.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN, ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN,
ui::DomKey::CONTROL}},
// Press Control+Alt+Search. Confirm the event is now VKEY_CONTROL.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
ui::DomKey::META},
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN,
@@ -787,7 +787,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
// Press Shift+Control+Alt+Search. Confirm the event is now Control with
// Shift and Control modifiers.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::META},
@@ -825,7 +825,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToEscape) {
KeyTestCase tests[] = {
// Press Search. Confirm the event is now VKEY_ESCAPE.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_COMMAND_DOWN,
ui::DomKey::META},
{ui::VKEY_ESCAPE, ui::DomCode::ESCAPE, ui::EF_NONE, ui::DomKey::ESCAPE}},
};
@@ -850,7 +850,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
KeyTestCase s2a_tests[] = {
// Press Search. Confirm the event is now VKEY_MENU.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_COMMAND_DOWN,
ui::DomKey::META},
{ui::VKEY_MENU, ui::DomCode::ALT_LEFT, ui::EF_ALT_DOWN,
ui::DomKey::ALT}},
@@ -901,12 +901,12 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
{ui::ET_KEY_PRESSED,
{ui::VKEY_CONTROL, ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN,
ui::DomKey::CONTROL},
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT, ui::EF_COMMAND_DOWN,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT, ui::EF_COMMAND_DOWN,
ui::DomKey::META}},
// Then, press all of the three, Control+Alt+Search.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
ui::DomKey::META},
{ui::VKEY_MENU, ui::DomCode::ALT_LEFT,
@@ -915,7 +915,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Press Shift+Control+Alt+Search.
{ui::ET_KEY_PRESSED,
- {ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ {ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
ui::EF_COMMAND_DOWN,
ui::DomKey::META},
@@ -961,7 +961,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
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::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_COMMAND_DOWN, ui::DomKey::META));
// Confirm that the Caps Lock status is changed.
EXPECT_TRUE(ime_keyboard.caps_lock_is_enabled_);
@@ -971,7 +971,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
ui::DomCode::CAPS_LOCK, ui::EF_NONE,
ui::DomKey::CAPS_LOCK),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_RELEASED,
- ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_NONE, ui::DomKey::META));
// Confirm that the Caps Lock status is not changed.
EXPECT_TRUE(ime_keyboard.caps_lock_is_enabled_);
@@ -981,7 +981,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
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::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_COMMAND_DOWN | ui::EF_CAPS_LOCK_ON,
ui::DomKey::META));
// Confirm that the Caps Lock status is changed.
@@ -992,7 +992,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
ui::DomCode::CAPS_LOCK, ui::EF_NONE,
ui::DomKey::CAPS_LOCK),
GetRewrittenEventAsString(&rewriter, ui::ET_KEY_RELEASED,
- ui::VKEY_LWIN, ui::DomCode::OS_LEFT,
+ ui::VKEY_LWIN, ui::DomCode::META_LEFT,
ui::EF_NONE, ui::DomKey::META));
// Confirm that the Caps Lock status is not changed.
EXPECT_FALSE(ime_keyboard.caps_lock_is_enabled_);
@@ -2561,9 +2561,9 @@ TEST_F(StickyKeysOverlayTest, ModifiersDisabled) {
ui::DomKey::SHIFT);
SendActivateStickyKeyPattern(ui::VKEY_LMENU, ui::DomCode::ALT_LEFT,
ui::DomKey::ALT);
- SendActivateStickyKeyPattern(ui::VKEY_COMMAND, ui::DomCode::OS_LEFT,
+ SendActivateStickyKeyPattern(ui::VKEY_COMMAND, ui::DomCode::META_LEFT,
ui::DomKey::META);
- SendActivateStickyKeyPattern(ui::VKEY_COMMAND, ui::DomCode::OS_LEFT,
+ SendActivateStickyKeyPattern(ui::VKEY_COMMAND, ui::DomCode::META_LEFT,
ui::DomKey::META);
EXPECT_TRUE(overlay_->is_visible());
@@ -2587,7 +2587,7 @@ TEST_F(StickyKeysOverlayTest, ModifiersDisabled) {
ui::DomKey::ALT);
SendActivateStickyKeyPattern(ui::VKEY_LMENU, ui::DomCode::ALT_LEFT,
ui::DomKey::ALT);
- SendActivateStickyKeyPattern(ui::VKEY_COMMAND, ui::DomCode::OS_LEFT,
+ SendActivateStickyKeyPattern(ui::VKEY_COMMAND, ui::DomCode::META_LEFT,
ui::DomKey::META);
EXPECT_FALSE(overlay_->is_visible());
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698