| Index: ash/wm/workspace_controller.h
|
| ===================================================================
|
| --- ash/wm/workspace_controller.h (revision 165163)
|
| +++ ash/wm/workspace_controller.h (working copy)
|
| @@ -21,7 +21,7 @@
|
| class ShelfLayoutManager;
|
| class WorkspaceControllerTestHelper;
|
| class WorkspaceEventHandler;
|
| -class WorkspaceManager2;
|
| +class WorkspaceManager;
|
|
|
| // WorkspaceController acts as a central place that ties together all the
|
| // various workspace pieces.
|
| @@ -54,7 +54,7 @@
|
|
|
| aura::Window* viewport_;
|
|
|
| - scoped_ptr<WorkspaceManager2> workspace_manager_;
|
| + scoped_ptr<WorkspaceManager> workspace_manager_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
|
| };
|
|
|