Make cancelling of app list correctly clean up folder UI.

ui/app_list/views/apps_grid_view.h

Index: ui/app_list/views/apps_grid_view.h
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
index 1b382abe3b30118790b3a264fa3e5d729b7173ae..c78d47609aa4fa489a41e9c1cb3eff640c151847 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -50,6 +50,7 @@ class AppsGridViewTestApi;
 class ApplicationDragAndDropHost;
 class AppListItemView;
 class AppsGridViewDelegate;
+class AppsGridViewFolderDelegate;
 class PageSwitcher;
 class PaginationModel;
 
@@ -198,7 +199,9 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
     return forward_events_to_drag_and_drop_host_;
   }
 
-  void set_is_root_level(bool value) { is_root_level_ = value; }
+  void set_folder_delegate(AppsGridViewFolderDelegate* folder_delegate) {
+    folder_delegate_ = folder_delegate;
+  }
 
   AppListItemView* activated_item_view() const {
     return activated_item_view_;
@@ -438,6 +441,7 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
   AppListModel* model_;  // Owned by AppListView.
   AppListItemList* item_list_;  // Not owned.
   AppsGridViewDelegate* delegate_;
+  AppsGridViewFolderDelegate* folder_delegate_;

[tapted, 2014/03/26 02:53:54]

I think this needs a more verbose comment, to say it can be NULL, and that only
the GridViews used inside folders have a folder_delegate.

I wonder if we could even inherit from AppsGridView for this... but that would
be something to explore in a follow-up.

[calamity, 2014/03/27 05:14:44]

Done.

   PaginationModel* pagination_model_;  // Owned by AppListController.
   PageSwitcher* page_switcher_view_;  // Owned by views hierarchy.
   views::WebView* start_page_view_;  // Owned by views hierarchy.
@@ -513,9 +517,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
 
   views::BoundsAnimator bounds_animator_;
 
-  // If true, AppsGridView is rending items at the root level of the app list.
-  bool is_root_level_;
-
   // The most recent activated item view.
   AppListItemView* activated_item_view_;