Makes maximized windows go in their own workspace regardless of

ash/wm/workspace/workspace_manager.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_manager.h"
 
 #include <algorithm>
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 53 matching lines @@
 WorkspaceManager::~WorkspaceManager() {
   std::vector<Workspace*> copy_to_delete(workspaces_);
   STLDeleteElements(&copy_to_delete);
 }
 
 // static
 bool WorkspaceManager::ShouldManageWindow(aura::Window* window) {
   return window->type() == aura::client::WINDOW_TYPE_NORMAL &&
          !window->transient_parent() &&
          ash::GetTrackedByWorkspace(window) &&
-         !ash::GetPersistsAcrossAllWorkspaces(window);
+         (!ash::GetPersistsAcrossAllWorkspaces(window) ||
+          wm::IsWindowMaximized(window));
 }
 
 bool WorkspaceManager::Contains(aura::Window* window) const {
   return FindBy(window) != NULL;
 }
 
 bool WorkspaceManager::IsInMaximizedMode() const {
   return active_workspace_ &&
       active_workspace_->type() == Workspace::TYPE_MAXIMIZED;
 }
@@ skipping 78 matching lines @@
       window_overlaps_launcher = true;
   }
   if (has_maximized_window)
     return WINDOW_STATE_MAXIMIZED;
 
   return window_overlaps_launcher ? WINDOW_STATE_WINDOW_OVERLAPS_SHELF :
       WINDOW_STATE_DEFAULT;
 }
 
 void WorkspaceManager::ShowStateChanged(aura::Window* window) {
-  if (!ShouldManageWindow(window) || !FindBy(window))
+  Workspace* workspace = FindBy(window);
+  if (!workspace)
     return;
-
-  Workspace::Type old_type = FindBy(window)->type();
-  Workspace::Type new_type = Workspace::TypeForWindow(window);
-  if (new_type != old_type)
-    OnTypeOfWorkspacedNeededChanged(window);
+  if (!ShouldManageWindow(window)) {
+    RemoveWindow(window);
+  } else {
+    Workspace::Type old_type = workspace->type();
+    Workspace::Type new_type = Workspace::TypeForWindow(window);
+    if (new_type != old_type)
+      OnTypeOfWorkspacedNeededChanged(window);
+  }
   UpdateShelfVisibility();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WorkspaceManager, private:
 
 void WorkspaceManager::AddWorkspace(Workspace* workspace) {
   DCHECK(std::find(workspaces_.begin(), workspaces_.end(),
                    workspace) == workspaces_.end());
   if (active_workspace_) {
@@ skipping 152 matching lines @@
   return workspace;
 }
 
 void WorkspaceManager::CleanupWorkspace(Workspace* workspace) {
   if (workspace->type() != Workspace::TYPE_MANAGED && workspace->is_empty())
     delete workspace;
 }
 
 }  // namespace internal
 }  // namespace ash