Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc |
diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc |
index 2b32f7c51cf2d6f10c87ce8f75e891a732a94723..433ec0ab9d8f23fb4720baa21a1ccec43cfa0b27 100644 |
--- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc |
+++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc |
@@ -16,6 +16,7 @@ |
#include "ui/ozone/public/input_controller.h" |
#include "ui/ozone/public/ozone_platform.h" |
#include "ui/ozone/public/system_input_injector.h" |
+#include "ui/views/widget/desktop_aura/desktop_factory_wayland.h" |
namespace ui { |
@@ -80,6 +81,8 @@ class OzonePlatformWayland : public OzonePlatform { |
input_controller_ = CreateStubInputController(); |
surface_factory_.reset(new WaylandSurfaceFactory(display_.get())); |
gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); |
+ desktop_factory_.reset(new views::DesktopFactoryOzoneWayland()); |
tonikitoo
2016/06/06 15:29:59
I joone. For the record, this is the biggest goal
|
+ views::DesktopFactoryOzone::SetInstance(desktop_factory_.get()); |
tonikitoo
2016/06/06 15:29:59
Also, https://codereview.chromium.org/2024953007/
joone
2016/06/06 18:22:22
Great.
|
} |
void InitializeGPU() override { |
@@ -93,6 +96,7 @@ class OzonePlatformWayland : public OzonePlatform { |
private: |
std::unique_ptr<WaylandDisplay> display_; |
std::unique_ptr<WaylandSurfaceFactory> surface_factory_; |
+ std::unique_ptr<views::DesktopFactoryOzone> desktop_factory_; |
tonikitoo
2016/06/06 15:29:59
Ideally ozone/platform should not depend on ui/vie
joone
2016/06/06 18:22:21
Yes, I like your approach.
|
std::unique_ptr<CursorFactoryOzone> cursor_factory_; |
std::unique_ptr<StubOverlayManager> overlay_manager_; |
std::unique_ptr<InputController> input_controller_; |