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 dd920d7ad76b7c07c3c5acbbc63edac0d0924ecd..3d8ae27554559fb9b2f4eb34f6ba96ef6c2ff656 100644 |
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc |
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc |
@@ -9,6 +9,7 @@ |
#include "ui/events/ozone/device/device_manager.h" |
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h" |
#include "ui/events/ozone/evdev/event_factory_evdev.h" |
+#include "ui/events/ozone/layout/stub/stub_keyboard_layouts.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" |
@@ -61,6 +62,9 @@ class OzonePlatformDri : public OzonePlatform { |
GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { |
return gpu_platform_support_host_.get(); |
} |
+ KeyboardLayoutsOzone* GetKeyboardLayouts() override { |
+ return keyboard_layouts_ozone_.get(); |
+ } |
scoped_ptr<PlatformWindow> CreatePlatformWindow( |
PlatformWindowDelegate* delegate, |
const gfx::Rect& bounds) override { |
@@ -97,6 +101,7 @@ class OzonePlatformDri : public OzonePlatform { |
if (!ui_thread_gpu_.Initialize()) |
LOG(FATAL) << "Failed to initialize dummy channel."; |
+ keyboard_layouts_ozone_.reset(new StubKeyboardLayouts()); |
} |
void InitializeGPU() override {} |
@@ -110,6 +115,7 @@ class OzonePlatformDri : public OzonePlatform { |
scoped_ptr<DriSurfaceFactory> surface_factory_ozone_; |
scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_; |
scoped_ptr<EventFactoryEvdev> event_factory_ozone_; |
+ scoped_ptr<KeyboardLayoutsOzone> keyboard_layouts_ozone_; |
scoped_ptr<DriWindowManager> window_manager_; |
scoped_ptr<DisplayManager> display_manager_; |