| 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 17f8eb166b86128f6c2e455019c2c0c47894651b..0b5647ee84556019528d6127a59e5d6a16e41590 100644
|
| --- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
|
| +++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
|
| @@ -13,6 +13,7 @@
|
| #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
|
| #include "ui/events/ozone/device/device_manager.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_cursor.h"
|
| #include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
|
| @@ -94,6 +95,9 @@ class OzonePlatformGbm : 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 {
|
| @@ -121,6 +125,7 @@ class OzonePlatformGbm : public OzonePlatform {
|
| new DriWindowManager(gpu_platform_support_host_.get()));
|
| event_factory_ozone_.reset(new EventFactoryEvdev(window_manager_->cursor(),
|
| device_manager_.get()));
|
| + keyboard_layouts_ozone_.reset(new StubKeyboardLayouts());
|
| }
|
|
|
| void InitializeGPU() override {
|
| @@ -156,6 +161,7 @@ class OzonePlatformGbm : public OzonePlatform {
|
| scoped_ptr<GbmSurfaceFactory> surface_factory_ozone_;
|
| scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
|
| scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
|
| + scoped_ptr<KeyboardLayoutsOzone> keyboard_layouts_ozone_;
|
|
|
| scoped_ptr<DriGpuPlatformSupport> gpu_platform_support_;
|
| scoped_ptr<DriGpuPlatformSupportHost> gpu_platform_support_host_;
|
|
|