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; |