| Index: ui/ozone/public/ozone_platform.h
|
| diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
|
| index efa03a6cf106751010924632c7eb8c4639b43fe9..95e5d5bd3015c740ca7cff1c905268f30a2317a7 100644
|
| --- a/ui/ozone/public/ozone_platform.h
|
| +++ b/ui/ozone/public/ozone_platform.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_OZONE_PUBLIC_OZONE_PLATFORM_H_
|
| #define UI_OZONE_PUBLIC_OZONE_PLATFORM_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/ozone/ozone_export.h"
|
|
|
| namespace gfx {
|
| @@ -63,12 +64,12 @@ class OZONE_EXPORT OzonePlatform {
|
| virtual ui::InputController* GetInputController() = 0;
|
| virtual ui::GpuPlatformSupport* GetGpuPlatformSupport() = 0;
|
| virtual ui::GpuPlatformSupportHost* GetGpuPlatformSupportHost() = 0;
|
| - virtual scoped_ptr<SystemInputInjector> CreateSystemInputInjector() = 0;
|
| - virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(
|
| + virtual std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() = 0;
|
| + virtual std::unique_ptr<PlatformWindow> CreatePlatformWindow(
|
| PlatformWindowDelegate* delegate,
|
| const gfx::Rect& bounds) = 0;
|
| - virtual scoped_ptr<ui::NativeDisplayDelegate>
|
| - CreateNativeDisplayDelegate() = 0;
|
| + virtual std::unique_ptr<ui::NativeDisplayDelegate>
|
| + CreateNativeDisplayDelegate() = 0;
|
|
|
| private:
|
| virtual void InitializeUI() = 0;
|
|
|