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

Unified Diff: ui/events/ozone/evdev/keyboard_evdev.h

Issue 742103002: Ozone keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lite-code
Patch Set: rrrebase Created 6 years 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/evdev/keyboard_evdev.h
diff --git a/ui/events/ozone/evdev/keyboard_evdev.h b/ui/events/ozone/evdev/keyboard_evdev.h
index 913d00675322f2f9e5ba6a1de79546be0f3c5f1d..56c68dd074313e4dae84624e018f28d14d87bcc7 100644
--- a/ui/events/ozone/evdev/keyboard_evdev.h
+++ b/ui/events/ozone/evdev/keyboard_evdev.h
@@ -11,6 +11,7 @@
#include "ui/events/ozone/evdev/event_device_util.h"
#include "ui/events/ozone/evdev/event_dispatch_callback.h"
#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+#include "ui/events/ozone/layout/keyboard_layout_engine.h"
namespace ui {
@@ -21,12 +22,13 @@ class EventModifiersEvdev;
// This object is responsible for combining all attached keyboards into
// one logical keyboard, applying modifiers & implementing key repeat.
//
-// It also currently also applies the layout (hardcoded as US).
+// It also currently also applies the layout.
//
// TODO(spang): Implement key repeat & turn off kernel repeat.
class EVENTS_OZONE_EVDEV_EXPORT KeyboardEvdev {
public:
KeyboardEvdev(EventModifiersEvdev* modifiers,
+ KeyboardLayoutEngine* keyboard_layout_engine,
const EventDispatchCallback& callback);
~KeyboardEvdev();
@@ -52,6 +54,8 @@ class EVENTS_OZONE_EVDEV_EXPORT KeyboardEvdev {
// Shared modifier state.
EventModifiersEvdev* modifiers_;
+ KeyboardLayoutEngine* keyboard_layout_engine_;
+
DISALLOW_COPY_AND_ASSIGN(KeyboardEvdev);
};

Powered by Google App Engine
This is Rietveld 408576698