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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/client/normalizing_input_filter_mac_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 | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | remoting/test/app_remoting_latency_test_fixture.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 9c637e5f15b9766d43d4c7b209787f38b03d81e2..ce5ff53de2755d8a52dbad5a56ac552fe22bac90 100644
--- a/remoting/client/normalizing_input_filter_mac_unittest.cc
+++ b/remoting/client/normalizing_input_filter_mac_unittest.cc
@@ -64,14 +64,14 @@ TEST(NormalizingInputFilterMacTest, NoInjection) {
InSequence s;
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, true)));
+ ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
}
// C Down and C Up.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false));
}
// Test pressing command key and other normal keys.
@@ -87,9 +87,9 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, true)));
+ ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_LEFT, false)));
@@ -97,9 +97,9 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, true)));
+ ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, false)));
@@ -107,31 +107,31 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, true)));
+ ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_V, true)));
+ ui::DomCode::US_V, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_V, false)));
+ ui::DomCode::US_V, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, false)));
}
// Left command key.
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
// Right command key.
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
// More than one keys after CMD.
processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_V, 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));
}
@@ -190,11 +190,11 @@ TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_LEFT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, true)));
+ ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_LEFT, false)));
}
@@ -202,7 +202,7 @@ TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
// 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::KEY_C, 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));
}
@@ -217,22 +217,22 @@ TEST(NormalizingInputFilterMacTest, BeforeCmdKey) {
InSequence s;
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, true)));
+ ui::DomCode::US_C, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, true)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
ui::DomCode::OS_RIGHT, false)));
EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
- ui::DomCode::KEY_C, false)));
+ ui::DomCode::US_C, false)));
}
// Press C before command key.
- processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+ 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::KEY_C, false));
+ processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false));
}
} // namespace remoting
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | remoting/test/app_remoting_latency_test_fixture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698