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 4a0fb350a56fbd4833d726f13ba07bdfcd42d11a..854eaf4b2e74b35dafa3dc43e4e69149d0aa9f23 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -20,7 +20,6 @@
 #include "ui/base/view_prop.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
@@ -437,15 +436,6 @@ void* Window::GetProperty(const char* name) const {
   return ui::ViewProp::GetValue(const_cast<gfx::NativeView>(this), name);
 }
 
-// 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;
-}
-
 Desktop* Window::GetDesktop() {
   return parent_ ? parent_->GetDesktop() : NULL;
 }
@@ -541,7 +531,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