| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/app_list/app_list_item_view.h" | 5 #include "ui/app_list/app_list_item_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 if (state() == BS_HOT || state() == BS_PUSHED) { | 299 if (state() == BS_HOT || state() == BS_PUSHED) { |
| 300 apps_grid_view_->SetSelectedItem(this); | 300 apps_grid_view_->SetSelectedItem(this); |
| 301 title_->SetEnabledColor(kTitleHoverColor); | 301 title_->SetEnabledColor(kTitleHoverColor); |
| 302 } else { | 302 } else { |
| 303 apps_grid_view_->ClearSelectedItem(this); | 303 apps_grid_view_->ClearSelectedItem(this); |
| 304 model_->SetHighlighted(false); | 304 model_->SetHighlighted(false); |
| 305 title_->SetEnabledColor(kTitleColor); | 305 title_->SetEnabledColor(kTitleColor); |
| 306 } | 306 } |
| 307 } | 307 } |
| 308 | 308 |
| 309 bool AppListItemView::ShouldEnterPushedState(const ui::Event& event) { |
| 310 // Don't enter pushed state for ET_GESTURE_TAP_DOWN so that hover gray |
| 311 // background does not show up during scroll. |
| 312 if (event.type() == ui::ET_GESTURE_TAP_DOWN) |
| 313 return false; |
| 314 |
| 315 return views::CustomButton::ShouldEnterPushedState(event); |
| 316 } |
| 317 |
| 309 } // namespace app_list | 318 } // namespace app_list |
| OLD | NEW |