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 84ab9ba565f3310865064b3f6dd90e1038d406b1..b28e3b91134f42c95acc7b806c1464db8da0da07 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 { |
@@ -450,4 +450,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 |