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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/client/normalizing_input_filter_mac_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 | « remoting/client/normalizing_input_filter_mac.cc ('k') | remoting/host/input_injector_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/normalizing_input_filter_mac_unittest.cc
diff --git a/remoting/client/normalizing_input_filter_mac_unittest.cc b/remoting/client/normalizing_input_filter_mac_unittest.cc
index a1f86afc4935fa3a83fefbaa12df9f92e016eaea..8d6a0b38c761f19483a14676e042b786c5c107e2 100644
--- a/remoting/client/normalizing_input_filter_mac_unittest.cc
+++ b/remoting/client/normalizing_input_filter_mac_unittest.cc
@@ -85,27 +85,27 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
// Left command key.
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, true)));
+ ui::DomCode::META_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, false)));
+ ui::DomCode::META_LEFT, false)));
// Right command key.
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, true)));
+ ui::DomCode::META_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, false)));
+ ui::DomCode::META_RIGHT, false)));
// More than one keys after CMD.
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, true)));
+ ui::DomCode::META_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
@@ -115,24 +115,24 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_V, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, false)));
+ ui::DomCode::META_RIGHT, false)));
}
// Left command key.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
// Right command key.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, false));
// More than one keys after CMD.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_V, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, false));
}
// Test pressing command and special keys.
@@ -146,35 +146,35 @@ TEST(NormalizingInputFilterMacTest, SpecialKeys) {
// Command + Shift.
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, true)));
+ ui::DomCode::META_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::SHIFT_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, false)));
+ ui::DomCode::META_LEFT, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::SHIFT_LEFT, false)));
// Command + Option.
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, true)));
+ ui::DomCode::META_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::ALT_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, false)));
+ ui::DomCode::META_LEFT, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::ALT_LEFT, false)));
}
// Command + Shift.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::SHIFT_LEFT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::SHIFT_LEFT, false));
// Command + Option.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::ALT_LEFT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::ALT_LEFT, false));
}
@@ -188,23 +188,23 @@ TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
InSequence s;
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, true)));
+ ui::DomCode::META_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, true)));
+ ui::DomCode::META_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_LEFT, false)));
+ ui::DomCode::META_LEFT, false)));
}
// Test multiple CMD keys at the same time.
// L CMD Down, C Down, R CMD Down, L CMD Up.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
}
// Test press C key before command key.
@@ -219,19 +219,19 @@ TEST(NormalizingInputFilterMacTest, BeforeCmdKey) {
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, true)));
+ ui::DomCode::META_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::OS_RIGHT, false)));
+ ui::DomCode::META_RIGHT, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::US_C, false)));
}
// Press C before command key.
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, false));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false));
}
« no previous file with comments | « remoting/client/normalizing_input_filter_mac.cc ('k') | remoting/host/input_injector_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698