| Index: ui/aura_shell/default_container_layout_manager.cc
|
| diff --git a/ui/aura_shell/default_container_layout_manager.cc b/ui/aura_shell/default_container_layout_manager.cc
|
| index caa5331fc8511cb8f086b98ffdc11b7dca80136d..98d3dc31bd0eddcb7dd6756d7ac40c3bee292c0e 100644
|
| --- a/ui/aura_shell/default_container_layout_manager.cc
|
| +++ b/ui/aura_shell/default_container_layout_manager.cc
|
| @@ -74,9 +74,10 @@ void DefaultContainerLayoutManager::EndMove(
|
| // TODO(oshima): finish moving window between workspaces.
|
| AutoReset<bool> reset(&ignore_calculate_bounds_, true);
|
| drag_window_ = NULL;
|
| - Workspace* workspace = workspace_manager_->GetActiveWorkspace();
|
| - if (workspace)
|
| - workspace->Layout(NULL, NULL);
|
| +
|
| + Workspace* workspace = workspace_manager_->FindBy(drag);
|
| + workspace->Layout(NULL, NULL);
|
| + workspace->Activate();
|
| workspace_manager_->SetOverview(false);
|
| }
|
|
|
|
|