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

Unified Diff: ui/events/ozone/layout/keyboard_layout_engine_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 | « ui/events/ozone/evdev/keyboard_evdev.cc ('k') | ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/layout/keyboard_layout_engine_unittest.cc
diff --git a/ui/events/ozone/layout/keyboard_layout_engine_unittest.cc b/ui/events/ozone/layout/keyboard_layout_engine_unittest.cc
index 2ae211c462ea28036cff6276f1064919a13b508e..b897550d59031aa6fb6b8b4b6741ae806105c456 100644
--- a/ui/events/ozone/layout/keyboard_layout_engine_unittest.cc
+++ b/ui/events/ozone/layout/keyboard_layout_engine_unittest.cc
@@ -185,10 +185,10 @@ void TestLookup(const char* name, KeyboardLayoutEngine* engine) {
KeyboardCode output_keycode;
base::char16 output_character;
} kTestCases[] = {
- {DomCode::KEY_A, EF_NONE, DomKey::Constant<'a'>::Character, VKEY_A, 'a'},
- {DomCode::KEY_A, EF_SHIFT_DOWN, DomKey::Constant<'A'>::Character, VKEY_A,
+ {DomCode::US_A, EF_NONE, DomKey::Constant<'a'>::Character, VKEY_A, 'a'},
+ {DomCode::US_A, EF_SHIFT_DOWN, DomKey::Constant<'A'>::Character, VKEY_A,
'A'},
- {DomCode::KEY_A, EF_CONTROL_DOWN, DomKey::Constant<'a'>::Character,
+ {DomCode::US_A, EF_CONTROL_DOWN, DomKey::Constant<'a'>::Character,
VKEY_A, 1},
};
« no previous file with comments | « ui/events/ozone/evdev/keyboard_evdev.cc ('k') | ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698