Reland r107720 - Enable the new layer animation framework.

ui/aura/window.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/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "ui/aura/desktop.h"
@@ skipping 391 matching lines @@
     return IsVisible() && show_state_ == ui::SHOW_STATE_FULLSCREEN;
 
   for (Windows::const_iterator it = children_.begin();
        it != children_.end(); ++it) {
     if ((*it)->IsOrContainsFullscreenWindow())
       return true;
   }
   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() {
   return parent_ ? parent_->GetDesktop() : NULL;
 }
 
 void Window::SetBoundsInternal(const gfx::Rect& new_bounds) {
   const gfx::Rect old_bounds = bounds();
   bool was_move = old_bounds.size() == new_bounds.size();
   layer_->SetBounds(new_bounds);
@@ skipping 77 matching lines @@
       break;
   }
 
   return delegate_ ? this : NULL;
 }
 
 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