| Index: ash/wm/workspace_controller.h
|
| diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
|
| index f22b2eaa4ea421a1a1835e1521f366b946f86e72..c5c318c4ccf655df1530003643dc725b6b1cb5af 100644
|
| --- a/ash/wm/workspace_controller.h
|
| +++ b/ash/wm/workspace_controller.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
|
| #define ASH_WM_WORKSPACE_CONTROLLER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/ash_export.h"
|
| #include "ash/wm/workspace/workspace_types.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace aura {
|
| class Window;
|
| @@ -39,7 +40,7 @@ class ASH_EXPORT WorkspaceController {
|
| // Add a delegate which adds a backdrop behind the top window of the default
|
| // workspace.
|
| void SetMaximizeBackdropDelegate(
|
| - scoped_ptr<WorkspaceLayoutManagerDelegate> delegate);
|
| + std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate);
|
|
|
| WorkspaceLayoutManager* layout_manager() { return layout_manager_; }
|
|
|
| @@ -49,7 +50,7 @@ class ASH_EXPORT WorkspaceController {
|
| aura::Window* viewport_;
|
|
|
| ShelfLayoutManager* shelf_;
|
| - scoped_ptr<WorkspaceEventHandler> event_handler_;
|
| + std::unique_ptr<WorkspaceEventHandler> event_handler_;
|
| WorkspaceLayoutManager* layout_manager_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
|
|
|