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

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

Issue 220393003: Add a unit test for resetting the app list on a reshow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trent_whole_app_list_unit_test
Patch Set: fix NULL icon cases for app list folders Created 6 years, 7 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') | ui/app_list/views/test/apps_grid_view_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_container_view.cc
diff --git a/ui/app_list/views/apps_container_view.cc b/ui/app_list/views/apps_container_view.cc
index 7e5adf7a16d37408d95e131f6ad43bc345d94291..f742260377b695ddc874c8ba880394da0da3adaf 100644
--- a/ui/app_list/views/apps_container_view.cc
+++ b/ui/app_list/views/apps_container_view.cc
@@ -43,6 +43,8 @@ AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view,
app_list_folder_view_ =
new AppListFolderView(this, model, app_list_main_view);
+ // The folder view is initially hidden.
+ app_list_folder_view_->SetVisible(false);
AddChildView(app_list_folder_view_);
apps_grid_view_->SetModel(model_);
@@ -208,6 +210,9 @@ void AppsContainerView::CreateViewsForFolderTopItemsAnimation(
top_icon_animation_pending_count_ =
std::min(kNumFolderTopItems, active_folder->item_list()->item_count());
for (size_t i = 0; i < top_icon_animation_pending_count_; ++i) {
+ if (active_folder->GetTopIcon(i).isNull())
+ continue;
+
TopIconAnimationView* icon_view = new TopIconAnimationView(
active_folder->GetTopIcon(i), top_items_bounds[i], open_folder);
icon_view->AddObserver(this);
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/test/apps_grid_view_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698