Reset the app list when it is shown on Windows and Linux.

ui/app_list/views/apps_container_view.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/apps_container_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 34 matching lines @@
 
   app_list_folder_view_ = new AppListFolderView(
       this,
       model,
       app_list_main_view,
       start_page_contents);
   AddChildView(app_list_folder_view_);
 
   apps_grid_view_->SetModel(model_);
   apps_grid_view_->SetItemList(model_->item_list());
-  SetShowState(SHOW_APPS,
-               false);  /* show apps without animation */
 }
 
 AppsContainerView::~AppsContainerView() {
 }
 
 void AppsContainerView::ShowActiveFolder(AppListFolderItem* folder_item) {
   app_list_folder_view_->SetAppListFolderItem(folder_item);
   SetShowState(SHOW_ACTIVE_FOLDER, false);
 
   CreateViewsForFolderTopItemsAnimation(folder_item, true);
 }
 
 void AppsContainerView::ShowApps(AppListFolderItem* folder_item) {
   PrepareToShowApps(folder_item);
   SetShowState(SHOW_APPS,
                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);
   app_list_folder_view()->items_grid_view()->
       SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void AppsContainerView::ReparentFolderItemTransit(
     AppListFolderItem* folder_item) {
   PrepareToShowApps(folder_item);
@@ skipping 59 matching lines @@
   show_state_ = show_state;
 
   switch (show_state_) {
     case SHOW_APPS:
       folder_background_view_->SetVisible(false);
       if (show_apps_with_animation) {
         app_list_folder_view_->ScheduleShowHideAnimation(false, false);
         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:
       folder_background_view_->SetVisible(true);
       apps_grid_view_->ScheduleShowHideAnimation(false);
       app_list_folder_view_->ScheduleShowHideAnimation(true, false);
       break;
     case SHOW_ITEM_REPARENT:
       folder_background_view_->SetVisible(false);
       folder_background_view_->UpdateFolderContainerBubble(
@@ skipping 45 matching lines @@
 void AppsContainerView::PrepareToShowApps(AppListFolderItem* folder_item) {
   if (folder_item)
     CreateViewsForFolderTopItemsAnimation(folder_item, false);
 
   // Hide the active folder item until the animation completes.
   if (apps_grid_view_->activated_item_view())
     apps_grid_view_->activated_item_view()->SetVisible(false);
 }
 
 }  // namespace app_list