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

Unified Diff: ui/events/keycodes/keyboard_code_conversion_xkb.cc

Issue 954943003: [KeyboardEvent] Use DOM |code| rather than Windows-based key code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing VKEY in windows for brightness and power Created 5 years, 10 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_xkb.h ('k') | ui/events/keycodes/keyboard_codes_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/keycodes/keyboard_code_conversion_xkb.cc
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion_xkb.cc
similarity index 97%
rename from ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.cc
rename to ui/events/keycodes/keyboard_code_conversion_xkb.cc
index b1eb22a836d80eb2c8cea44954a94cfc19c865ea..3f32a259b14525a027745bba1f4eda33ab3a66ed 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_xkb.cc
@@ -1,10 +1,10 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h"
-
#include "ui/events/keycodes/dom3/dom_key.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
namespace ui {
@@ -444,4 +444,11 @@ base::char16 DeadXkbKeySymToCombiningCharacter(xkb_keysym_t keysym) {
}
}
+DomKey XkbKeySymToDomKey(xkb_keysym_t keysym, base::char16 character) {
+ DomKey dom_key = NonPrintableXkbKeySymToDomKey(keysym);
+ if (dom_key == DomKey::NONE)
+ dom_key = CharacterToDomKey(character);
+ return dom_key;
+}
+
} // namespace ui
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_xkb.h ('k') | ui/events/keycodes/keyboard_codes_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698