CustomButton cleanup: make protected members private, create accessors

mash/wm/frame/caption_buttons/frame_caption_button.cc

 // Copyright 2015 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.
 
 #include "mash/wm/frame/caption_buttons/frame_caption_button.h"
 
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
@@ skipping 93 matching lines @@
 gfx::Size FrameCaptionButton::GetPreferredSize() const {
   return hovered_background_image_.isNull() ? gfx::Size()
                                             : hovered_background_image_.size();
 }
 
 const char* FrameCaptionButton::GetClassName() const {
   return kViewClassName;
 }
 
 void FrameCaptionButton::OnPaint(gfx::Canvas* canvas) {
-  if (hover_animation_->is_animating() || state() == STATE_HOVERED) {
+  if (hover_animation().is_animating() || state() == STATE_HOVERED) {
     int hovered_background_alpha =
-        hover_animation_->is_animating()
-            ? hover_animation_->CurrentValueBetween(0, 255)
-            : 255;
+        hover_animation().CurrentValueBetween(0, 255);
     SkPaint paint;
     paint.setAlpha(hovered_background_alpha);
     canvas->DrawImageInt(hovered_background_image_, 0, 0, paint);
   } else if (state() == STATE_PRESSED) {
     canvas->DrawImageInt(pressed_background_image_, 0, 0);
   }
 
   int icon_alpha = swap_images_animation_->CurrentValueBetween(0, 255);
   int crossfade_icon_alpha = 0;
   if (icon_alpha < static_cast<int>(kFadeOutRatio * 255))
@@ skipping 40 matching lines @@
   }
   CustomButton::OnGestureEvent(event);
 }
 
 void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas,
                                        const gfx::ImageSkia& to_center,
                                        int alpha) {
   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;
     }
     alpha *= inactive_alpha;
   }
 
   SkPaint paint;
   paint.setAlpha(alpha);
   canvas->DrawImageInt(to_center, (width() - to_center.width()) / 2,
                        (height() - to_center.height()) / 2, paint);
 }
 
 }  // namespace wm
 }  // namespace mash