| 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 95ec3b74bc04496173480e22ba39820bad770fe9..bdff83d586894183ec332c0109a97d4acfc07435 100644
|
| --- a/ui/app_list/views/apps_container_view.cc
|
| +++ b/ui/app_list/views/apps_container_view.cc
|
| @@ -52,8 +52,6 @@ AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view,
|
|
|
| apps_grid_view_->SetModel(model_);
|
| apps_grid_view_->SetItemList(model_->item_list());
|
| - SetShowState(SHOW_APPS,
|
| - false); /* show apps without animation */
|
| }
|
|
|
| AppsContainerView::~AppsContainerView() {
|
| @@ -72,6 +70,12 @@ void AppsContainerView::ShowApps(AppListFolderItem* folder_item) {
|
| true); /* show apps with animation */
|
| }
|
|
|
| +void AppsContainerView::ResetForShow() {
|
| + SetShowState(SHOW_APPS, false /* show apps without animation */);
|
| + folder_background_view_->UpdateFolderContainerBubble(
|
| + FolderBackgroundView::NO_BUBBLE);
|
| +}
|
| +
|
| void AppsContainerView::SetDragAndDropHostOfCurrentAppList(
|
| ApplicationDragAndDropHost* drag_and_drop_host) {
|
| apps_grid_view()->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
|
| @@ -151,7 +155,7 @@ void AppsContainerView::SetShowState(ShowState show_state,
|
| apps_grid_view_->ScheduleShowHideAnimation(true);
|
| } else {
|
| app_list_folder_view_->HideViewImmediately();
|
| - apps_grid_view_->SetVisible(true);
|
| + apps_grid_view_->ResetForShow();
|
| }
|
| break;
|
| case SHOW_ACTIVE_FOLDER:
|
|
|