Initial crack at new workspace behavior. Each workspace now has its

ash/wm/base_layout_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/base_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
@@ skipping 112 matching lines @@
     ui::WindowShowState new_state =
         window->GetProperty(aura::client::kShowStateKey);
     if (old_state != new_state && old_state != ui::SHOW_STATE_MINIMIZED &&
         ((new_state == ui::SHOW_STATE_MAXIMIZED &&
           old_state != ui::SHOW_STATE_FULLSCREEN) ||
          (new_state == ui::SHOW_STATE_FULLSCREEN &&
           old_state != ui::SHOW_STATE_MAXIMIZED))) {
       SetRestoreBoundsInParent(window, window->bounds());
     }
     // Minimized state handles its own animations.
-    bool animate = (old_state != ui::SHOW_STATE_MINIMIZED);
+    // TODO(sky): get animations to work with Workspace2.
+    bool animate = (old_state != ui::SHOW_STATE_MINIMIZED) &&
+        !WorkspaceController::IsWorkspace2Enabled();
     UpdateBoundsFromShowState(window, animate);
     ShowStateChanged(window, old_state);
   }
 }
 
 void BaseLayoutManager::OnWindowDestroying(aura::Window* window) {
   if (root_window_ == window) {
     root_window_->RemoveObserver(this);
     root_window_ = NULL;
   }
@@ skipping 96 matching lines @@
       gfx::Rect display_rect =
           ScreenAsh::GetDisplayWorkAreaBoundsInParent(window);
       // Put as much of the window as possible within the display area.
       window->SetBounds(window->bounds().AdjustToFit(display_rect));
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash