Reland r107720 - Enable the new layer animation framework.

ui/aura/desktop.h

 // 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.
 
 #ifndef UI_AURA_DESKTOP_H_
 #define UI_AURA_DESKTOP_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/cursor.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/events.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
+class LayerAnimationSequence;
 class Transform;
 }
 
 namespace aura {
 
 class DesktopDelegate;
 class DesktopHost;
 class DesktopObserver;
 class KeyEvent;
 class MouseEvent;
@@ skipping 101 matching lines @@
 
   // Overridden from ui::CompositorDelegate
   virtual void ScheduleDraw();
 
   // Overridden from Window:
   virtual bool CanFocus() const OVERRIDE;
   virtual internal::FocusManager* GetFocusManager() OVERRIDE;
   virtual Desktop* GetDesktop() OVERRIDE;
 
   // Overridden from ui::LayerDelegate:
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
+  virtual void OnLayerAnimationEnded(
+      const ui::LayerAnimationSequence* animation) OVERRIDE;
 
   // Overridden from FocusManager:
   virtual void SetFocusedWindow(Window* window) OVERRIDE;
   virtual Window* GetFocusedWindow() OVERRIDE;
   virtual bool IsFocusedWindow(const Window* window) const OVERRIDE;
 
   // Initializes the desktop.
   void Init();
 
   // Parses the switch describing the initial size for the host window and
@@ skipping 37 matching lines @@
   Window* mouse_moved_handler_;
   Window* focused_window_;
   Window* touch_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(Desktop);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_DESKTOP_H_