CustomButton cleanup: make protected members private, create accessors

ui/views/controls/button/image_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/image_button.h"
 
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 127 matching lines @@
 
 void ImageButton::OnBlur() {
   View::OnBlur();
   if (focus_painter_.get())
     SchedulePaint();
 }
 
 gfx::ImageSkia ImageButton::GetImageToPaint() {
   gfx::ImageSkia img;
 
-  if (!images_[STATE_HOVERED].isNull() && hover_animation_->is_animating()) {
-    img = gfx::ImageSkiaOperations::CreateBlendedImage(images_[STATE_NORMAL],
-        images_[STATE_HOVERED], hover_animation_->GetCurrentValue());
+  if (!images_[STATE_HOVERED].isNull() && hover_animation().is_animating()) {
+    img = gfx::ImageSkiaOperations::CreateBlendedImage(
+        images_[STATE_NORMAL], images_[STATE_HOVERED],
+        hover_animation().GetCurrentValue());
   } else {
-    img = images_[state_];
+    img = images_[state()];
   }
 
   return !img.isNull() ? img : images_[STATE_NORMAL];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, private:
 
 gfx::Point ImageButton::ComputeImagePaintPosition(const gfx::ImageSkia& image) {
   int x = 0, y = 0;
@@ skipping 42 matching lines @@
     gfx::ImageSkia temp = images_[i];
     images_[i] = alternate_images_[i];
     alternate_images_[i] = temp;
   }
   toggled_ = toggled;
   SchedulePaint();
 
   NotifyAccessibilityEvent(ui::AX_EVENT_VALUE_CHANGED, true);
 }
 
-void ToggleImageButton::SetToggledImage(ButtonState state,
+void ToggleImageButton::SetToggledImage(ButtonState image_state,
                                         const gfx::ImageSkia* image) {
   if (toggled_) {
-    images_[state] = image ? *image : gfx::ImageSkia();
-    if (state_ == state)
+    images_[image_state] = image ? *image : gfx::ImageSkia();
+    if (state() == image_state)
       SchedulePaint();
   } else {
-    alternate_images_[state] = image ? *image : gfx::ImageSkia();
+    alternate_images_[image_state] = image ? *image : gfx::ImageSkia();
   }
 }
 
 void ToggleImageButton::SetToggledTooltipText(const base::string16& tooltip) {
   toggled_tooltip_text_ = tooltip;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, ImageButton overrides:
 
-const gfx::ImageSkia& ToggleImageButton::GetImage(ButtonState state) const {
+const gfx::ImageSkia& ToggleImageButton::GetImage(
+    ButtonState image_state) const {
   if (toggled_)
-    return alternate_images_[state];
-  return images_[state];
+    return alternate_images_[image_state];
+  return images_[image_state];
 }
 
-void ToggleImageButton::SetImage(ButtonState state,
+void ToggleImageButton::SetImage(ButtonState image_state,
                                  const gfx::ImageSkia* image) {
   if (toggled_) {
-    alternate_images_[state] = image ? *image : gfx::ImageSkia();
+    alternate_images_[image_state] = image ? *image : gfx::ImageSkia();
   } else {
-    images_[state] = image ? *image : gfx::ImageSkia();
-    if (state_ == state)
+    images_[image_state] = image ? *image : gfx::ImageSkia();
+    if (state() == image_state)
       SchedulePaint();
   }
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, View overrides:
 
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
                                        base::string16* tooltip) const {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 void ToggleImageButton::GetAccessibleState(ui::AXViewState* state) {
   ImageButton::GetAccessibleState(state);
   GetTooltipText(gfx::Point(), &state->name);
 }
 
 }  // namespace views