XKB implementation of Ozone key layout.

ui/ozone/platform/dri/ozone_platform_dri.cc

Index: ui/ozone/platform/dri/ozone_platform_dri.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index a6e6b457aff71724b8bf85121fd60b4549c64aa2..6893fd0c9da892ae4167622b2d20d017032895d7 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -10,7 +10,8 @@
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
-#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
+#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"

[spang, 2014/12/08 22:47:29]

#if defined(USE_XKBCOMMON)
#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
#include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
#else
#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
#endif

(put it below the unconditional headers)

[kpschoedel, 2014/12/15 19:48:47]

Done.

+#include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 #include "ui/ozone/platform/dri/display_manager.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_cursor.h"
@@ -99,8 +100,8 @@ class OzonePlatformDri : public OzonePlatform {
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
     window_manager_.reset(
         new DriWindowManager(gpu_platform_support_host_.get()));
-    KeyboardLayoutEngineManager::Create(
-        make_scoped_ptr(new StubKeyboardLayoutEngine()));
+    KeyboardLayoutEngineManager::Create(make_scoped_ptr(
+        new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));

[spang, 2014/12/08 22:47:29]

#if defined(USE_XKBCOMMON)
  // create xkb thing
#else
  // create stub thing
#endif

[kpschoedel, 2014/12/15 19:48:47]

Done.

     event_factory_ozone_.reset(new EventFactoryEvdev(
         window_manager_->cursor(), device_manager_.get(),
         KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
@@ -131,6 +132,8 @@ class OzonePlatformDri : public OzonePlatform {
 
   UiThreadGpu ui_thread_gpu_;
 
+  XkbEvdevCodes xkb_evdev_code_converter_;
+
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
 };