Make start page fill app list bounds.

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"
@@ skipping 334 matching lines @@
   bool success =
       state_to_view_.insert(std::make_pair(state, page_index)).second;
   success = success &&
             view_to_state_.insert(std::make_pair(page_index, state)).second;
 
   // There shouldn't be duplicates in either map.
   DCHECK(success);
   return page_index;
 }
 
+gfx::Rect ContentsView::GetOnscreenPageBounds(int page_index) const {
+  AppListModel::State state = GetStateForPageIndex(page_index);
+  return (state == AppListModel::STATE_CUSTOM_LAUNCHER_PAGE ||

[Matt Giuca, 2015/02/09 05:32:17]

To match the style of GetOffscreenPageBounds, store the condition here in a bool
variable and then use that in a second statement?

[calamity, 2015/02/09 06:12:27]

Done.

+          state == AppListModel::STATE_START)
+             ? GetContentsBounds()
+             : GetDefaultContentsBounds();
+}
+
+gfx::Rect ContentsView::GetOffscreenPageBounds(int page_index) const {
+  AppListModel::State state = GetStateForPageIndex(page_index);
+  gfx::Rect bounds(GetOnscreenPageBounds(page_index));
+  // The start page and search page origins are above; all other pages' origins
+  // are below.
+  bool origin_above = state == AppListModel::STATE_START ||
+                      state == AppListModel::STATE_SEARCH_RESULTS;
+  bounds.set_y(origin_above ? -bounds.height()
+                            : GetContentsBounds().height() + bounds.y());
+  return bounds;
+}
+
 gfx::Rect ContentsView::GetDefaultSearchBoxBounds() const {
   gfx::Rect search_box_bounds(0, 0, GetDefaultContentsSize().width(),
                               GetSearchBoxView()->GetPreferredSize().height());
   if (switches::IsExperimentalAppListEnabled()) {
     search_box_bounds.set_y(kExperimentalSearchBoxPadding);
     search_box_bounds.Inset(kExperimentalSearchBoxPadding, 0);
   }
   return search_box_bounds;
 }
 
 gfx::Rect ContentsView::GetSearchBoxBoundsForState(
     AppListModel::State state) const {
   // On the start page, the search box is in a different location.
   if (state == AppListModel::STATE_START) {
     DCHECK(start_page_view_);
     // Convert to ContentsView space, assuming that the StartPageView is in the
     // ContentsView's default bounds.
     return start_page_view_->GetSearchBoxBounds() +
-           GetDefaultContentsBounds().OffsetFromOrigin();
+           GetOnscreenPageBounds(GetPageIndexForState(state))
+               .OffsetFromOrigin();
   }
 
   return GetDefaultSearchBoxBounds();
 }
 
 gfx::Rect ContentsView::GetSearchBoxBoundsForPageIndex(int index) const {
   return GetSearchBoxBoundsForState(GetStateForPageIndex(index));
 }
 
 gfx::Rect ContentsView::GetDefaultContentsBounds() const {
@@ skipping 68 matching lines @@
         GetSearchBoxView()->GetViewBoundsForSearchBoxContentsBounds(
             search_box_bounds)));
   }
 
   // Immediately finish all current animations.
   pagination_model_.FinishAnimation();
 
   // Move the current view onto the screen, and all other views off screen to
   // the left. (Since we are not animating, we don't need to be careful about
   // which side we place the off-screen views onto.)
-  gfx::Rect rect(GetDefaultContentsBounds());
-  // Custom pages are aligned to the top of the window, not under the search
-  // box.
-  double progress = 0;
-  if (IsStateActive(AppListModel::STATE_CUSTOM_LAUNCHER_PAGE)) {
-    rect = GetContentsBounds();
-    progress = 1;
-  }
+  gfx::Rect rect = GetOnscreenPageBounds(GetActivePageIndex());
+  double progress =
+      IsStateActive(AppListModel::STATE_CUSTOM_LAUNCHER_PAGE) ? 1 : 0;
 
   // Notify the custom launcher page that the active page has changed.
   app_list_main_view_->view_delegate()->CustomLauncherPageAnimationChanged(
       progress);
 
   if (rect.IsEmpty())
     return;
 
   gfx::Rect offscreen_target(rect);
   offscreen_target.set_x(-rect.width());
@@ skipping 34 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list