Tweaks workspace animation code per latest from Nicholas. Additionally

ash/wm/workspace/workspace2.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/workspace2.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_manager2.h"
 #include "ash/wm/workspace/workspace_manager2.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace internal {
 
 Workspace2::Workspace2(WorkspaceManager2* manager,
                        aura::Window* parent,
                        bool is_maximized)
     : is_maximized_(is_maximized),
       workspace_manager_(manager),
       window_(new aura::Window(NULL)),
       event_handler_(new WorkspaceEventHandler(window_)),
       workspace_layout_manager_(NULL) {
   window_->SetProperty(internal::kChildWindowVisibilityChangesAnimatedKey,
                        true);
+  SetWindowVisibilityAnimationTransition(window_, 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.
   window_->layer()->SetMasksToBounds(true);
   window_->Hide();
   window_->SetParent(parent);
   window_->SetProperty(internal::kUsesScreenCoordinatesKey, true);
 
   // The layout-manager cannot be created in the initializer list since it
@@ skipping 45 matching lines @@
          WorkspaceManager2::WillRestoreMaximized(child))) {
       if (++count == 2)
         return count;
     }
   }
   return count;
 }
 
 }  // namespace internal
 }  // namespace ash