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

Unified Diff: ash/wm/workspace/workspace.cc

Issue 13867010: ash: Fix transient child in wrong workspace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | ash/wm/workspace/workspace_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace.cc
diff --git a/ash/wm/workspace/workspace.cc b/ash/wm/workspace/workspace.cc
index 6513deafe6aba6f1fb74c60c9ea6dee3c52d91a7..142414d00a598f3965ea32d8efe9c33bbe7e5ef8 100644
--- a/ash/wm/workspace/workspace.cc
+++ b/ash/wm/workspace/workspace.cc
@@ -78,15 +78,11 @@ bool Workspace::ShouldMoveToPending() const {
if (!child->TargetVisibility() || wm::IsWindowMinimized(child))
continue;
- if (!GetTrackedByWorkspace(child)) {
- // If we have a maximized window that isn't tracked don't move to
- // pending. This handles the case of dragging a maximized window.
- if (WorkspaceManager::IsMaximized(child))
- return false;
- continue;
- }
+ // If we have a maximized window don't move to pending.
+ if (WorkspaceManager::IsMaximized(child))
sky 2013/04/16 22:33:25 I think this is going to break dragging a tab from
xiyuan 2013/04/16 22:52:49 I verified it still works. You can drag a tab out
sky 2013/04/16 23:23:30 Good point.
+ return false;
- if (!GetPersistsAcrossAllWorkspaces(child))
+ if (GetTrackedByWorkspace(child) && !GetPersistsAcrossAllWorkspaces(child))
return false;
}
return true;
« no previous file with comments | « no previous file | ash/wm/workspace/workspace_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698