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 10 matching lines @@
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 
 namespace app_list {
 
 namespace {
 
 // Indexes of interesting views in ViewModel of ContentsView.
 const int kIndexAppsContainer = 0;
+// Only one of these views is created depending on whether the experimental app
+// list is enabled.
 const int kIndexSearchResults = 1;
-const int kIndexStartPage = 2;
+const int kIndexStartPage = 1;
 
 const int kMinMouseWheelToSwitchPage = 20;
 const int kMinScrollToSwitchPage = 20;
 const int kMinHorizVelocityToSwitchPage = 800;
 
 const double kFinishTransitionThreshold = 0.33;
 
 AppsContainerView* GetAppsContainerView(views::ViewModel* model) {
   return static_cast<AppsContainerView*>(model->view_at(kIndexAppsContainer));
 }
 
 SearchResultListView* GetSearchResultListView(views::ViewModel* model) {
+  DCHECK(!app_list::switches::IsExperimentalAppListEnabled());
   return static_cast<SearchResultListView*>(
       model->view_at(kIndexSearchResults));
 }
 
 StartPageView* GetStartPageView(views::ViewModel* model) {
+  DCHECK(app_list::switches::IsExperimentalAppListEnabled());
   return static_cast<StartPageView*>(model->view_at(kIndexStartPage));
 }
 
 }  // namespace
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view,
                            PaginationModel* pagination_model,
                            AppListModel* model,
                            AppListViewDelegate* view_delegate)
     : show_state_(SHOW_APPS),
       pagination_model_(pagination_model),
       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);
   pagination_model_->SetTransitionDurations(
       kPageTransitionDurationInMs,
       kOverscrollPageTransitionDurationMs);
 
   apps_container_view_ =
       new AppsContainerView(app_list_main_view, pagination_model, model);
   AddChildView(apps_container_view_);
   view_model_->Add(apps_container_view_, kIndexAppsContainer);
 
-  SearchResultListView* search_results_view = new SearchResultListView(
-      app_list_main_view, view_delegate);
-  AddChildView(search_results_view);
-  view_model_->Add(search_results_view, kIndexSearchResults);
-
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     start_page_view_ = new StartPageView(app_list_main_view, view_delegate);
     AddChildView(start_page_view_);
     view_model_->Add(start_page_view_, kIndexStartPage);
+  } else {
+    SearchResultListView* search_results_view =
+        new SearchResultListView(app_list_main_view, view_delegate);
+    AddChildView(search_results_view);
+    view_model_->Add(search_results_view, kIndexSearchResults);
+    GetSearchResultListView(view_model_.get())->SetResults(model->results());
   }
 
-  GetSearchResultListView(view_model_.get())->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 10 matching lines @@
 
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
   ShowStateChanged();
 }
 
 void ContentsView::ShowStateChanged() {
-  SearchResultListView* results_view =
-      GetSearchResultListView(view_model_.get());
-  // TODO(xiyuan): Highlight default match instead of the first.
-  if (show_state_ == SHOW_SEARCH_RESULTS && results_view->visible())
-    results_view->SetSelectedIndex(0);
-  results_view->UpdateAutoLaunchState();
-
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
+    if (show_state_ == SHOW_START_PAGE)
+      GetStartPageView(view_model_.get())->Reset();
+    else if (show_state_ == SHOW_SEARCH_RESULTS)

[tapted, 2014/06/04 06:12:43]

Do you need to trigger a start_page-view->results_view->UpdateAutoLaunchState()
when show_state_ != SHOW_SEARCH_RESULTS

it looks like StartPageView only does it when it becomes visible. Maybe here you
need

GetStartPageView(view_model_.get())->SetShowState(show_state_)

with appropriate handling, which StartPageView::Reset() also calls

[calamity, 2014/06/12 05:16:56]

Done.

+      GetStartPageView(view_model_.get())->ShowSearchResults();
+  } else {
+    SearchResultListView* results_view =
+        GetSearchResultListView(view_model_.get());
+    // TODO(xiyuan): Highlight default match instead of the first.
+    if (show_state_ == SHOW_SEARCH_RESULTS && results_view->visible())
+      results_view->SetSelectedIndex(0);
+    results_view->UpdateAutoLaunchState();
+  }
   // Notify parent AppListMainView of show state change.
   app_list_main_view_->OnContentsViewShowStateChanged();
 
-  if (show_state_ == SHOW_START_PAGE)
-    GetStartPageView(view_model_.get())->Reset();
-
   AnimateToIdealBounds();
 }
 
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     int incoming_view_index = 0;
     switch (show_state_) {
       case SHOW_APPS:
         incoming_view_index = kIndexAppsContainer;
         break;
-      case SHOW_SEARCH_RESULTS:
-        incoming_view_index = kIndexSearchResults;
-        break;
+      case SHOW_SEARCH_RESULTS:  // Falls through.

[tapted, 2014/06/04 06:12:43]

nit: might be slightly less weird to leave this the way it was

[calamity, 2014/06/12 05:16:56]

This is gone.

       case SHOW_START_PAGE:
         incoming_view_index = kIndexStartPage;
         break;
       default:
         NOTREACHED();
     }
 
     gfx::Rect incoming_target(rect);
     gfx::Rect outgoing_target(rect);
     outgoing_target.set_x(-outgoing_target.width());
@@ skipping 30 matching lines @@
 }
 
 void ContentsView::AnimateToIdealBounds() {
   CalculateIdealBounds();
   for (int i = 0; i < view_model_->view_size(); ++i) {
     bounds_animator_->AnimateViewTo(view_model_->view_at(i),
                                     view_model_->ideal_bounds(i));
   }
 }
 
-void ContentsView::ShowSearchResults(bool show) {
-  SetShowState(show ? SHOW_SEARCH_RESULTS : SHOW_APPS);
-}
-
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
   apps_container_view_->ShowActiveFolder(item);
 }
 
 void ContentsView::Prerender() {
   const int selected_page = std::max(0, pagination_model_->selected_page());
   apps_container_view_->apps_grid_view()->Prerender(selected_page);
 }
 
 gfx::Size ContentsView::GetPreferredSize() const {
   const gfx::Size container_size = GetAppsContainerView(view_model_.get())->
       apps_grid_view()->GetPreferredSize();
+  if (app_list::switches::IsExperimentalAppListEnabled())
+    return container_size;
   const gfx::Size results_size =
       GetSearchResultListView(view_model_.get())->GetPreferredSize();
 

[tapted, 2014/06/04 06:12:43]

nit: move this blank line up after the return

[calamity, 2014/06/12 05:16:56]

Also gone.

   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_);
 }
 
 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
   switch (show_state_) {
     case SHOW_APPS:
       return GetAppsContainerView(view_model_.get())->OnKeyPressed(event);
     case SHOW_SEARCH_RESULTS:
-      return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
+      if (app_list::switches::IsExperimentalAppListEnabled())
+        return GetStartPageView(view_model_.get())->OnKeyPressed(event);
+      else

[tapted, 2014/06/04 06:12:43]

nit: no else after a return statement

[calamity, 2014/06/12 05:16:56]

Gone.

+        return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
     case SHOW_START_PAGE:
       return GetStartPageView(view_model_.get())->OnKeyPressed(event);
     default:
       NOTREACHED() << "Unknown show state " << show_state_;
   }
   return false;
 }
 
 bool ContentsView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (show_state_ != SHOW_APPS)
@@ skipping 68 matching lines @@
     if (!pagination_model_->has_transition()) {
       pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
                                             true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list