| Index: ash/wm/toplevel_window_event_handler.h
|
| diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h
|
| index aa12f28f30fbb6a3f0c178839acd823056d56fb3..eef8c1e9f8e633e8d2336a561080a62b443b18ad 100644
|
| --- a/ash/wm/toplevel_window_event_handler.h
|
| +++ b/ash/wm/toplevel_window_event_handler.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
|
| #define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "ash/ash_export.h"
|
| @@ -13,7 +14,6 @@
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/events/event_handler.h"
|
| #include "ui/gfx/geometry/point.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| @@ -119,7 +119,7 @@ class ASH_EXPORT ToplevelWindowEventHandler
|
| // Whether the drag was reverted. Set by CompleteDrag().
|
| bool drag_reverted_;
|
|
|
| - scoped_ptr<ScopedWindowResizer> window_resizer_;
|
| + std::unique_ptr<ScopedWindowResizer> window_resizer_;
|
|
|
| base::Closure quit_closure_;
|
|
|
|
|