Reland r107720 - Enable the new layer animation framework.

ui/aura/window.cc

Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 8b1a3967c5de3c05cbdc50a5b19ce1de50c7e113..8201a8a2d68d59aa2f9376ccdbd7fd18a08a2dfa 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -409,13 +409,13 @@ bool Window::IsOrContainsFullscreenWindow() const {
   return false;
 }
 
-// static
-ui::Animation* Window::CreateDefaultAnimation() {
-  std::vector<ui::MultiAnimation::Part> parts;
-  parts.push_back(ui::MultiAnimation::Part(200, ui::Tween::LINEAR));
-  ui::MultiAnimation* multi_animation = new ui::MultiAnimation(parts);
-  multi_animation->set_continuous(false);
-  return multi_animation;
+Window::ScopedAnimationSettings::ScopedAnimationSettings(
+    ui::LayerAnimator* animator)
+    : ui::LayerAnimator::ScopedSettings(animator) {
+  SetTransitionDuration(base::TimeDelta::FromMilliseconds(200));
+}
+
+Window::ScopedAnimationSettings::~ScopedAnimationSettings() {
 }
 
 Desktop* Window::GetDesktop() {
@@ -513,7 +513,8 @@ void Window::OnPaintLayer(gfx::Canvas* canvas) {
   delegate_->OnPaint(canvas);
 }
 
-void Window::OnLayerAnimationEnded(const ui::Animation* animation) {
+void Window::OnLayerAnimationEnded(
+    const ui::LayerAnimationSequence* animation) {
 }
 
 }  // namespace aura