| Index: ash/wm/window_resizer.h
|
| diff --git a/ash/wm/window_resizer.h b/ash/wm/window_resizer.h
|
| index a50fcdcd326aacf82841a20f88e473686d4f626d..2c8f8a4c3247149c6e02d56fd1afb6ee9c31286f 100644
|
| --- a/ash/wm/window_resizer.h
|
| +++ b/ash/wm/window_resizer.h
|
| @@ -5,11 +5,12 @@
|
| #ifndef ASH_WM_WINDOW_RESIZER_H_
|
| #define ASH_WM_WINDOW_RESIZER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/ash_export.h"
|
| #include "ash/wm/drag_details.h"
|
| #include "ash/wm/window_state.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/wm/public/window_move_client.h"
|
|
|
| @@ -98,7 +99,7 @@ class ASH_EXPORT WindowResizer {
|
|
|
| // Creates a WindowResizer for |window|. This can return a scoped_ptr
|
| // initialized with NULL if |window| should not be resized nor dragged.
|
| -ASH_EXPORT scoped_ptr<WindowResizer> CreateWindowResizer(
|
| +ASH_EXPORT std::unique_ptr<WindowResizer> CreateWindowResizer(
|
| aura::Window* window,
|
| const gfx::Point& point_in_parent,
|
| int window_component,
|
|
|