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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/keycodes/keyboard_code_conversion_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/keycodes/keyboard_code_conversion.cc ('k') | ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/keycodes/keyboard_code_conversion_unittest.cc
diff --git a/ui/events/keycodes/keyboard_code_conversion_unittest.cc b/ui/events/keycodes/keyboard_code_conversion_unittest.cc
index 0ad20f55a47e750cad9fe831141fae68ee805e1a..dab5faca4cf198a4be4080c1009a720dd6ec1799 100644
--- a/ui/events/keycodes/keyboard_code_conversion_unittest.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_unittest.cc
@@ -62,82 +62,82 @@ TEST(KeyboardCodeConversion, ControlCharacters) {
Meaning control_character;
Meaning control_key;
} kControlCharacters[] = {
- {ui::DomCode::KEY_A,
+ {ui::DomCode::US_A,
{true, ui::DomKey::Constant<0x01>::Character, ui::VKEY_A},
{true, ui::DomKey::Constant<'a'>::Character, ui::VKEY_A}},
- {ui::DomCode::KEY_B,
+ {ui::DomCode::US_B,
{true, ui::DomKey::Constant<0x02>::Character, ui::VKEY_B},
{true, ui::DomKey::Constant<'b'>::Character, ui::VKEY_B}},
- {ui::DomCode::KEY_C,
+ {ui::DomCode::US_C,
{true, ui::DomKey::Constant<0x03>::Character, ui::VKEY_C},
{true, ui::DomKey::Constant<'c'>::Character, ui::VKEY_C}},
- {ui::DomCode::KEY_D,
+ {ui::DomCode::US_D,
{true, ui::DomKey::Constant<0x04>::Character, ui::VKEY_D},
{true, ui::DomKey::Constant<'d'>::Character, ui::VKEY_D}},
- {ui::DomCode::KEY_E,
+ {ui::DomCode::US_E,
{true, ui::DomKey::Constant<0x05>::Character, ui::VKEY_E},
{true, ui::DomKey::Constant<'e'>::Character, ui::VKEY_E}},
- {ui::DomCode::KEY_F,
+ {ui::DomCode::US_F,
{true, ui::DomKey::Constant<0x06>::Character, ui::VKEY_F},
{true, ui::DomKey::Constant<'f'>::Character, ui::VKEY_F}},
- {ui::DomCode::KEY_G,
+ {ui::DomCode::US_G,
{true, ui::DomKey::Constant<0x07>::Character, ui::VKEY_G},
{true, ui::DomKey::Constant<'g'>::Character, ui::VKEY_G}},
- {ui::DomCode::KEY_H,
+ {ui::DomCode::US_H,
{true, ui::DomKey::BACKSPACE, ui::VKEY_BACK},
{true, ui::DomKey::Constant<'h'>::Character, ui::VKEY_H}},
- {ui::DomCode::KEY_I,
+ {ui::DomCode::US_I,
{true, ui::DomKey::TAB, ui::VKEY_TAB},
{true, ui::DomKey::Constant<'i'>::Character, ui::VKEY_I}},
- {ui::DomCode::KEY_J,
+ {ui::DomCode::US_J,
{true, ui::DomKey::Constant<0x0A>::Character, ui::VKEY_J},
{true, ui::DomKey::Constant<'j'>::Character, ui::VKEY_J}},
- {ui::DomCode::KEY_K,
+ {ui::DomCode::US_K,
{true, ui::DomKey::Constant<0x0B>::Character, ui::VKEY_K},
{true, ui::DomKey::Constant<'k'>::Character, ui::VKEY_K}},
- {ui::DomCode::KEY_L,
+ {ui::DomCode::US_L,
{true, ui::DomKey::Constant<0x0C>::Character, ui::VKEY_L},
{true, ui::DomKey::Constant<'l'>::Character, ui::VKEY_L}},
- {ui::DomCode::KEY_M,
+ {ui::DomCode::US_M,
{true, ui::DomKey::ENTER, ui::VKEY_RETURN},
{true, ui::DomKey::Constant<'m'>::Character, ui::VKEY_M}},
- {ui::DomCode::KEY_N,
+ {ui::DomCode::US_N,
{true, ui::DomKey::Constant<0x0E>::Character, ui::VKEY_N},
{true, ui::DomKey::Constant<'n'>::Character, ui::VKEY_N}},
- {ui::DomCode::KEY_O,
+ {ui::DomCode::US_O,
{true, ui::DomKey::Constant<0x0F>::Character, ui::VKEY_O},
{true, ui::DomKey::Constant<'o'>::Character, ui::VKEY_O}},
- {ui::DomCode::KEY_P,
+ {ui::DomCode::US_P,
{true, ui::DomKey::Constant<0x10>::Character, ui::VKEY_P},
{true, ui::DomKey::Constant<'p'>::Character, ui::VKEY_P}},
- {ui::DomCode::KEY_Q,
+ {ui::DomCode::US_Q,
{true, ui::DomKey::Constant<0x11>::Character, ui::VKEY_Q},
{true, ui::DomKey::Constant<'q'>::Character, ui::VKEY_Q}},
- {ui::DomCode::KEY_R,
+ {ui::DomCode::US_R,
{true, ui::DomKey::Constant<0x12>::Character, ui::VKEY_R},
{true, ui::DomKey::Constant<'r'>::Character, ui::VKEY_R}},
- {ui::DomCode::KEY_S,
+ {ui::DomCode::US_S,
{true, ui::DomKey::Constant<0x13>::Character, ui::VKEY_S},
{true, ui::DomKey::Constant<'s'>::Character, ui::VKEY_S}},
- {ui::DomCode::KEY_T,
+ {ui::DomCode::US_T,
{true, ui::DomKey::Constant<0x14>::Character, ui::VKEY_T},
{true, ui::DomKey::Constant<'t'>::Character, ui::VKEY_T}},
- {ui::DomCode::KEY_U,
+ {ui::DomCode::US_U,
{true, ui::DomKey::Constant<0x15>::Character, ui::VKEY_U},
{true, ui::DomKey::Constant<'u'>::Character, ui::VKEY_U}},
- {ui::DomCode::KEY_V,
+ {ui::DomCode::US_V,
{true, ui::DomKey::Constant<0x16>::Character, ui::VKEY_V},
{true, ui::DomKey::Constant<'v'>::Character, ui::VKEY_V}},
- {ui::DomCode::KEY_W,
+ {ui::DomCode::US_W,
{true, ui::DomKey::Constant<0x17>::Character, ui::VKEY_W},
{true, ui::DomKey::Constant<'w'>::Character, ui::VKEY_W}},
- {ui::DomCode::KEY_X,
+ {ui::DomCode::US_X,
{true, ui::DomKey::Constant<0x18>::Character, ui::VKEY_X},
{true, ui::DomKey::Constant<'x'>::Character, ui::VKEY_X}},
- {ui::DomCode::KEY_Y,
+ {ui::DomCode::US_Y,
{true, ui::DomKey::Constant<0x19>::Character, ui::VKEY_Y},
{true, ui::DomKey::Constant<'y'>::Character, ui::VKEY_Y}},
- {ui::DomCode::KEY_Z,
+ {ui::DomCode::US_Z,
{true, ui::DomKey::Constant<0x1A>::Character, ui::VKEY_Z},
{true, ui::DomKey::Constant<'z'>::Character, ui::VKEY_Z}},
};
@@ -291,82 +291,82 @@ TEST(KeyboardCodeConversion, UsLayout) {
Meaning normal;
Meaning shift;
} kPrintableUsLayout[] = {
- {ui::DomCode::KEY_A,
+ {ui::DomCode::US_A,
{true, ui::DomKey::Constant<'a'>::Character, ui::VKEY_A},
{true, ui::DomKey::Constant<'A'>::Character, ui::VKEY_A}},
- {ui::DomCode::KEY_B,
+ {ui::DomCode::US_B,
{true, ui::DomKey::Constant<'b'>::Character, ui::VKEY_B},
{true, ui::DomKey::Constant<'B'>::Character, ui::VKEY_B}},
- {ui::DomCode::KEY_C,
+ {ui::DomCode::US_C,
{true, ui::DomKey::Constant<'c'>::Character, ui::VKEY_C},
{true, ui::DomKey::Constant<'C'>::Character, ui::VKEY_C}},
- {ui::DomCode::KEY_D,
+ {ui::DomCode::US_D,
{true, ui::DomKey::Constant<'d'>::Character, ui::VKEY_D},
{true, ui::DomKey::Constant<'D'>::Character, ui::VKEY_D}},
- {ui::DomCode::KEY_E,
+ {ui::DomCode::US_E,
{true, ui::DomKey::Constant<'e'>::Character, ui::VKEY_E},
{true, ui::DomKey::Constant<'E'>::Character, ui::VKEY_E}},
- {ui::DomCode::KEY_F,
+ {ui::DomCode::US_F,
{true, ui::DomKey::Constant<'f'>::Character, ui::VKEY_F},
{true, ui::DomKey::Constant<'F'>::Character, ui::VKEY_F}},
- {ui::DomCode::KEY_G,
+ {ui::DomCode::US_G,
{true, ui::DomKey::Constant<'g'>::Character, ui::VKEY_G},
{true, ui::DomKey::Constant<'G'>::Character, ui::VKEY_G}},
- {ui::DomCode::KEY_H,
+ {ui::DomCode::US_H,
{true, ui::DomKey::Constant<'h'>::Character, ui::VKEY_H},
{true, ui::DomKey::Constant<'H'>::Character, ui::VKEY_H}},
- {ui::DomCode::KEY_I,
+ {ui::DomCode::US_I,
{true, ui::DomKey::Constant<'i'>::Character, ui::VKEY_I},
{true, ui::DomKey::Constant<'I'>::Character, ui::VKEY_I}},
- {ui::DomCode::KEY_J,
+ {ui::DomCode::US_J,
{true, ui::DomKey::Constant<'j'>::Character, ui::VKEY_J},
{true, ui::DomKey::Constant<'J'>::Character, ui::VKEY_J}},
- {ui::DomCode::KEY_K,
+ {ui::DomCode::US_K,
{true, ui::DomKey::Constant<'k'>::Character, ui::VKEY_K},
{true, ui::DomKey::Constant<'K'>::Character, ui::VKEY_K}},
- {ui::DomCode::KEY_L,
+ {ui::DomCode::US_L,
{true, ui::DomKey::Constant<'l'>::Character, ui::VKEY_L},
{true, ui::DomKey::Constant<'L'>::Character, ui::VKEY_L}},
- {ui::DomCode::KEY_M,
+ {ui::DomCode::US_M,
{true, ui::DomKey::Constant<'m'>::Character, ui::VKEY_M},
{true, ui::DomKey::Constant<'M'>::Character, ui::VKEY_M}},
- {ui::DomCode::KEY_N,
+ {ui::DomCode::US_N,
{true, ui::DomKey::Constant<'n'>::Character, ui::VKEY_N},
{true, ui::DomKey::Constant<'N'>::Character, ui::VKEY_N}},
- {ui::DomCode::KEY_O,
+ {ui::DomCode::US_O,
{true, ui::DomKey::Constant<'o'>::Character, ui::VKEY_O},
{true, ui::DomKey::Constant<'O'>::Character, ui::VKEY_O}},
- {ui::DomCode::KEY_P,
+ {ui::DomCode::US_P,
{true, ui::DomKey::Constant<'p'>::Character, ui::VKEY_P},
{true, ui::DomKey::Constant<'P'>::Character, ui::VKEY_P}},
- {ui::DomCode::KEY_Q,
+ {ui::DomCode::US_Q,
{true, ui::DomKey::Constant<'q'>::Character, ui::VKEY_Q},
{true, ui::DomKey::Constant<'Q'>::Character, ui::VKEY_Q}},
- {ui::DomCode::KEY_R,
+ {ui::DomCode::US_R,
{true, ui::DomKey::Constant<'r'>::Character, ui::VKEY_R},
{true, ui::DomKey::Constant<'R'>::Character, ui::VKEY_R}},
- {ui::DomCode::KEY_S,
+ {ui::DomCode::US_S,
{true, ui::DomKey::Constant<'s'>::Character, ui::VKEY_S},
{true, ui::DomKey::Constant<'S'>::Character, ui::VKEY_S}},
- {ui::DomCode::KEY_T,
+ {ui::DomCode::US_T,
{true, ui::DomKey::Constant<'t'>::Character, ui::VKEY_T},
{true, ui::DomKey::Constant<'T'>::Character, ui::VKEY_T}},
- {ui::DomCode::KEY_U,
+ {ui::DomCode::US_U,
{true, ui::DomKey::Constant<'u'>::Character, ui::VKEY_U},
{true, ui::DomKey::Constant<'U'>::Character, ui::VKEY_U}},
- {ui::DomCode::KEY_V,
+ {ui::DomCode::US_V,
{true, ui::DomKey::Constant<'v'>::Character, ui::VKEY_V},
{true, ui::DomKey::Constant<'V'>::Character, ui::VKEY_V}},
- {ui::DomCode::KEY_W,
+ {ui::DomCode::US_W,
{true, ui::DomKey::Constant<'w'>::Character, ui::VKEY_W},
{true, ui::DomKey::Constant<'W'>::Character, ui::VKEY_W}},
- {ui::DomCode::KEY_X,
+ {ui::DomCode::US_X,
{true, ui::DomKey::Constant<'x'>::Character, ui::VKEY_X},
{true, ui::DomKey::Constant<'X'>::Character, ui::VKEY_X}},
- {ui::DomCode::KEY_Y,
+ {ui::DomCode::US_Y,
{true, ui::DomKey::Constant<'y'>::Character, ui::VKEY_Y},
{true, ui::DomKey::Constant<'Y'>::Character, ui::VKEY_Y}},
- {ui::DomCode::KEY_Z,
+ {ui::DomCode::US_Z,
{true, ui::DomKey::Constant<'z'>::Character, ui::VKEY_Z},
{true, ui::DomKey::Constant<'Z'>::Character, ui::VKEY_Z}},
{ui::DomCode::DIGIT1,
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion.cc ('k') | ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698