| 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 9e5eb150ce3b900f4d647ce529b0d243659034c4..2b32f7c51cf2d6f10c87ce8f75e891a732a94723 100644
|
| --- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
|
| +++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "ui/ozone/platform/wayland/ozone_platform_wayland.h"
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "ui/ozone/common/native_display_delegate_ozone.h"
|
| #include "ui/ozone/common/stub_overlay_manager.h"
|
| #include "ui/ozone/platform/wayland/wayland_display.h"
|
| @@ -50,22 +51,23 @@ class OzonePlatformWayland : public OzonePlatform {
|
| return gpu_platform_support_host_.get();
|
| }
|
|
|
| - scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override {
|
| + std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() override {
|
| return nullptr;
|
| }
|
|
|
| - scoped_ptr<PlatformWindow> CreatePlatformWindow(
|
| + std::unique_ptr<PlatformWindow> CreatePlatformWindow(
|
| PlatformWindowDelegate* delegate,
|
| const gfx::Rect& bounds) override {
|
| auto window =
|
| - make_scoped_ptr(new WaylandWindow(delegate, display_.get(), bounds));
|
| + base::WrapUnique(new WaylandWindow(delegate, display_.get(), bounds));
|
| if (!window->Initialize())
|
| return nullptr;
|
| return std::move(window);
|
| }
|
|
|
| - scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
|
| - return make_scoped_ptr(new NativeDisplayDelegateOzone);
|
| + std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
|
| + override {
|
| + return base::WrapUnique(new NativeDisplayDelegateOzone);
|
| }
|
|
|
| void InitializeUI() override {
|
| @@ -89,13 +91,13 @@ class OzonePlatformWayland : public OzonePlatform {
|
| }
|
|
|
| private:
|
| - scoped_ptr<WaylandDisplay> display_;
|
| - scoped_ptr<WaylandSurfaceFactory> surface_factory_;
|
| - scoped_ptr<CursorFactoryOzone> cursor_factory_;
|
| - scoped_ptr<StubOverlayManager> overlay_manager_;
|
| - scoped_ptr<InputController> input_controller_;
|
| - scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
|
| - scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
|
| + std::unique_ptr<WaylandDisplay> display_;
|
| + std::unique_ptr<WaylandSurfaceFactory> surface_factory_;
|
| + std::unique_ptr<CursorFactoryOzone> cursor_factory_;
|
| + std::unique_ptr<StubOverlayManager> overlay_manager_;
|
| + std::unique_ptr<InputController> input_controller_;
|
| + std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
|
| + std::unique_ptr<GpuPlatformSupport> gpu_platform_support_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(OzonePlatformWayland);
|
| };
|
|
|