CustomButton cleanup: make protected members private, create accessors

ui/views/controls/button/custom_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/throb_animation.h"
 #include "ui/views/animation/ink_drop_state.h"
 #include "ui/views/controls/button/button.h"
 
-namespace gfx {
-class ThrobAnimation;
-}
-
 namespace views {
 
 class InkDropDelegate;
 
 // A button with custom rendering. The base of ImageButton and LabelButton.
 // Note that this type of button is not focusable by default and will not be
 // part of the focus chain.  Call SetFocusable(true) to make it part of the
 // focus chain.
 class VIEWS_EXPORT CustomButton : public Button,
                                   public gfx::AnimationDelegate {
@@ skipping 111 matching lines @@
   // Overridden from View:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   void OnBlur() override;
 
   // Overridden from Button:
   void NotifyClick(const ui::Event& event) override;
   void OnClickCanceled(const ui::Event& event) override;
 
-  // The button state (defined in implementation)
-  ButtonState state_;
-
-  // Hover animation.
-  scoped_ptr<gfx::ThrobAnimation> hover_animation_;
+  const gfx::ThrobAnimation& hover_animation() const {
+    return hover_animation_;
+  }
 
  private:
   // Returns true if this is not a top level widget. Virtual for tests.
   virtual bool IsChildWidget() const;
   // Returns true if the focus is not in a top level widget. Virtual for tests.
   virtual bool FocusInChildWidget() const;
 
+  ButtonState state_;
+
+  gfx::ThrobAnimation hover_animation_;
+
   // Should we animate when the state changes? Defaults to true.
   bool animate_on_state_change_;
 
   // Is the hover animation running because StartThrob was invoked?
   bool is_throbbing_;
 
   // Mouse event flags which can trigger button actions.
   int triggerable_event_flags_;
 
   // See description above setter.
@@ skipping 15 matching lines @@
   // The animation action to trigger on the |ink_drop_delegate_| when the button
   // is clicked.
   InkDropState ink_drop_action_on_click_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_