| Index: ash/wm/toplevel_window_event_handler.cc
|
| diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
|
| index c7a00c271cc0d4b5d0a23df4d276c5971c588ba2..27c2eaf9cc47d7c687461dc236d5e7fc1cb470a0 100644
|
| --- a/ash/wm/toplevel_window_event_handler.cc
|
| +++ b/ash/wm/toplevel_window_event_handler.cc
|
| @@ -108,7 +108,7 @@ class ToplevelWindowEventHandler::ScopedWindowResizer
|
|
|
| private:
|
| ToplevelWindowEventHandler* handler_;
|
| - scoped_ptr<WindowResizer> resizer_;
|
| + std::unique_ptr<WindowResizer> resizer_;
|
|
|
| // Whether ScopedWindowResizer grabbed capture.
|
| bool grabbed_capture_;
|
| @@ -466,7 +466,7 @@ bool ToplevelWindowEventHandler::CompleteDrag(DragCompletionStatus status) {
|
| if (!window_resizer_)
|
| return false;
|
|
|
| - scoped_ptr<ScopedWindowResizer> resizer(window_resizer_.release());
|
| + std::unique_ptr<ScopedWindowResizer> resizer(window_resizer_.release());
|
| switch (status) {
|
| case DRAG_COMPLETE:
|
| resizer->resizer()->CompleteDrag();
|
|
|