Refactor app list event handling and prerendering.

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 <vector>
 
 #include "base/logging.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_switcher_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/events/event.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 
 namespace app_list {
 
-namespace {
-
-const int kMinMouseWheelToSwitchPage = 20;
-const int kMinScrollToSwitchPage = 20;
-const int kMinHorizVelocityToSwitchPage = 800;
-
-const double kFinishTransitionThreshold = 0.33;
-
-}  // namespace
-
 ContentsView::ContentsView(AppListMainView* app_list_main_view)
     : search_results_view_(NULL),
       start_page_view_(NULL),
       app_list_main_view_(app_list_main_view),
       contents_switcher_view_(NULL),
       view_model_(new views::ViewModel),
       page_before_search_(0) {
   pagination_model_.AddObserver(this);
 }
 
@@ skipping 181 matching lines @@
 
 PaginationModel* ContentsView::GetAppsPaginationModel() {
   return apps_container_view_->apps_grid_view()->pagination_model();
 }
 
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
   apps_container_view_->ShowActiveFolder(item);
 }
 
 void ContentsView::Prerender() {
-  const int selected_page =
-      std::max(0, GetAppsPaginationModel()->selected_page());
-  apps_container_view_->apps_grid_view()->Prerender(selected_page);
+  apps_container_view_->apps_grid_view()->Prerender();
 }
 
 views::View* ContentsView::GetPageView(int index) {
   return view_model_->view_at(index);
 }
 
 void ContentsView::AddBlankPageForTesting() {
   AddLauncherPage(new views::View, 0);
 }
 
@@ skipping 44 matching lines @@
   for (int i = 0; i < view_model_->view_size(); ++i) {
     view_model_->view_at(i)->SetBoundsRect(
         i == pagination_model_.SelectedTargetPage() ? rect : offscreen_target);
   }
 }
 
 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
   return view_model_->view_at(GetActivePageIndex())->OnKeyPressed(event);
 }
 
-bool ContentsView::OnMouseWheel(const ui::MouseWheelEvent& event) {
-  if (!IsNamedPageActive(NAMED_PAGE_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 (!GetAppsPaginationModel()->has_transition()) {
-      GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
-    }
-    return true;
-  }
-
-  return false;
-}
-
 void ContentsView::TotalPagesChanged() {
 }
 
 void ContentsView::SelectedPageChanged(int old_selected, int new_selected) {
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
-void ContentsView::OnGestureEvent(ui::GestureEvent* event) {
-  if (!IsNamedPageActive(NAMED_PAGE_APPS))
-    return;
-
-  switch (event->type()) {
-    case ui::ET_GESTURE_SCROLL_BEGIN:
-      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.
-      GetAppsPaginationModel()->UpdateScroll(event->details().scroll_x() /
-                                             GetContentsBounds().width());
-      event->SetHandled();
-      return;
-    case ui::ET_GESTURE_SCROLL_END:
-      GetAppsPaginationModel()->EndScroll(
-          GetAppsPaginationModel()->transition().progress <
-          kFinishTransitionThreshold);
-      event->SetHandled();
-      return;
-    case ui::ET_SCROLL_FLING_START: {
-      GetAppsPaginationModel()->EndScroll(true);
-      if (fabs(event->details().velocity_x()) > kMinHorizVelocityToSwitchPage) {
-        GetAppsPaginationModel()->SelectPageRelative(
-            event->details().velocity_x() < 0 ? 1 : -1, true);
-      }
-      event->SetHandled();
-      return;
-    }
-    default:
-      break;
-  }
-}
-
-void ContentsView::OnScrollEvent(ui::ScrollEvent* event) {
-  if (!IsNamedPageActive(NAMED_PAGE_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 (!GetAppsPaginationModel()->has_transition()) {
-      GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
-    }
-    event->SetHandled();
-    event->StopPropagation();
-  }
-}
-
 }  // namespace app_list