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 {

[Matt Giuca, 2015/02/09 03:51:14]

I think it's better to simply move GetOnscreenPageBounds to contents_view_.
Then:
a) You don't need to be calling contents_view_->method() on every single call in
this function, and
b) You don't need to expose it to ContentsView as a method of DefaultAnimator.

Also, it paves the way to a proper refactor, where the decision to return
ContentsBounds vs DefaultContentsBounds is made by the ContentsPage (different
subclasses override differently) versus doing it with an if statement.

[calamity, 2015/02/09 05:25:14]

SGTM. I'm going to move OffscreenBounds too.

-  return contents_view_->GetPageIndexForState(
-             AppListModel::STATE_CUSTOM_LAUNCHER_PAGE) == page_index
+  AppListModel::State state = contents_view_->GetStateForPageIndex(page_index);
+  return (state == AppListModel::STATE_CUSTOM_LAUNCHER_PAGE ||
+          state == AppListModel::STATE_START)
              ? 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 ||
@@ skipping 134 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_onscreen(GetOnscreenPageBounds(start_page));
+  gfx::Rect to_page_onscreen(GetOnscreenPageBounds(apps_page));
   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_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
 
@@ skipping 17 matching lines @@
   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