| Index: ash/wm/dock/docked_window_resizer.h
|
| diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h
|
| index ad0e02bf1b04797c6ebcd9999f055b0466124c3e..4093ae9f04ae5be26b087c785daee7f5d4a84208 100644
|
| --- a/ash/wm/dock/docked_window_resizer.h
|
| +++ b/ash/wm/dock/docked_window_resizer.h
|
| @@ -5,11 +5,12 @@
|
| #ifndef ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
|
| #define ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/wm/dock/dock_types.h"
|
| #include "ash/wm/window_resizer.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
|
|
| namespace gfx {
|
| @@ -75,7 +76,7 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
|
| gfx::Point last_location_;
|
|
|
| // Wraps a window resizer and adds detaching / reattaching during drags.
|
| - scoped_ptr<WindowResizer> next_window_resizer_;
|
| + std::unique_ptr<WindowResizer> next_window_resizer_;
|
|
|
| // Dock container window.
|
| DockedWindowLayoutManager* dock_layout_;
|
|
|