CustomButton cleanup: make protected members private, create accessors

ui/app_list/views/app_list_item_view.cc

Index: ui/app_list/views/app_list_item_view.cc
diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc
index 340bc5d93101202d89f0827d5db0e66fe3b3f3e4..d669696021d205df760340802174d7aaa596bcea 100644
--- a/ui/app_list/views/app_list_item_view.cc
+++ b/ui/app_list/views/app_list_item_view.cc
@@ -143,11 +143,11 @@ void AppListItemView::SetIcon(const gfx::ImageSkia& icon) {
   shadow_animator_.SetOriginalImage(resized);
 }
 
-void AppListItemView::SetUIState(UIState state) {
-  if (ui_state_ == state)
+void AppListItemView::SetUIState(UIState ui_state) {
+  if (ui_state_ == ui_state)
     return;
 
-  ui_state_ = state;
+  ui_state_ = ui_state;
 
   switch (ui_state_) {
     case UI_STATE_NORMAL:
@@ -466,14 +466,14 @@ void AppListItemView::OnGestureEvent(ui::GestureEvent* event) {
       }
       break;
     case ui::ET_GESTURE_TAP_DOWN:
-      if (::switches::IsTouchFeedbackEnabled() && state_ != STATE_DISABLED) {
+      if (::switches::IsTouchFeedbackEnabled() && state() != STATE_DISABLED) {
         SetState(STATE_PRESSED);
         event->SetHandled();
       }
       break;
     case ui::ET_GESTURE_TAP:
     case ui::ET_GESTURE_TAP_CANCEL:
-      if (::switches::IsTouchFeedbackEnabled() && state_ != STATE_DISABLED)
+      if (::switches::IsTouchFeedbackEnabled() && state() != STATE_DISABLED)
         SetState(STATE_NORMAL);
       break;
     case ui::ET_GESTURE_LONG_PRESS: