Add search results to experimental app list start page.

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 "base/logging.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 19 matching lines @@
 const int kMinScrollToSwitchPage = 20;
 const int kMinHorizVelocityToSwitchPage = 800;
 
 const double kFinishTransitionThreshold = 0.33;
 
 }  // namespace
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view,
                            AppListModel* model,
                            AppListViewDelegate* view_delegate)
-    : start_page_view_(NULL),
+    : search_results_view_(NULL),
+      start_page_view_(NULL),
       app_list_main_view_(app_list_main_view),
       view_model_(new views::ViewModel),
       bounds_animator_(new views::BoundsAnimator(this)) {
   DCHECK(model);
 
-  search_results_view_ =
-      new SearchResultListView(app_list_main_view, view_delegate);
-  AddLauncherPage(search_results_view_, NAMED_PAGE_SEARCH_RESULTS);
-
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     start_page_view_ = new StartPageView(app_list_main_view, view_delegate);
     AddLauncherPage(start_page_view_, NAMED_PAGE_START);
+  } else {
+    search_results_view_ =
+        new SearchResultListView(app_list_main_view, view_delegate);
+    AddLauncherPage(search_results_view_, NAMED_PAGE_SEARCH_RESULTS);
+    search_results_view_->SetResults(model->results());
   }
 
   apps_container_view_ = new AppsContainerView(app_list_main_view, model);
   active_page_ = AddLauncherPage(apps_container_view_, NAMED_PAGE_APPS);
 
-  search_results_view_->SetResults(model->results());
 }
 
 ContentsView::~ContentsView() {
 }
 
 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()
@@ skipping 33 matching lines @@
   DCHECK(it != named_page_to_view_.end());
   return it->second;
 }
 
 void ContentsView::ActivePageChanged() {
   // TODO(xiyuan): Highlight default match instead of the first.
   if (IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS) &&
       search_results_view_->visible()) {
     search_results_view_->SetSelectedIndex(0);
   }
-  search_results_view_->UpdateAutoLaunchState();
-
-  // Notify parent AppListMainView of the page change.
-  app_list_main_view_->OnContentsViewActivePageChanged();
+  if (search_results_view_)
+    search_results_view_->UpdateAutoLaunchState();
 
   if (IsNamedPageActive(NAMED_PAGE_START))
     start_page_view_->Reset();
 
+  // Notify parent AppListMainView of the page change.
+  app_list_main_view_->UpdateSearchBoxVisibility();
+
   AnimateToIdealBounds();
 }
 
+void ContentsView::ShowSearchResults(bool show) {
+  NamedPage new_named_page = show ? NAMED_PAGE_SEARCH_RESULTS : NAMED_PAGE_APPS;
+  if (app_list::switches::IsExperimentalAppListEnabled())
+    new_named_page = NAMED_PAGE_START;
+
+  SetActivePage(GetPageIndexForNamedPage(new_named_page));
+
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
+    if (show)
+      start_page_view_->ShowSearchResults();
+    else
+      start_page_view_->Reset();
+    app_list_main_view_->UpdateSearchBoxVisibility();
+  }
+}
+
+bool ContentsView::IsShowingSearchResults() const {
+  return app_list::switches::IsExperimentalAppListEnabled()
+             ? IsNamedPageActive(NAMED_PAGE_START) &&
+                   start_page_view_->IsShowingSearchResults()
+             : IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS);
+}
+
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     gfx::Rect incoming_target(rect);
     gfx::Rect outgoing_target(rect);
     outgoing_target.set_x(-outgoing_target.width());
 
@@ skipping 29 matching lines @@
   for (int i = 0; i < view_model_->view_size(); ++i) {
     bounds_animator_->AnimateViewTo(view_model_->view_at(i),
                                     view_model_->ideal_bounds(i));
   }
 }
 
 PaginationModel* ContentsView::GetAppsPaginationModel() {
   return apps_container_view_->apps_grid_view()->pagination_model();
 }
 
-void ContentsView::ShowSearchResults(bool show) {
-  NamedPage new_named_page = show ? NAMED_PAGE_SEARCH_RESULTS : NAMED_PAGE_APPS;
-  SetActivePage(GetPageIndexForNamedPage(new_named_page));
-}
-
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
   apps_container_view_->ShowActiveFolder(item);
 }
 
 void ContentsView::Prerender() {
   const int selected_page =
       std::max(0, GetAppsPaginationModel()->selected_page());
   apps_container_view_->apps_grid_view()->Prerender(selected_page);
 }
 
 int ContentsView::AddLauncherPage(views::View* view) {
   int page_index = view_model_->view_size();
   AddChildView(view);
   view_model_->Add(view, page_index);
   return page_index;
 }
 
 int ContentsView::AddLauncherPage(views::View* view, NamedPage named_page) {
   int page_index = AddLauncherPage(view);
   named_page_to_view_.insert(std::pair<NamedPage, int>(named_page, page_index));
   return page_index;
 }
 
 gfx::Size ContentsView::GetPreferredSize() const {
   const gfx::Size container_size =
       apps_container_view_->apps_grid_view()->GetPreferredSize();
-  const gfx::Size results_size = search_results_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);
 }
 
 void ContentsView::Layout() {
   CalculateIdealBounds();
   views::ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
@@ skipping 73 matching lines @@
   if (std::abs(offset) > kMinScrollToSwitchPage) {
     if (!GetAppsPaginationModel()->has_transition()) {
       GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list