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

Unified Diff: ui/events/keycodes/keyboard_code_conversion.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/dom_us_layout_data.h ('k') | ui/events/keycodes/keyboard_code_conversion_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.cc
diff --git a/ui/events/keycodes/keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion.cc
index bad6e79d7f63e3b8c6e0d0a8514ece1647de17b7..f4d637b4e1534a7da1dc37a49e5d6be0d04a8993 100644
--- a/ui/events/keycodes/keyboard_code_conversion.cc
+++ b/ui/events/keycodes/keyboard_code_conversion.cc
@@ -69,19 +69,19 @@ bool DomCodeToControlCharacter(DomCode dom_code,
return false;
int code = static_cast<int>(dom_code);
- const int kKeyA = static_cast<int>(DomCode::KEY_A);
+ const int kKeyA = static_cast<int>(DomCode::US_A);
// Control-A - Control-Z map to 0x01 - 0x1A.
- if (code >= kKeyA && code <= static_cast<int>(DomCode::KEY_Z)) {
+ if (code >= kKeyA && code <= static_cast<int>(DomCode::US_Z)) {
*dom_key = DomKey::FromCharacter(code - kKeyA + 1);
*key_code = static_cast<KeyboardCode>(code - kKeyA + VKEY_A);
switch (dom_code) {
- case DomCode::KEY_H:
+ case DomCode::US_H:
*key_code = VKEY_BACK;
break;
- case DomCode::KEY_I:
+ case DomCode::US_I:
*key_code = VKEY_TAB;
break;
- case DomCode::KEY_M:
+ case DomCode::US_M:
*key_code = VKEY_RETURN;
break;
default:
« no previous file with comments | « ui/events/keycodes/dom_us_layout_data.h ('k') | ui/events/keycodes/keyboard_code_conversion_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698