Revert 129220 - M20 Ash: Animate window header transition from active to inactive

BUG=116583
TEST=Manual

Review URL: http://codereview.chromium.org/9720043

TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9791025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129227 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 19 deletions

diff --git a/ash/wm/frame_painter.h b/ash/wm/frame_painter.h
index fac9820..f0c3fc6 100644
--- a/ash/wm/frame_painter.h
+++ b/ash/wm/frame_painter.h
@@ -9,9 +9,6 @@
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"  // OVERRIDE
-#include "base/memory/scoped_ptr.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/gfx/rect.h"
 #include "ui/aura/window_observer.h"
 
 class SkBitmap;
@@ -21,12 +18,10 @@ class Window;
 namespace gfx {
 class Canvas;
 class Font;
+class Rect;
 class Point;
 class Size;
 }
-namespace ui {
-class SlideAnimation;
-}
 namespace views {
 class ImageButton;
 class NonClientFrameView;
@@ -39,8 +34,7 @@ namespace ash {
 // Helper class for painting window frames.  Exists to share code between
 // various implementations of views::NonClientFrameView.  Canonical source of
 // layout constants for Ash window frames.
-class ASH_EXPORT FramePainter : public aura::WindowObserver,
-                                public ui::AnimationDelegate {
+class ASH_EXPORT FramePainter : public aura::WindowObserver {
  public:
   FramePainter();
   virtual ~FramePainter();
@@ -91,9 +85,6 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver,
                                        intptr_t old) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
-  // Overridden from ui::AnimationDelegate
-  void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-
  private:
   // Sets the images for a button base on IDs from the |frame_| theme provider.
   void SetButtonImages(views::ImageButton* button,
@@ -119,14 +110,6 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver,
   const SkBitmap* header_left_edge_;
   const SkBitmap* header_right_edge_;
 
-  // The bitmap last used for painting header.
-  const SkBitmap* previous_theme_frame_;
-  // The bitmap we are crossfading from.
-  const SkBitmap* crossfade_theme_frame_;
-
-  gfx::Rect header_frame_bounds_;
-  scoped_ptr<ui::SlideAnimation> crossfade_animation_;
-
   DISALLOW_COPY_AND_ASSIGN(FramePainter);
 };