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 5ac324c1f1a572f6c05e2bdd931b52e0264fb69e..d2d5f87f9d478b74fc32703834fa5e236b963626 100644 |
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc |
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc |
@@ -10,7 +10,12 @@ |
#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" |
+#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 |
spang
2014/12/15 19:53:44
conditional #includes go below the unconditional o
kpschoedel
2014/12/15 20:10:22
Done.
|
#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" |
+#endif |
#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 +104,13 @@ class OzonePlatformDri : public OzonePlatform { |
cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); |
window_manager_.reset( |
new DriWindowManager(gpu_platform_support_host_.get())); |
+#if defined(USE_XKBCOMMON) |
+ KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( |
+ new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); |
+#else |
KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( |
make_scoped_ptr(new StubKeyboardLayoutEngine())); |
+#endif |
event_factory_ozone_.reset(new EventFactoryEvdev( |
window_manager_->cursor(), device_manager_.get(), |
KeyboardLayoutEngineManager::GetKeyboardLayoutEngine())); |
@@ -131,6 +141,10 @@ class OzonePlatformDri : public OzonePlatform { |
UiThreadGpu ui_thread_gpu_; |
+#if defined(USE_XKBCOMMON) |
+ XkbEvdevCodes xkb_evdev_code_converter_; |
+#endif |
+ |
DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); |
}; |