Refactor app list so AppsGridView owns the PaginationModel.

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 "grit/ui_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_model.h"
-#include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/folder_background_view.h"
 #include "ui/app_list/views/folder_header_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
@@ skipping 19 matching lines @@
 
 AppListFolderView::AppListFolderView(AppsContainerView* container_view,
                                      AppListModel* model,
                                      AppListMainView* app_list_main_view)
     : container_view_(container_view),
       app_list_main_view_(app_list_main_view),
       folder_header_view_(new FolderHeaderView(this)),
       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_ = new AppsGridView(app_list_main_view_);
   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);
   SetFillsBoundsOpaquely(false);
 #endif
 
   model_->AddObserver(this);
 }
 
 AppListFolderView::~AppListFolderView() {
   model_->RemoveObserver(this);
-  // Make sure |items_grid_view_| is deleted before |pagination_model_|.
-  RemoveAllChildViews(true);
 }
 
 void AppListFolderView::SetAppListFolderItem(AppListFolderItem* folder) {
   accessible_name_ = ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
       IDS_APP_LIST_FOLDER_OPEN_FOLDER_ACCESSIBILE_NAME);
   NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 
   folder_item_ = folder;
   items_grid_view_->SetItemList(folder_item_->item_list());
   folder_header_view_->SetFolderItem(folder_item_);
@@ skipping 228 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