Fixing issue with Talk window getting maximized, minimized, restored and leaving it in a desolate s…

ash/wm/workspace/workspace_manager2.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_manager2.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "ash/root_window_controller.h"
@@ skipping 183 matching lines @@
 }
 
 void WorkspaceManager2::SetActiveWorkspaceByWindow(Window* window) {
   Workspace2* workspace = FindBy(window);
   if (!workspace)
     return;
 
   if (workspace != active_workspace_) {
     // If the window persists across all workspaces, move it to the current
     // workspace.
-    if (GetPersistsAcrossAllWorkspaces(window) && !IsMaximized(window))
+    // A popup which was first maximized, is minimized and getts restored has
+    // to go through the SetActiveWorkspace since it persists across workspaces
+    // and is not (yet) maximized (see crbug.com/151698).
+    if (GetPersistsAcrossAllWorkspaces(window) && !IsMaximized(window) &&
+        !(wm::IsWindowMinimized(window) && WillRestoreMaximized(window)))
       ReparentWindow(window, active_workspace_->window(), NULL);
     else
       SetActiveWorkspace(workspace, ANIMATE_OLD_AND_NEW);
   }
 }
 
 Window* WorkspaceManager2::GetParentForNewWindow(Window* window) {
   // Try to put windows with transient parents in the same workspace as their
   // transient parent.
   if (window->transient_parent() && !IsMaximized(window)) {
@@ skipping 353 matching lines @@
       if (last_show_state == ui::SHOW_STATE_MINIMIZED)
         SetUnminimizingWorkspace(new_workspace ? new_workspace : workspace);
       DCHECK(!old_layer);
     }
   }
   UpdateShelfVisibility();
 }
 
 }  // namespace internal
 }  // namespace ash