| Index: ui/ozone/public/client_native_pixmap_factory.h
|
| diff --git a/ui/ozone/public/client_native_pixmap_factory.h b/ui/ozone/public/client_native_pixmap_factory.h
|
| index 65aaefd7610100b255f0630e17d569fd52ebfb24..1973656d36a94ed021b9f9ea0441b8a16ddffc66 100644
|
| --- a/ui/ozone/public/client_native_pixmap_factory.h
|
| +++ b/ui/ozone/public/client_native_pixmap_factory.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef UI_OZONE_PUBLIC_CLIENT_NATIVE_PIXMAP_FACTORY_H_
|
| #define UI_OZONE_PUBLIC_CLIENT_NATIVE_PIXMAP_FACTORY_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/files/scoped_file.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gfx/buffer_types.h"
|
| #include "ui/ozone/ozone_export.h"
|
| #include "ui/ozone/public/client_native_pixmap.h"
|
| @@ -28,7 +28,7 @@ class OZONE_EXPORT ClientNativePixmapFactory {
|
| static ClientNativePixmapFactory* GetInstance();
|
| static void SetInstance(ClientNativePixmapFactory* instance);
|
|
|
| - static scoped_ptr<ClientNativePixmapFactory> Create();
|
| + static std::unique_ptr<ClientNativePixmapFactory> Create();
|
|
|
| virtual ~ClientNativePixmapFactory();
|
|
|
| @@ -39,7 +39,7 @@ class OZONE_EXPORT ClientNativePixmapFactory {
|
| // TODO(dshwang): implement it. crbug.com/475633
|
| // Import the native pixmap from |handle| to be used in non-GPU processes.
|
| // This function takes ownership of any file descriptors in |handle|.
|
| - virtual scoped_ptr<ClientNativePixmap> ImportFromHandle(
|
| + virtual std::unique_ptr<ClientNativePixmap> ImportFromHandle(
|
| const gfx::NativePixmapHandle& handle,
|
| const gfx::Size& size,
|
| gfx::BufferUsage usage) = 0;
|
|
|