CustomButton cleanup: make protected members private, create accessors

chrome/browser/ui/views/toolbar/toolbar_button.cc

Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 808e450ab02544f0e0ca7a8870b5297cc3cfd350..af4d4f1ffe70d9b4d3bb88d8b6b161a7f21f1265 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -154,7 +154,7 @@ void ToolbarButton::OnMouseExited(const ui::MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   // A right click release triggers an exit event. We want to
   // remain in a PUSHED state until the drop down menu closes.
-  if (state_ != STATE_DISABLED && !InDrag() && state_ != STATE_PRESSED)
+  if (state() != STATE_DISABLED && !InDrag() && state() != STATE_PRESSED)
     SetState(STATE_NORMAL);
 }
 
@@ -346,7 +346,7 @@ void ToolbarButton::ShowDropDownMenu(ui::MenuSourceType source_type) {
   SetMouseHandler(nullptr);
 
   // Set the state back to normal after the drop down menu is closed.
-  if (state_ != STATE_DISABLED)
+  if (state() != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }