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

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

Issue 897583002: Ignore updates to app list Most Likely apps when animating off the start page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@doodle_static
Patch Set: fix_test Created 5 years, 11 months 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 | « ui/app_list/views/app_list_view_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698