Do not create a workspace for a maximized window.

ash/wm/workspace/workspace.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.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ui/aura/window.h"
 #include "ui/views/corewm/visibility_controller.h"
 
 namespace ash {
 namespace internal {
 
 Workspace::Workspace(WorkspaceManager* manager,
                      aura::Window* parent,
-                     bool is_maximized)
-    : is_maximized_(is_maximized),
+                     bool is_fullscreen)
+    : is_fullscreen_(is_fullscreen),
       workspace_manager_(manager),
       window_(new aura::Window(NULL)),
       event_handler_(new WorkspaceEventHandler(window_)),
       workspace_layout_manager_(NULL) {
   views::corewm::SetChildWindowVisibilityChangesAnimated(window_);
   SetWindowVisibilityAnimationTransition(window_, views::corewm::ANIMATE_NONE);
   window_->set_id(kShellWindowId_WorkspaceContainer);
   window_->SetName("WorkspaceContainer");
   window_->Init(ui::LAYER_NOT_DRAWN);
   // Do this so when animating out windows don't extend beyond the bounds.
@@ skipping 30 matching lines @@
   window_->SetLayoutManager(NULL);
   window_->SetEventFilter(NULL);
   window_->RemovePreTargetHandler(event_handler_.get());
   window_->RemovePostTargetHandler(event_handler_.get());
   aura::Window* window = window_;
   window_ = NULL;
   return window;
 }
 
 bool Workspace::ShouldMoveToPending() const {
-  if (!is_maximized_)
+  if (!is_fullscreen_)
     return false;
 
   for (size_t i = 0; i < window_->children().size(); ++i) {
     aura::Window* child(window_->children()[i]);
     if (!child->TargetVisibility() || wm::IsWindowMinimized(child))
       continue;
 
-    // If we have a maximized window don't move to pending.
-    if (WorkspaceManager::IsMaximized(child))
+    // If we have a fullscreen window don't move to pending.
+    if (wm::IsWindowFullscreen(child))
       return false;
 
     if (GetTrackedByWorkspace(child) && !GetPersistsAcrossAllWorkspaces(child))
       return false;
   }
   return true;
 }
 
-int Workspace::GetNumMaximizedWindows() const {
+int Workspace::GetNumFullscreenWindows() const {
   int count = 0;
   for (size_t i = 0; i < window_->children().size(); ++i) {
     aura::Window* child = window_->children()[i];
     if (GetTrackedByWorkspace(child) &&
-        (WorkspaceManager::IsMaximized(child) ||
-         WorkspaceManager::WillRestoreMaximized(child))) {
+        (wm::IsWindowFullscreen(child) ||
+         WorkspaceManager::WillRestoreToWorkspace(child))) {
       if (++count == 2)
         return count;
     }
   }
   return count;
 }
 
 }  // namespace internal
 }  // namespace ash