CustomButton cleanup: make protected members private, create accessors

chrome/browser/ui/views/tabs/media_indicator_button.cc

 // Copyright 2014 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 "chrome/browser/ui/views/tabs/media_indicator_button.h"
 
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 130 matching lines @@
 views::View* MediaIndicatorButton::GetTooltipHandlerForPoint(
     const gfx::Point& point) {
   return NULL;  // Tab (the parent View) provides the tooltip.
 }
 
 bool MediaIndicatorButton::OnMousePressed(const ui::MouseEvent& event) {
   // Do not handle this mouse event when anything but the left mouse button is
   // pressed or when any modifier keys are being held down.  Instead, the Tab
   // should react (e.g., middle-click for close, right-click for context menu).
   if (event.flags() != ui::EF_LEFT_MOUSE_BUTTON) {
-    if (state_ != views::CustomButton::STATE_DISABLED)
+    if (state() != views::CustomButton::STATE_DISABLED)
       SetState(views::CustomButton::STATE_NORMAL);  // Turn off hover.
     return false;  // Event to be handled by Tab.
   }
   return ImageButton::OnMousePressed(event);
 }
 
 bool MediaIndicatorButton::OnMouseDragged(const ui::MouseEvent& event) {
   const ButtonState previous_state = state();
   const bool ret = ImageButton::OnMouseDragged(event);
   if (previous_state != views::CustomButton::STATE_NORMAL &&
       state() == views::CustomButton::STATE_NORMAL)
     content::RecordAction(UserMetricsAction("MediaIndicatorButton_Dragged"));
   return ret;
 }
 
 void MediaIndicatorButton::OnMouseEntered(const ui::MouseEvent& event) {
   // If any modifier keys are being held down, do not turn on hover.
-  if (state_ != views::CustomButton::STATE_DISABLED &&
+  if (state() != views::CustomButton::STATE_DISABLED &&
       event.flags() != ui::EF_NONE) {
     SetState(views::CustomButton::STATE_NORMAL);
     return;
   }
   ImageButton::OnMouseEntered(event);
 }
 
 void MediaIndicatorButton::OnMouseMoved(const ui::MouseEvent& event) {
   // If any modifier keys are being held down, turn off hover.
-  if (state_ != views::CustomButton::STATE_DISABLED &&
+  if (state() != views::CustomButton::STATE_DISABLED &&
       event.flags() != ui::EF_NONE) {
     SetState(views::CustomButton::STATE_NORMAL);
     return;
   }
   ImageButton::OnMouseMoved(event);
 }
 
 void MediaIndicatorButton::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   UpdateEnabledForMuteToggle();
 }
@@ skipping 56 matching lines @@
   SkColor color = parent_tab_->button_color();
   gfx::ImageSkia indicator_image =
       chrome::GetTabMediaIndicatorImage(state, color).AsImageSkia();
   SetImage(views::CustomButton::STATE_NORMAL, &indicator_image);
   SetImage(views::CustomButton::STATE_DISABLED, &indicator_image);
   gfx::ImageSkia affordance_image =
       chrome::GetTabMediaIndicatorAffordanceImage(state, color).AsImageSkia();
   SetImage(views::CustomButton::STATE_HOVERED, &affordance_image);
   SetImage(views::CustomButton::STATE_PRESSED, &affordance_image);
 }