Chromium Code Reviews| Index: ui/app_list/views/start_page_view.cc |
| diff --git a/ui/app_list/views/start_page_view.cc b/ui/app_list/views/start_page_view.cc |
| index 01ea2d608ce84fb1433bf51dca21b478eb9109ae..63f07239277c0bfc817e496b812e4e0a5a23b045 100644 |
| --- a/ui/app_list/views/start_page_view.cc |
| +++ b/ui/app_list/views/start_page_view.cc |
| @@ -234,6 +234,15 @@ void StartPageView::UpdateCustomPageClickzoneVisibility() { |
| } |
| int StartPageView::Update() { |
| + // Ignore updates and disable buttons when transitioning to a different state. |
| + if (app_list_main_view_->contents_view()->GetActiveState() != |
| + AppListModel::STATE_START) { |
| + for (size_t i = 0; i < search_result_tile_views_.size(); ++i) |
|
Matt Giuca
2015/02/04 05:55:24
for (auto& view : search_result_tile_views_)
...
|
| + search_result_tile_views_[i]->SetEnabled(false); |
| + |
| + return num_results(); |
| + } |
| + |
| std::vector<SearchResult*> display_results = |
| AppListModel::FilterSearchResultsByDisplayType( |
| results(), SearchResult::DISPLAY_RECOMMENDATION, kNumStartPageTiles); |
| @@ -244,6 +253,7 @@ int StartPageView::Update() { |
| if (i < display_results.size()) |
| item = display_results[i]; |
| search_result_tile_views_[i]->SetSearchResult(item); |
| + search_result_tile_views_[i]->SetEnabled(true); |
| } |
| tiles_container_->Layout(); |