Move app list search box into AppListView.

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_box_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/gfx/animation/tween.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 
 namespace app_list {
 
@@ skipping 44 matching lines @@
   AddLauncherPage(
       apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS);
 
   int initial_page_index = app_list::switches::IsExperimentalAppListEnabled()
                                ? GetPageIndexForNamedPage(NAMED_PAGE_START)
                                : GetPageIndexForNamedPage(NAMED_PAGE_APPS);
   DCHECK_GE(initial_page_index, 0);
 
   page_before_search_ = initial_page_index;
   pagination_model_.SelectPage(initial_page_index, false);
-
-  // Needed to update the main search box visibility.
-  ActivePageChanged(false);
 }
 
 void ContentsView::CancelDrag() {
   if (apps_container_view_->apps_grid_view()->has_dragged_view())
     apps_container_view_->apps_grid_view()->EndDrag(true);
   if (apps_container_view_->app_list_folder_view()
           ->items_grid_view()
           ->has_dragged_view()) {
     apps_container_view_->app_list_folder_view()->items_grid_view()->EndDrag(
         true);
@@ skipping 113 matching lines @@
     const PaginationModel::Transition& transition =
         pagination_model_.transition();
     if (pagination_model_.is_valid_page(transition.target_page)) {
       target_page = transition.target_page;
       progress = transition.progress;
     }
   }
 
   // Move |current_page| from 0 to its origin. Move |target_page| from its
   // origin to 0.
-  gfx::Rect on_screen(GetContentsBounds());
+  gfx::Rect on_screen(GetDefaultContentsBounds());

[Matt Giuca, 2014/10/24 03:21:40]

like it.

[calamity, 2014/10/24 06:13:08]

Acknowledged.

   gfx::Rect current_page_origin(GetOffscreenPageBounds(current_page));
   gfx::Rect target_page_origin(GetOffscreenPageBounds(target_page));
   gfx::Rect current_page_rect(
       gfx::Tween::RectValueBetween(progress, on_screen, current_page_origin));
   gfx::Rect target_page_rect(
       gfx::Tween::RectValueBetween(progress, target_page_origin, on_screen));
 
   view_model_->view_at(current_page)->SetBoundsRect(current_page_rect);
   view_model_->view_at(target_page)->SetBoundsRect(target_page_rect);
 }
@@ skipping 29 matching lines @@
 }
 
 int ContentsView::AddLauncherPage(views::View* view,
                                   int resource_id,
                                   NamedPage named_page) {
   int page_index = AddLauncherPage(view, resource_id);
   named_page_to_view_.insert(std::pair<NamedPage, int>(named_page, page_index));
   return page_index;
 }
 
-gfx::Size ContentsView::GetPreferredSize() const {
+gfx::Rect ContentsView::GetDefaultSearchBoxBounds() const {
+  gfx::Rect search_box_bounds(
+      0,
+      0,
+      GetDefaultContentsSize().width(),
+      app_list_main_view_->search_box_view()->GetPreferredSize().height());
+  if (switches::IsExperimentalAppListEnabled()) {
+    search_box_bounds.set_y(kExperimentalWindowPadding);
+    search_box_bounds.Inset(kExperimentalWindowPadding, 0);
+  }
+  return search_box_bounds;
+}
+
+gfx::Rect ContentsView::GetDefaultContentsBounds() const {
+  gfx::Rect bounds(gfx::Point(0, GetDefaultSearchBoxBounds().bottom()),
+                   GetDefaultContentsSize());
+  return bounds;
+}
+
+gfx::Size ContentsView::GetDefaultContentsSize() const {
   const gfx::Size container_size =
       apps_container_view_->apps_grid_view()->GetPreferredSize();
   const gfx::Size results_size = search_results_view_
                                      ? search_results_view_->GetPreferredSize()
                                      : gfx::Size();
 
   int width = std::max(container_size.width(), results_size.width());
   int height = std::max(container_size.height(), results_size.height());
   return gfx::Size(width, height);
 }
 
+gfx::Size ContentsView::GetPreferredSize() const {
+  gfx::Rect search_box_bounds = GetDefaultSearchBoxBounds();
+  gfx::Rect default_contents_bounds = GetDefaultContentsBounds();
+  return gfx::Size(

[Matt Giuca, 2014/10/24 03:21:40]

default_contents_bounds.Union(search_box_bounds);
return gfx::Size(default_contents_bounds.right(),
                 default_contents_bounds.bottom());

[calamity, 2014/10/24 06:13:08]

Nope. search_box_bounds doesn't have 0, 0 origin.

I can _make_ it have 0, 0 origin but I actually did this to begin with but it's
kinda gross semantically. I think this best expresses what's going on here (make
the size the biggest x/y coordinates of these areas).

Maybe I can use some other classes to do some of this for me.

+      std::max(search_box_bounds.right(), default_contents_bounds.right()),
+      std::max(search_box_bounds.bottom(), default_contents_bounds.bottom()));
+}
+
 void ContentsView::Layout() {
   // 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(GetContentsBounds());
+  gfx::Rect rect(GetDefaultContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect offscreen_target(rect);
   offscreen_target.set_x(-rect.width());
 
   for (int i = 0; i < view_model_->view_size(); ++i) {
     view_model_->view_at(i)->SetBoundsRect(
         i == pagination_model_.SelectedTargetPage() ? rect : offscreen_target);
   }
@@ skipping 10 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list