Reland r107720 - Enable the new layer animation framework.

ui/aura_shell/workspace/workspace.cc

Index: ui/aura_shell/workspace/workspace.cc
diff --git a/ui/aura_shell/workspace/workspace.cc b/ui/aura_shell/workspace/workspace.cc
index 5623e43c654a1e8d74557c725a2c48b1821c185d..3e2e27d24d914278f05d67a41300f1354f7e8af5 100644
--- a/ui/aura_shell/workspace/workspace.cc
+++ b/ui/aura_shell/workspace/workspace.cc
@@ -8,6 +8,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/layer_animator.h"
 
 namespace {
 // Horizontal margin between windows.
@@ -129,9 +130,13 @@ void Workspace::MoveWindowTo(
   else {
     gfx::Rect bounds = window->GetTargetBounds();
     bounds.set_origin(origin);
-    if (animate)
-      window->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
-    window->SetBounds(bounds);
+    if (animate) {
+      aura::Window::ScopedAnimationSettings settings(
+          window->layer()->GetAnimator());
+      window->SetBounds(bounds);
+    } else {
+      window->SetBounds(bounds);
+    }
   }
 }