CustomButton cleanup: make protected members private, create accessors

ui/app_list/views/app_list_item_view.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/app_list/views/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 125 matching lines @@
     return;
   }
 
   gfx::ImageSkia resized(gfx::ImageSkiaOperations::CreateResizedImage(
       icon,
       skia::ImageOperations::RESIZE_BEST,
       gfx::Size(kGridIconDimension, kGridIconDimension)));
   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:
       title_->SetVisible(!is_installing_);
       progress_bar_->SetVisible(is_installing_);
       break;
     case UI_STATE_DRAGGING:
       title_->SetVisible(false);
       progress_bar_->SetVisible(false);
       break;
@@ skipping 298 matching lines @@
       break;
     case ui::ET_GESTURE_SCROLL_END:
     case ui::ET_SCROLL_FLING_START:
       if (touch_dragging_) {
         SetTouchDragging(false);
         apps_grid_view_->EndDrag(false);
         event->SetHandled();
       }
       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:
       if (!apps_grid_view_->has_dragged_view())
         SetTouchDragging(true);
       event->SetHandled();
       break;
     case ui::ET_GESTURE_LONG_TAP:
     case ui::ET_GESTURE_END:
       if (touch_dragging_)
@@ skipping 85 matching lines @@
   SetItemPercentDownloaded(item_weak_->percent_downloaded());
 }
 
 void AppListItemView::ItemBeingDestroyed() {
   DCHECK(item_weak_);
   item_weak_->RemoveObserver(this);
   item_weak_ = NULL;
 }
 
 }  // namespace app_list