Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: ui/aura_shell/default_container_layout_manager.cc

Issue 8414017: Activate the workspace that dragged window has landed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698