Fix janky experimental app list animation.

ui/app_list/views/contents_animator.cc

Index: ui/app_list/views/contents_animator.cc
diff --git a/ui/app_list/views/contents_animator.cc b/ui/app_list/views/contents_animator.cc
index 97d3c502820be5f605ce80c6040ff2496311c581..bdffe9c48131ec4925775b9093b3ae8cda79f232 100644
--- a/ui/app_list/views/contents_animator.cc
+++ b/ui/app_list/views/contents_animator.cc
@@ -27,21 +27,22 @@ ContentsAnimator::~ContentsAnimator() {
 }
 
 gfx::Rect ContentsAnimator::GetOnscreenPageBounds(int page_index) const {
-  return contents_view_->IsStateActive(AppListModel::STATE_CUSTOM_LAUNCHER_PAGE)
+  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(contents_view_->GetContentsBounds());
+  gfx::Rect bounds(GetOnscreenPageBounds(page_index));
   // The start page and search page origins are above; all other pages' origins
   // are below.
-  int page_height = bounds.height();
   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 ? -page_height : page_height);
+  bounds.set_y(origin_above ? -bounds.height()
+                            : contents_view_->GetContentsBounds().height());

[Matt Giuca, 2015/02/05 05:51:54]

As discussed, this should be + bounds.y().

[calamity, 2015/02/05 06:55:04]

Done.

   return bounds;
 }