Index: ui/app_list/views/app_list_folder_view.cc |
diff --git a/ui/app_list/views/app_list_folder_view.cc b/ui/app_list/views/app_list_folder_view.cc |
index 6ad42fbdfcecb1445605914cf7046c64487df57c..fb7ddb73899d5e0422597193f91cc0cbb5603256 100644 |
--- a/ui/app_list/views/app_list_folder_view.cc |
+++ b/ui/app_list/views/app_list_folder_view.cc |
@@ -11,7 +11,6 @@ |
#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" |
@@ -51,13 +50,11 @@ AppListFolderView::AppListFolderView(AppsContainerView* container_view, |
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, |
@@ -77,8 +74,6 @@ AppListFolderView::AppListFolderView(AppsContainerView* container_view, |
AppListFolderView::~AppListFolderView() { |
model_->RemoveObserver(this); |
- // Make sure |items_grid_view_| is deleted before |pagination_model_|. |
- RemoveAllChildViews(true); |
} |
void AppListFolderView::SetAppListFolderItem(AppListFolderItem* folder) { |