| Index: ui/wm/core/wm_state.h
|
| diff --git a/ui/wm/core/wm_state.h b/ui/wm/core/wm_state.h
|
| index 217434ffaf482b27f35e57c3f7fde86ed9b9b298..620315c2603bdb9d54c75a019580504aa65187d2 100644
|
| --- a/ui/wm/core/wm_state.h
|
| +++ b/ui/wm/core/wm_state.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_WM_CORE_WM_STATE_H_
|
| #define UI_WM_CORE_WM_STATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/wm/wm_export.h"
|
|
|
| namespace wm {
|
| @@ -22,8 +23,8 @@ class WM_EXPORT WMState {
|
|
|
| // WindowStackingClient:
|
| private:
|
| - scoped_ptr<TransientWindowStackingClient> window_stacking_client_;
|
| - scoped_ptr<TransientWindowController> transient_window_client_;
|
| + std::unique_ptr<TransientWindowStackingClient> window_stacking_client_;
|
| + std::unique_ptr<TransientWindowController> transient_window_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WMState);
|
| };
|
|
|