Index: ash/wm/header_painter.h |
diff --git a/ash/wm/header_painter.h b/ash/wm/header_painter.h |
index accc6e370d650af2e89ce56af800524c11e84628..4b7f0f5c6ea5b7a9e28e34c9f3bec437b527bec9 100644 |
--- a/ash/wm/header_painter.h |
+++ b/ash/wm/header_painter.h |
@@ -37,16 +37,6 @@ class FrameCaptionButtonContainerView; |
class ASH_EXPORT HeaderPainter : public aura::WindowObserver, |
public gfx::AnimationDelegate { |
public: |
- // Opacity values for the window header in various states, from 0 to 255. |
- static int kActiveWindowOpacity; |
- static int kInactiveWindowOpacity; |
- static int kSoloWindowOpacity; |
- |
- enum HeaderMode { |
- ACTIVE, |
- INACTIVE |
- }; |
- |
HeaderPainter(); |
virtual ~HeaderPainter(); |
@@ -88,7 +78,6 @@ class ASH_EXPORT HeaderPainter : public aura::WindowObserver, |
// Paints the header. |
// |theme_frame_overlay_id| is 0 if no overlay image should be used. |
void PaintHeader(gfx::Canvas* canvas, |
- HeaderMode header_mode, |
int theme_frame_id, |
int theme_frame_overlay_id); |
@@ -135,7 +124,6 @@ class ASH_EXPORT HeaderPainter : public aura::WindowObserver, |
virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; |
private: |
- FRIEND_TEST_ALL_PREFIXES(HeaderPainterTest, GetHeaderOpacity); |
FRIEND_TEST_ALL_PREFIXES(HeaderPainterTest, TitleIconAlignment); |
// Returns the header bounds in the coordinates of |header_view_|. The header |
@@ -150,12 +138,6 @@ class ASH_EXPORT HeaderPainter : public aura::WindowObserver, |
// coordinates. |
int GetCaptionButtonContainerCenterY() const; |
- // Returns the opacity value used to paint the header. |
- // |theme_frame_overlay_id| is 0 if no overlay image is used. |
- int GetHeaderOpacity(HeaderMode header_mode, |
- int theme_frame_id, |
- int theme_frame_overlay_id) const; |
- |
// Returns the radius of the header's top corners. |
int GetHeaderCornerRadius() const; |
@@ -187,12 +169,10 @@ class ASH_EXPORT HeaderPainter : public aura::WindowObserver, |
// Image ids and opacity last used for painting header. |
int previous_theme_frame_id_; |
int previous_theme_frame_overlay_id_; |
- int previous_opacity_; |
// Image ids and opacity we are crossfading from. |
int crossfade_theme_frame_id_; |
int crossfade_theme_frame_overlay_id_; |
- int crossfade_opacity_; |
scoped_ptr<gfx::SlideAnimation> crossfade_animation_; |