XKB implementation of Ozone key layout.

ui/ozone/platform/dri/ozone_platform_gbm.cc

Index: ui/ozone/platform/dri/ozone_platform_gbm.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc
index 9637e3f498db1ad03a20edc3c221e77ca6b54c7a..9c9d3416bcaf7a86b813e153908bb6d1ce104125 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
@@ -15,7 +15,8 @@
 #include "ui/events/ozone/device/device_manager.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"
+#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_cursor.h"
 #include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
@@ -128,8 +129,8 @@ class OzonePlatformGbm : 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_)));
     event_factory_ozone_.reset(new EventFactoryEvdev(
         window_manager_->cursor(), device_manager_.get(),
         KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
@@ -175,6 +176,8 @@ class OzonePlatformGbm : public OzonePlatform {
   scoped_ptr<DriWindowManager> window_manager_;
   scoped_ptr<DisplayManager> display_manager_;
 
+  XkbEvdevCodes xkb_evdev_code_converter_;
+
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
 };