| Index: ash/wm/workspace_controller.cc
|
| diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
|
| index 3ca70d6749c4a02a4f5a72acda85f5c754225048..5a112d431456b1312d706f512c18ef13c84dc094 100644
|
| --- a/ash/wm/workspace_controller.cc
|
| +++ b/ash/wm/workspace_controller.cc
|
| @@ -46,11 +46,14 @@ void WorkspaceController::SetActiveWorkspaceByWindow(aura::Window* window) {
|
| return workspace_manager_->SetActiveWorkspaceByWindow(window);
|
| }
|
|
|
| +Workspace* WorkspaceController::GetActiveWorkspace() const {
|
| + return workspace_manager_->active_workspace();
|
| +}
|
| +
|
| aura::Window* WorkspaceController::GetParentForNewWindow(aura::Window* window) {
|
| return workspace_manager_->GetParentForNewWindow(window);
|
| }
|
|
|
| -
|
| void WorkspaceController::DoInitialAnimation() {
|
| workspace_manager_->DoInitialAnimation();
|
| }
|
|
|