Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: ui/app_list/views/app_list_folder_view.cc

Issue 302803002: Refactor app list so AppsGridView owns the PaginationModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests and bugs. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {

Powered by Google App Engine
This is Rietveld 408576698