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 13df6264fb4acc17c8e8f1b0ee297dae26f7be20..ff791a1d71e8ee42e215592a6a52d1870475ffd8 100644 |
--- a/ui/app_list/views/app_list_item_view.cc |
+++ b/ui/app_list/views/app_list_item_view.cc |
@@ -144,11 +144,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: |
@@ -467,14 +467,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: |