Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Unified Diff: ash/wm/frame_painter.h

Issue 9791025: Revert 129220 - M20 Ash: Animate window header transition from active to inactive (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/frame_painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/frame_painter.h
===================================================================
--- ash/wm/frame_painter.h (revision 129226)
+++ ash/wm/frame_painter.h (working copy)
@@ -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 @@
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 @@
// 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 @@
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 @@
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);
};
« no previous file with comments | « no previous file | ash/wm/frame_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698