Index: ui/ozone/platform/drm/ozone_platform_drm.cc |
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc |
index 0424644c74a949550ce3a28452f0068a94da93c8..d12338fd6ba1e9367167b8b5cbd57eb7ca08950a 100644 |
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc |
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc |
@@ -10,6 +10,7 @@ |
#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/ozone/platform/drm/common/drm_util.h" |
#include "ui/ozone/platform/drm/gpu/drm_buffer.h" |
#include "ui/ozone/platform/drm/gpu/drm_device.h" |
@@ -30,13 +31,6 @@ |
#include "ui/ozone/public/ozone_gpu_test_helper.h" |
#include "ui/ozone/public/ozone_platform.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 |
-#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" |
-#endif |
- |
namespace ui { |
namespace { |
@@ -95,13 +89,8 @@ class OzonePlatformDrm : public OzonePlatform { |
scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator()))); |
window_manager_.reset(new DrmWindowHostManager()); |
cursor_.reset(new DrmCursor(window_manager_.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( |
cursor_.get(), device_manager_.get(), |
KeyboardLayoutEngineManager::GetKeyboardLayoutEngine())); |
@@ -141,10 +130,6 @@ class OzonePlatformDrm : public OzonePlatform { |
scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_; |
scoped_ptr<DrmDisplayHostManager> display_manager_; |
-#if defined(USE_XKBCOMMON) |
- XkbEvdevCodes xkb_evdev_code_converter_; |
-#endif |
- |
// Objects on both processes. |
scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_; |