Make cancelling of app list correctly clean up folder UI.

ui/app_list/views/app_list_folder_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/app_list_folder_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.h"
@@ skipping 38 matching lines @@
       view_model_(new views::ViewModel),
       model_(model),
       folder_item_(NULL),
       pagination_model_(new PaginationModel),
       hide_for_reparent_(false) {
   AddChildView(folder_header_view_);
   view_model_->Add(folder_header_view_, kIndexFolderHeader);
 
   items_grid_view_ =
       new AppsGridView(app_list_main_view_, pagination_model_.get());
-  items_grid_view_->set_is_root_level(false);
+  items_grid_view_->set_folder_delegate(this);
   items_grid_view_->SetLayout(
       kPreferredIconDimension,
       container_view->apps_grid_view()->cols(),
       container_view->apps_grid_view()->rows_per_page());
   items_grid_view_->SetModel(model);
   AddChildView(items_grid_view_);
   view_model_->Add(items_grid_view_, kIndexChildItems);
 
 #if defined(USE_AURA)
   SetPaintToLayer(true);
@@ skipping 149 matching lines @@
 
   container_view_->folder_background_view()->UpdateFolderContainerBubble(
       show_bubble ? FolderBackgroundView::SHOW_BUBBLE :
                     FolderBackgroundView::HIDE_BUBBLE);
 }
 
 void AppListFolderView::UpdateFolderNameVisibility(bool visible) {
   folder_header_view_->UpdateFolderNameVisibility(visible);
 }
 
-bool AppListFolderView::IsPointOutsideOfFolderBoundray(
+bool AppListFolderView::IsPointOutsideOfFolderBoundary(
     const gfx::Point& point) {
   if (!GetLocalBounds().Contains(point))
     return true;
 
   gfx::Point center = GetLocalBounds().CenterPoint();
   float delta = (point - center).Length();
   return delta > container_view_->folder_background_view()->
       GetFolderContainerBubbleRadius() + kOutOfFolderContainerBubbleDelta;
 }
 
@@ skipping 49 matching lines @@
 void AppListFolderView::GiveBackFocusToSearchBox() {
   app_list_main_view_->search_box_view()->search_box()->RequestFocus();
 }
 
 void AppListFolderView::SetItemName(AppListFolderItem* item,
                                     const std::string& name) {
   model_->SetItemName(item, name);
 }
 
 }  // namespace app_list