Reland r107720 - Enable the new layer animation framework.

ui/aura_shell/workspace/workspace_manager.cc

 // Copyright (c) 2011 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 "ui/aura_shell/workspace/workspace_manager.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/screen_aura.h"
@@ skipping 99 matching lines @@
     int overview_width = viewport_->bounds().width() * scale;
     int dx = overview_width < workspace_size_.width() ?
         (workspace_size_.width() - overview_width) / 2 : 0;
 
     transform.SetTranslateX(-viewport_->GetTargetBounds().x() + dx);
     transform.SetTranslateY(workspace_size_.height() *  (1.0f - scale) / 2);
   } else {
     transform.SetTranslateX(-active_workspace_->bounds().x());
   }
 
-  viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+  aura::Window::ScopedAnimationSettings settings(
+      viewport_->layer()->GetAnimator());
   viewport_->layer()->SetTransform(transform);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WorkspaceManager, Overridden from aura::DesktopObserver:
 
 void WorkspaceManager::OnDesktopResized(const gfx::Size& new_size) {
   workspace_size_ =
       gfx::Screen::GetMonitorAreaNearestWindow(viewport_).size();
   LayoutWorkspaces();
@@ skipping 54 matching lines @@
       kWorkspaceHorizontalMargin * (num_workspaces - 1);
   gfx::Rect bounds(0, 0, total_width, workspace_size_.height());
 
   if (viewport_->GetTargetBounds() != bounds)
     viewport_->SetBounds(bounds);
 
   // Move to active workspace.
   if (active_workspace_) {
     ui::Transform transform;
     transform.SetTranslateX(-active_workspace_->bounds().x());
-    viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+    aura::Window::ScopedAnimationSettings settings(
+        viewport_->layer()->GetAnimator());
     viewport_->SetTransform(transform);
   }
 }
 
 }  // namespace aura_shell