Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: ui/app_list/views/app_list_item_view.cc

Issue 1534303002: CustomButton cleanup: make protected members private, create accessors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dont move declaration randomly Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/frame/caption_buttons/frame_caption_button.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « mash/wm/frame/caption_buttons/frame_caption_button.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698