| Index: ash/wm/ash_native_cursor_manager.h
|
| diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h
|
| index 2c2c506cadb44d7cdfe71624cf5bd7ef64ab4c34..ae8952b6c047a1d3e1e06fa341be3af3466cfcbd 100644
|
| --- a/ash/wm/ash_native_cursor_manager.h
|
| +++ b/ash/wm/ash_native_cursor_manager.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
|
| #define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/ash_export.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "ui/gfx/geometry/point.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -62,7 +63,7 @@ class ASH_EXPORT AshNativeCursorManager
|
|
|
| bool native_cursor_enabled_;
|
|
|
| - scoped_ptr<ui::ImageCursors> image_cursors_;
|
| + std::unique_ptr<ui::ImageCursors> image_cursors_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager);
|
| };
|
|
|