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

ui/app_list/views/apps_container_view.h

Index: ui/app_list/views/apps_container_view.h
diff --git a/ui/app_list/views/apps_container_view.h b/ui/app_list/views/apps_container_view.h
index 7b23f8fe5ec7cd4da02e200052565c2ace6a993b..075dadc006329168b71f32798a29fce8662423c4 100644
--- a/ui/app_list/views/apps_container_view.h
+++ b/ui/app_list/views/apps_container_view.h
@@ -19,6 +19,7 @@ class AppsGridView;
 class ApplicationDragAndDropHost;
 class AppListFolderItem;
 class AppListFolderView;
+class AppListItemView;
 class AppListMainView;
 class AppListModel;
 class ContentsView;
@@ -44,6 +45,8 @@ class AppsContainerView : public views::View,
   // a folder view with |folder_item|. If |folder_item| is NULL skips animation.
   void ShowApps(AppListFolderItem* folder_item);
 
+  void ResetForShow();
+
   // Sets |drag_and_drop_host_| for the current app list in both
   // app_list_folder_view_ and root level apps_grid_view_.
   void SetDragAndDropHostOfCurrentAppList(
@@ -95,6 +98,9 @@ class AppsContainerView : public views::View,
   FolderBackgroundView* folder_background_view_;  // Owned by views hierarchy.
   ShowState show_state_;
 
+  // The currently active folder view, if any.
+  AppListItemView* activated_folder_view_;
+
   // The transitional views for animating the top items in folder
   // when opening or closing a folder.
   std::vector<views::View*> top_icon_views_;