| 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 a56b3a925caab800df8c714c30dc2ebbe63d5be7..a6843928fd2f9d7ff2ac98598c14b3cb807da1a6 100644
|
| --- a/ui/app_list/views/apps_container_view.cc
|
| +++ b/ui/app_list/views/apps_container_view.cc
|
| @@ -66,6 +66,12 @@ void AppsContainerView::ShowApps(AppListFolderItem* folder_item) {
|
| true); /* show apps with animation */
|
| }
|
|
|
| +void AppsContainerView::ResetForShowApps() {
|
| + 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);
|
| @@ -145,7 +151,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_->ResetForShowApps();
|
| }
|
| break;
|
| case SHOW_ACTIVE_FOLDER:
|
|
|