Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 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/contents_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 35 matching lines @@
       model->view_at(kIndexSearchResults));
 }
 
 StartPageView* GetStartPageView(views::ViewModel* model) {
   return static_cast<StartPageView*>(model->view_at(kIndexStartPage));
 }
 
 }  // 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 encapsulated entirely in
PaginationModel, but I think it might be used for some tests). some constants
might need to be moved, but I don't seem them at a quick glance - they might
already be in app_list_constants.h

[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);
   view_model_->Add(search_results_view, kIndexSearchResults);
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     start_page_view_ = new StartPageView(app_list_main_view, view_delegate);
     AddChildView(start_page_view_);
     view_model_->Add(start_page_view_, kIndexStartPage);
   }
@@ skipping 225 matching lines @@
     if (!pagination_model_->has_transition()) {
       pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
                                             true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list