Make cancelling of app list correctly clean up folder UI.

ui/app_list/views/apps_grid_view.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
 #define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 33 matching lines @@
 class SynchronousDrag;
 #endif
 
 namespace test {
 class AppsGridViewTestApi;
 }
 
 class ApplicationDragAndDropHost;
 class AppListItemView;
 class AppsGridViewDelegate;
+class AppsGridViewFolderDelegate;
 class PageSwitcher;
 class PaginationModel;
 
 // AppsGridView displays a grid for AppListItemList sub model.
 class APP_LIST_EXPORT AppsGridView : public views::View,
                                      public views::ButtonListener,
                                      public AppListItemListObserver,
                                      public PaginationModelObserver,
                                      public AppListModelObserver,
                                      public ui::ImplicitAnimationObserver {
@@ skipping 125 matching lines @@
   const views::ViewModel* view_model_for_test() const { return &view_model_; }
 
   // For test: Return if the drag and drop handler was set.
   bool has_drag_and_drop_host_for_test() { return NULL != drag_and_drop_host_; }
 
   // For test: Return if the drag and drop operation gets dispatched.
   bool forward_events_to_drag_and_drop_host_for_test() {
     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_;
   }
 
  private:
   friend class test::AppsGridViewTestApi;
 
   enum DropAttempt {
     DROP_FOR_NONE,
@@ skipping 210 matching lines @@
   // Updates drag state for dragging inside a folder's grid view.
   void UpdateDragStateInsideFolder(Pointer pointer,
       const ui::LocatedEvent& event);
 
   // Returns true if drag event is happening in the root level AppsGridView
   // for reparenting a folder item.
   bool IsDraggingForReparentInRootLevelGridView() const;
 
   // Returns true if drag event is happening in the hidden AppsGridView of the
   // folder during reparenting a folder item.
-  bool IsDraggingForReprentInHiddenGridView() const;
+  bool IsDraggingForReparentInHiddenGridView() const;
 
   // Returns the target icon bounds for |drag_item_view| to fly back
   // to its parent |folder_item_view| in animation.
   gfx::Rect GetTargetIconRectInFolder(AppListItemView* drag_item_view,
       AppListItemView* folder_item_view);
 
   // Returns true if the grid view is under an OEM folder.
   bool IsUnderOEMFolder();
 
   AppListModel* model_;  // Owned by AppListView.
   AppListItemList* item_list_;  // Not owned.
   AppsGridViewDelegate* delegate_;
+
+  // This can be NULL. Only grid views inside folders have a folder delegate.
+  AppsGridViewFolderDelegate* folder_delegate_;
+
   PaginationModel* pagination_model_;  // Owned by AppListController.
   PageSwitcher* page_switcher_view_;  // Owned by views hierarchy.
 
   gfx::Size icon_size_;
   int cols_;
   int rows_per_page_;
 
   // Tracks app item views. There is a view per item in |model_|.
   views::ViewModel view_model_;
 
@@ skipping 54 matching lines @@
 
   // Target page to switch to when |page_flip_timer_| fires.
   int page_flip_target_;
 
   // Delay in milliseconds of when |page_flip_timer_| should fire after user
   // drags an item near the edges.
   int page_flip_delay_in_ms_;
 
   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_;
 
   // Tracks if drag_view_ is dragged out of the folder container bubble
   // when dragging a item inside a folder.
   bool drag_out_of_folder_container_;
 
   // True if the drag_view_ item is a folder item being dragged for reparenting.
   bool dragging_for_reparent_item_;
 
   base::WeakPtrFactory<AppsGridView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsGridView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_