Make start page fill app list bounds.

ui/app_list/views/contents_animator.cc

 // Copyright 2014 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_animator.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
@@ skipping 18 matching lines @@
 
 // ContentsAnimator
 
 ContentsAnimator::ContentsAnimator(ContentsView* contents_view)
     : contents_view_(contents_view) {
 }
 
 ContentsAnimator::~ContentsAnimator() {
 }
 
-gfx::Rect ContentsAnimator::GetOnscreenPageBounds(int page_index) const {
-  return contents_view_->GetPageIndexForState(
-             AppListModel::STATE_CUSTOM_LAUNCHER_PAGE) == page_index
-             ? contents_view_->GetContentsBounds()
-             : contents_view_->GetDefaultContentsBounds();
-}
-
-gfx::Rect ContentsAnimator::GetOffscreenPageBounds(int page_index) const {
-  gfx::Rect bounds(GetOnscreenPageBounds(page_index));
-  // The start page and search page origins are above; all other pages' origins
-  // are below.
-  bool origin_above = contents_view_->GetPageIndexForState(
-                          AppListModel::STATE_START) == page_index ||
-                      contents_view_->GetPageIndexForState(
-                          AppListModel::STATE_SEARCH_RESULTS) == page_index;
-  bounds.set_y(origin_above
-                   ? -bounds.height()
-                   : contents_view_->GetContentsBounds().height() + bounds.y());
-  return bounds;
-}
-
 void ContentsAnimator::UpdateCustomPageForDefaultAnimation(double progress,
                                                            int from_page,
                                                            int to_page) const {
   int custom_page_index = contents_view()->GetPageIndexForState(
       AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
   if (custom_page_index < 0)
     return;
 
   int start_page_index =
       contents_view()->GetPageIndexForState(AppListModel::STATE_START);
   if (from_page != start_page_index && to_page != start_page_index)
     return;
 
   views::View* custom_page = contents_view()->GetPageView(custom_page_index);
   gfx::Rect custom_page_collapsed(
       contents_view()->GetCustomPageCollapsedBounds());
-  gfx::Rect custom_page_origin(GetOffscreenPageBounds(custom_page_index));
+  gfx::Rect custom_page_origin(
+      contents_view()->GetOffscreenPageBounds(custom_page_index));
   gfx::Rect custom_page_rect;
 
   if (from_page == start_page_index) {
     // When transitioning from start page -> any other page, move the custom
     // page from collapsed to hidden. (This method is not used by the start page
     // -> custom page transition.)
     custom_page_rect = gfx::Tween::RectValueBetween(
         progress, custom_page_collapsed, custom_page_origin);
   } else {
     // When transitioning from any page -> start page, move the custom page from
@@ skipping 63 matching lines @@
     : ContentsAnimator(contents_view) {
 }
 
 std::string DefaultAnimator::NameForTests() const {
   return "DefaultAnimator";
 }
 
 void DefaultAnimator::Update(double progress, int from_page, int to_page) {
   // Move the from page from 0 to its origin. Move the to page from its origin
   // to 0.
-  gfx::Rect from_page_onscreen(GetOnscreenPageBounds(from_page));
-  gfx::Rect to_page_onscreen(GetOnscreenPageBounds(to_page));
-  gfx::Rect from_page_origin(GetOffscreenPageBounds(from_page));
-  gfx::Rect to_page_origin(GetOffscreenPageBounds(to_page));
+  gfx::Rect from_page_onscreen(
+      contents_view()->GetOnscreenPageBounds(from_page));
+  gfx::Rect to_page_onscreen(contents_view()->GetOnscreenPageBounds(to_page));
+  gfx::Rect from_page_origin(
+      contents_view()->GetOffscreenPageBounds(from_page));
+  gfx::Rect to_page_origin(contents_view()->GetOffscreenPageBounds(to_page));
   gfx::Rect from_page_rect(gfx::Tween::RectValueBetween(
       progress, from_page_onscreen, from_page_origin));
   gfx::Rect to_page_rect(
       gfx::Tween::RectValueBetween(progress, to_page_origin, to_page_onscreen));
 
   contents_view()->GetPageView(from_page)->SetBoundsRect(from_page_rect);
   ClipSearchResultsPageToOnscreenBounds(from_page, from_page_rect,
                                         from_page_onscreen);
 
   contents_view()->GetPageView(to_page)->SetBoundsRect(to_page_rect);
@@ skipping 12 matching lines @@
 
 std::string StartToAppsAnimator::NameForTests() const {
   return "StartToAppsAnimator";
 }
 
 void StartToAppsAnimator::Update(double progress,
                                  int start_page,
                                  int apps_page) {
   // TODO(mgiuca): This is just a clone of DefaultAnimator's animation. Write a
   // custom animation for the All Apps button on the Start page.
-  gfx::Rect on_screen(contents_view()->GetDefaultContentsBounds());
-  gfx::Rect from_page_origin(GetOffscreenPageBounds(start_page));
-  gfx::Rect to_page_origin(GetOffscreenPageBounds(apps_page));
-  gfx::Rect from_page_rect(
-      gfx::Tween::RectValueBetween(progress, on_screen, from_page_origin));
+  gfx::Rect from_page_onscreen(
+      contents_view()->GetOnscreenPageBounds(start_page));
+  gfx::Rect to_page_onscreen(contents_view()->GetOnscreenPageBounds(apps_page));
+  gfx::Rect from_page_origin(
+      contents_view()->GetOffscreenPageBounds(start_page));
+  gfx::Rect to_page_origin(contents_view()->GetOffscreenPageBounds(apps_page));
+  gfx::Rect from_page_rect(gfx::Tween::RectValueBetween(
+      progress, from_page_onscreen, from_page_origin));
   gfx::Rect to_page_rect(
-      gfx::Tween::RectValueBetween(progress, to_page_origin, on_screen));
+      gfx::Tween::RectValueBetween(progress, to_page_origin, to_page_onscreen));
 
   contents_view()->GetPageView(start_page)->SetBoundsRect(from_page_rect);
   contents_view()->GetPageView(apps_page)->SetBoundsRect(to_page_rect);
 
   UpdateCustomPageForDefaultAnimation(progress, start_page, apps_page);
   UpdateSearchBoxForDefaultAnimation(progress, start_page, apps_page);
 }
 
 // StartToCustomAnimator
 
 StartToCustomAnimator::StartToCustomAnimator(ContentsView* contents_view)
     : ContentsAnimator(contents_view) {
 }
 
 std::string StartToCustomAnimator::NameForTests() const {
   return "StartToCustomAnimator";
 }
 
 void StartToCustomAnimator::Update(double progress,
                                    int start_page,
                                    int custom_page) {
-  gfx::Rect start_page_on_screen(GetOnscreenPageBounds(start_page));
-  gfx::Rect custom_page_on_screen(GetOnscreenPageBounds(custom_page));
-  gfx::Rect start_page_origin(GetOffscreenPageBounds(start_page));
+  gfx::Rect start_page_on_screen(
+      contents_view()->GetOnscreenPageBounds(start_page));
+  gfx::Rect custom_page_on_screen(
+      contents_view()->GetOnscreenPageBounds(custom_page));
+  gfx::Rect start_page_origin(
+      contents_view()->GetOffscreenPageBounds(start_page));
   gfx::Rect custom_page_origin(contents_view()->GetCustomPageCollapsedBounds());
   gfx::Rect start_page_rect(gfx::Tween::RectValueBetween(
       progress, start_page_on_screen, start_page_origin));
   gfx::Rect custom_page_rect(gfx::Tween::RectValueBetween(
       progress, custom_page_origin, custom_page_on_screen));
 
   contents_view()->GetPageView(start_page)->SetBoundsRect(start_page_rect);
   contents_view()->GetPageView(custom_page)->SetBoundsRect(custom_page_rect);
 
   UpdateSearchBoxForDefaultAnimation(progress, start_page, custom_page);
 }
 
 }  // namespace app_list