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

ash/wm/base_layout_manager.cc

Index: ash/wm/base_layout_manager.cc
diff --git a/ash/wm/base_layout_manager.cc b/ash/wm/base_layout_manager.cc
index cd582ade18d015384b95826f372a02833f6789d5..bf4e47c27534ed6f4a9bb68d4ed7703220385b7f 100644
--- a/ash/wm/base_layout_manager.cc
+++ b/ash/wm/base_layout_manager.cc
@@ -11,6 +11,7 @@
 #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"
@@ -143,7 +144,9 @@ void BaseLayoutManager::OnWindowPropertyChanged(aura::Window* window,
       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);
   }