CustomButton cleanup: make protected members private, create accessors

ui/views/controls/button/custom_button.cc

 // 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.
 
 #include "ui/views/controls/button/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 48 matching lines @@
   // InkDropDelegate needs to be destroyed by now since it may need to call
   // methods on |this| via InkDropHost.
   DCHECK(!ink_drop_delegate_);
 }
 
 void CustomButton::SetState(ButtonState state) {
   if (state == state_)
     return;
 
   if (animate_on_state_change_ &&
-      (!is_throbbing_ || !hover_animation_->is_animating())) {
+      (!is_throbbing_ || !hover_animation_.is_animating())) {
     is_throbbing_ = false;
     if ((state_ == STATE_HOVERED) && (state == STATE_NORMAL)) {
       // For HOVERED -> NORMAL, animate from hovered (1) to not hovered (0).
-      hover_animation_->Hide();
+      hover_animation_.Hide();
     } else if (state != STATE_HOVERED) {
       // For HOVERED -> PRESSED/DISABLED, or any transition not involving
       // HOVERED at all, simply set the state to not hovered (0).
-      hover_animation_->Reset();
+      hover_animation_.Reset();
     } else if (state_ == STATE_NORMAL) {
       // For NORMAL -> HOVERED, animate from not hovered (0) to hovered (1).
-      hover_animation_->Show();
+      hover_animation_.Show();
     } else {
       // For PRESSED/DISABLED -> HOVERED, simply set the state to hovered (1).
-      hover_animation_->Reset(1);
+      hover_animation_.Reset(1);
     }
   }
 
   state_ = state;
   StateChanged();
   SchedulePaint();
 }
 
 void CustomButton::StartThrobbing(int cycles_til_stop) {
   is_throbbing_ = true;
-  hover_animation_->StartThrobbing(cycles_til_stop);
+  hover_animation_.StartThrobbing(cycles_til_stop);
 }
 
 void CustomButton::StopThrobbing() {
-  if (hover_animation_->is_animating()) {
-    hover_animation_->Stop();
+  if (hover_animation_.is_animating()) {
+    hover_animation_.Stop();
     SchedulePaint();
   }
 }
 
 void CustomButton::SetAnimationDuration(int duration) {
-  hover_animation_->SetSlideDuration(duration);
+  hover_animation_.SetSlideDuration(duration);
 }
 
 void CustomButton::SetHotTracked(bool is_hot_tracked) {
   if (state_ != STATE_DISABLED)
     SetState(is_hot_tracked ? STATE_HOVERED : STATE_NORMAL);
 
   if (is_hot_tracked)
     NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
 }
 
@@ skipping 121 matching lines @@
     Button::OnGestureEvent(event);
     return;
   }
 
   if (event->type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(*event)) {
     // Set the button state to hot and start the animation fully faded in. The
     // GESTURE_END event issued immediately after will set the state to
     // STATE_NORMAL beginning the fade out animation. See
     // http://crbug.com/131184.
     SetState(STATE_HOVERED);
-    hover_animation_->Reset(1.0);
+    hover_animation_.Reset(1.0);
     NotifyClick(*event);
     event->StopPropagation();
   } else if (event->type() == ui::ET_GESTURE_TAP_DOWN &&
              ShouldEnterPushedState(*event)) {
     SetState(STATE_PRESSED);
     if (request_focus_on_press_)
       RequestFocus();
     event->StopPropagation();
   } else if (event->type() == ui::ET_GESTURE_TAP_CANCEL ||
              event->type() == ui::ET_GESTURE_END) {
@@ skipping 72 matching lines @@
 void CustomButton::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
+      hover_animation_(this),
       animate_on_state_change_(true),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true),
       ink_drop_delegate_(nullptr),
       notify_action_(NOTIFY_ON_RELEASE) {
-  hover_animation_.reset(new gfx::ThrobAnimation(this));
-  hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
+  hover_animation_.SetSlideDuration(kHoverFadeDurationMs);
 }
 
 void CustomButton::StateChanged() {
 }
 
 bool CustomButton::IsTriggerableEvent(const ui::Event& event) {
   return event.type() == ui::ET_GESTURE_TAP_DOWN ||
          event.type() == ui::ET_GESTURE_TAP ||
          (event.IsMouseEvent() &&
              (triggerable_event_flags_ & event.flags()) != 0);
@@ skipping 51 matching lines @@
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views