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

Unified Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

Issue 1103263004: Set ui::KeyEvent::key_ (DOM Level 3 key) under X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
Index: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 0b4cb734650d6806c59fceba88188455c016bac9..9261731027b33190bf4fe1f6b2c2407ab515fadd 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -18,7 +18,7 @@
#include "ui/events/keycodes/dom3/dom_key.h"
#include "ui/events/keycodes/dom4/keycode_converter.h"
#include "ui/events/keycodes/keyboard_code_conversion.h"
-#include "ui/events/ozone/layout/layout_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
#include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h"
namespace ui {
@@ -29,22 +29,6 @@ typedef base::Callback<void(const std::string&,
scoped_ptr<char, base::FreeDeleter>)>
LoadKeymapCallback;
-DomKey CharacterToDomKey(base::char16 character) {
- switch (character) {
- case 0x08:
- return DomKey::BACKSPACE;
- case 0x09:
- return DomKey::TAB;
- case 0x0A:
- case 0x0D:
- return DomKey::ENTER;
- case 0x1B:
- return DomKey::ESCAPE;
- default:
- return DomKey::CHARACTER;
- }
-}
-
KeyboardCode AlphanumericKeyboardCode(base::char16 character) {
// Plain ASCII letters and digits map directly to VKEY values.
if ((character >= '0') && (character <= '9'))
« ui/events/keycodes/xkb_keysym.h ('K') | « ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698