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

Unified Diff: ui/app_list/views/contents_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/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 688d8d677981d408e7dab0adbff71b10c883bd54..afb598b6b36834c2e1d35d5d459ada68b49ae1a3 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -53,25 +53,25 @@ StartPageView* GetStartPageView(views::ViewModel* model) {
} // namespace
ContentsView::ContentsView(AppListMainView* app_list_main_view,
- PaginationModel* pagination_model,
AppListModel* model,
AppListViewDelegate* view_delegate)
: show_state_(SHOW_APPS),
- pagination_model_(pagination_model),
+ pagination_model_(NULL),
start_page_view_(NULL),
app_list_main_view_(app_list_main_view),
view_model_(new views::ViewModel),
bounds_animator_(new views::BoundsAnimator(this)) {
DCHECK(model);
- pagination_model_->SetTransitionDurations(
- kPageTransitionDurationInMs,
- kOverscrollPageTransitionDurationMs);
- apps_container_view_ =
- new AppsContainerView(app_list_main_view, pagination_model, model);
+ apps_container_view_ = new AppsContainerView(app_list_main_view, model);
AddChildView(apps_container_view_);
view_model_->Add(apps_container_view_, kIndexAppsContainer);
+ pagination_model_ =
+ apps_container_view_->apps_grid_view()->GetPaginationModel();
+ pagination_model_->SetTransitionDurations(
tapted 2014/06/02 04:02:21 This would be nicer in AppsGridView IMO (or even e
Matt Giuca 2014/06/02 07:11:23 Done.
+ kPageTransitionDurationInMs, kOverscrollPageTransitionDurationMs);
+
SearchResultListView* search_results_view = new SearchResultListView(
app_list_main_view, view_delegate);
AddChildView(search_results_view);

Powered by Google App Engine
This is Rietveld 408576698