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

ash/wm/frame_painter.h

 // Copyright (c) 2012 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 ASH_WM_FRAME_PAINTER_H_
 #define ASH_WM_FRAME_PAINTER_H_
 #pragma once
 
 #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;
 namespace aura {
 class Window;
 }
 namespace gfx {
 class Canvas;
 class Font;
+class Rect;
 class Point;
 class Size;
 }
-namespace ui {
-class SlideAnimation;
-}
 namespace views {
 class ImageButton;
 class NonClientFrameView;
 class View;
 class Widget;
 }
 
 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();
 
   // |frame| and buttons are used for layout and are not owned.
   void Init(views::Widget* frame,
             views::View* window_icon,
             views::ImageButton* maximize_button,
             views::ImageButton* close_button);
 
@@ skipping 30 matching lines @@
   // Performs layout for the header based on whether we want the shorter
   // |maximized_layout| appearance.
   void LayoutHeader(views::NonClientFrameView* view, bool maximized_layout);
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        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,
                        int normal_bitmap_id,
                        int hot_bitmap_id,
                        int pushed_bitmap_id);
 
   // Returns the offset between window left edge and title string.
   int GetTitleOffsetX() const;
 
   // Not owned
   views::Widget* frame_;
   views::View* window_icon_;  // May be NULL.
   views::ImageButton* maximize_button_;
   views::ImageButton* close_button_;
   aura::Window* window_;
 
   // Window frame header/caption parts.
   const SkBitmap* button_separator_;
   const SkBitmap* top_left_corner_;
   const SkBitmap* top_edge_;
   const SkBitmap* top_right_corner_;
   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);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_FRAME_PAINTER_H_