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),
       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);
 
   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);
@@ skipping 105 matching lines @@
 }
 
 void ContentsView::AnimateToIdealBounds() {
   CalculateIdealBounds();
   for (int i = 0; i < view_model_->view_size(); ++i) {
     bounds_animator_->AnimateViewTo(view_model_->view_at(i),
                                     view_model_->ideal_bounds(i));
   }
 }
 
+PaginationModel* ContentsView::GetAppsPaginationModel() {
+  return apps_container_view_->apps_grid_view()->pagination_model();
+}
+
 void ContentsView::ShowSearchResults(bool show) {
   SetShowState(show ? SHOW_SEARCH_RESULTS : SHOW_APPS);
 }
 
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
   apps_container_view_->ShowActiveFolder(item);
 }
 
 void ContentsView::Prerender() {
-  const int selected_page = std::max(0, pagination_model_->selected_page());
+  const int selected_page =
+      std::max(0, GetAppsPaginationModel()->selected_page());
   apps_container_view_->apps_grid_view()->Prerender(selected_page);
 }
 
 gfx::Size ContentsView::GetPreferredSize() const {
   const gfx::Size container_size = GetAppsContainerView(view_model_.get())->
       apps_grid_view()->GetPreferredSize();
   const gfx::Size results_size =
       GetSearchResultListView(view_model_.get())->GetPreferredSize();
 
   int width = std::max(container_size.width(), results_size.width());
@@ skipping 24 matching lines @@
   if (show_state_ != SHOW_APPS)
     return false;
 
   int offset;
   if (abs(event.x_offset()) > abs(event.y_offset()))
     offset = event.x_offset();
   else
     offset = event.y_offset();
 
   if (abs(offset) > kMinMouseWheelToSwitchPage) {
-    if (!pagination_model_->has_transition()) {
-      pagination_model_->SelectPageRelative(
-          offset > 0 ? -1 : 1, true);
+    if (!GetAppsPaginationModel()->has_transition()) {
+      GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     return true;
   }
 
   return false;
 }
 
 void ContentsView::OnGestureEvent(ui::GestureEvent* event) {
   if (show_state_ != SHOW_APPS)
     return;
 
   switch (event->type()) {
     case ui::ET_GESTURE_SCROLL_BEGIN:
-      pagination_model_->StartScroll();
+      GetAppsPaginationModel()->StartScroll();
       event->SetHandled();
       return;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       // event->details.scroll_x() > 0 means moving contents to right. That is,
       // transitioning to previous page.
-      pagination_model_->UpdateScroll(
-          event->details().scroll_x() / GetContentsBounds().width());
+      GetAppsPaginationModel()->UpdateScroll(event->details().scroll_x() /
+                                             GetContentsBounds().width());
       event->SetHandled();
       return;
     case ui::ET_GESTURE_SCROLL_END:
-      pagination_model_->EndScroll(pagination_model_->
-          transition().progress < kFinishTransitionThreshold);
+      GetAppsPaginationModel()->EndScroll(
+          GetAppsPaginationModel()->transition().progress <
+          kFinishTransitionThreshold);
       event->SetHandled();
       return;
     case ui::ET_SCROLL_FLING_START: {
-      pagination_model_->EndScroll(true);
+      GetAppsPaginationModel()->EndScroll(true);
       if (fabs(event->details().velocity_x()) > kMinHorizVelocityToSwitchPage) {
-        pagination_model_->SelectPageRelative(
-            event->details().velocity_x() < 0 ? 1 : -1,
-            true);
+        GetAppsPaginationModel()->SelectPageRelative(
+            event->details().velocity_x() < 0 ? 1 : -1, true);
       }
       event->SetHandled();
       return;
     }
     default:
       break;
   }
 }
 
 void ContentsView::OnScrollEvent(ui::ScrollEvent* event) {
   if (show_state_ != SHOW_APPS ||
       event->type() == ui::ET_SCROLL_FLING_CANCEL) {
     return;
   }
 
   float offset;
   if (std::abs(event->x_offset()) > std::abs(event->y_offset()))
     offset = event->x_offset();
   else
     offset = event->y_offset();
 
   if (std::abs(offset) > kMinScrollToSwitchPage) {
-    if (!pagination_model_->has_transition()) {
-      pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
-                                            true);
+    if (!GetAppsPaginationModel()->has_transition()) {
+      GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list