Index: ash/frame/caption_buttons/frame_caption_button.cc |
diff --git a/ash/frame/caption_buttons/frame_caption_button.cc b/ash/frame/caption_buttons/frame_caption_button.cc |
index 2b166436a2498ea7ec13bca7ef6266ad55753127..99ac55482acaca453bca6ff1d223f2f4a75ec421 100644 |
--- a/ash/frame/caption_buttons/frame_caption_button.cc |
+++ b/ash/frame/caption_buttons/frame_caption_button.cc |
@@ -110,9 +110,11 @@ const char* FrameCaptionButton::GetClassName() const { |
} |
void FrameCaptionButton::OnPaint(gfx::Canvas* canvas) { |
- if (hover_animation_->is_animating() || state() == STATE_HOVERED) { |
- int hovered_background_alpha = hover_animation_->is_animating() ? |
- hover_animation_->CurrentValueBetween(0, 255) : 255; |
+ if (hover_animation().is_animating() || state() == STATE_HOVERED) { |
+ int hovered_background_alpha = |
+ hover_animation().is_animating() |
+ ? hover_animation().CurrentValueBetween(0, 255) |
+ : 255; |
SkPaint paint; |
paint.setAlpha(hovered_background_alpha); |
canvas->DrawImageInt(hovered_background_image_, 0, 0, paint); |
@@ -173,9 +175,9 @@ void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas, |
if (!paint_as_active_) { |
// Paint icons as active when they are hovered over or pressed. |
double inactive_alpha = kInactiveIconAlpha; |
- if (hover_animation_->is_animating()) { |
+ if (hover_animation().is_animating()) { |
inactive_alpha = |
- hover_animation_->CurrentValueBetween(inactive_alpha, 1.0f); |
+ hover_animation().CurrentValueBetween(inactive_alpha, 1.0f); |
} else if (state() == STATE_PRESSED || state() == STATE_HOVERED) { |
inactive_alpha = 1.0f; |
} |