Add a SearchResultPageView to the experimental app list.

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/search_result_page_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 {
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view)
-    : search_results_view_(NULL),
+    : apps_container_view_(NULL),

[Matt Giuca, 2014/11/04 07:44:37]

Good catch. This was actually quite bad: there is quite a lot of code in between
the call to ContentsView's constructor and Init() which finally initializes this
value.

Can you use nullptr for all of these instead of NULL.

[calamity, 2014/11/06 04:55:01]

Done.

+      search_results_list_view_(NULL),
+      search_results_page_view_(NULL),
       start_page_view_(NULL),
       app_list_main_view_(app_list_main_view),
       contents_switcher_view_(NULL),
       view_model_(new views::ViewModel),
       page_before_search_(0) {
   pagination_model_.SetTransitionDurations(kPageTransitionDurationInMs,
                                            kOverscrollPageTransitionDurationMs);
   pagination_model_.AddObserver(this);
 }
 
@@ skipping 20 matching lines @@
                         IDR_APP_LIST_NOTIFICATIONS_ICON,
                         AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
       } else {
         AddLauncherPage(*it, IDR_APP_LIST_NOTIFICATIONS_ICON);
       }
     }
 
     start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
     AddLauncherPage(
         start_page_view_, IDR_APP_LIST_SEARCH_ICON, AppListModel::STATE_START);
+
+    search_results_page_view_ =
+        new SearchResultPageView(app_list_main_view_, view_delegate);
+    AddLauncherPage(
+        search_results_page_view_, 0, AppListModel::STATE_SEARCH_RESULTS);
   } else {
-    search_results_view_ =
+    search_results_list_view_ =
         new SearchResultListView(app_list_main_view_, view_delegate);
     AddLauncherPage(
-        search_results_view_, 0, AppListModel::STATE_SEARCH_RESULTS);
-    search_results_view_->SetResults(model->results());
+        search_results_list_view_, 0, AppListModel::STATE_SEARCH_RESULTS);
+    search_results_list_view_->SetResults(model->results());
   }
 
   apps_container_view_ = new AppsContainerView(app_list_main_view_, model);
 
   AddLauncherPage(
       apps_container_view_, IDR_APP_LIST_APPS_ICON, AppListModel::STATE_APPS);
 
   int initial_page_index = app_list::switches::IsExperimentalAppListEnabled()
                                ? GetPageIndexForState(AppListModel::STATE_START)
                                : GetPageIndexForState(AppListModel::STATE_APPS);
   DCHECK_GE(initial_page_index, 0);
 
   page_before_search_ = initial_page_index;
   pagination_model_.SelectPage(initial_page_index, false);
-  ActivePageChanged(false);
+  ActivePageChanged();
 }
 
 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 44 matching lines @@
 int ContentsView::NumLauncherPages() const {
   return pagination_model_.total_pages();
 }
 
 void ContentsView::SetActivePageInternal(int page_index,
                                          bool show_search_results) {
   if (!show_search_results)
     page_before_search_ = page_index;
   // Start animating to the new page.
   pagination_model_.SelectPage(page_index, true);
-  ActivePageChanged(show_search_results);
+  ActivePageChanged();
 }
 
-void ContentsView::ActivePageChanged(bool show_search_results) {
+void ContentsView::ActivePageChanged() {
   AppListModel::State state = AppListModel::INVALID_STATE;
 
   // TODO(calamity): This does not report search results being shown in the
   // experimental app list as a boolean is currently used to indicate whether
   // search results are showing. See http://crbug.com/427787/.
   std::map<int, AppListModel::State>::const_iterator it =
       view_to_state_.find(pagination_model_.SelectedTargetPage());
   if (it != view_to_state_.end())
     state = it->second;
 
   app_list_main_view_->model()->SetState(state);
 
   // TODO(xiyuan): Highlight default match instead of the first.
   if (IsStateActive(AppListModel::STATE_SEARCH_RESULTS) &&
-      search_results_view_->visible()) {
-    search_results_view_->SetSelectedIndex(0);
+      search_results_list_view_ && search_results_list_view_->visible()) {
+    search_results_list_view_->SetSelectedIndex(0);
   }
-  if (search_results_view_)
-    search_results_view_->UpdateAutoLaunchState();
 
-  if (IsStateActive(AppListModel::STATE_START)) {
-    if (show_search_results)
-      start_page_view_->ShowSearchResults();
-    else
-      start_page_view_->Reset();
-  }
+  if (search_results_list_view_)
+    search_results_list_view_->UpdateAutoLaunchState();
 
   // Notify parent AppListMainView of the page change.
   app_list_main_view_->UpdateSearchBoxVisibility();
 }
 
 void ContentsView::ShowSearchResults(bool show) {
-  int search_page =
-      GetPageIndexForState(app_list::switches::IsExperimentalAppListEnabled()
-                               ? AppListModel::STATE_START
-                               : AppListModel::STATE_SEARCH_RESULTS);
+  int search_page = GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS);
   DCHECK_GE(search_page, 0);
 
   SetActivePageInternal(show ? search_page : page_before_search_, show);
 }
 
 bool ContentsView::IsShowingSearchResults() const {
-  return app_list::switches::IsExperimentalAppListEnabled()
-             ? IsStateActive(AppListModel::STATE_START) &&
-                   start_page_view_->IsShowingSearchResults()
-             : IsStateActive(AppListModel::STATE_SEARCH_RESULTS);
+  return IsStateActive(AppListModel::STATE_SEARCH_RESULTS);
 }
 
 gfx::Rect ContentsView::GetOffscreenPageBounds(int page_index) const {
   gfx::Rect bounds(GetContentsBounds());
   // The start page and search page origins are above; all other pages' origins
   // are below.
   int page_height = bounds.height();
   bool origin_above =
       GetPageIndexForState(AppListModel::STATE_START) == page_index ||
       GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS) == page_index;
@@ skipping 89 matching lines @@
 
 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();
+  const gfx::Size results_size =
+      search_results_list_view_ ? search_results_list_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();
   gfx::Vector2d bottom_right =
@@ skipping 34 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list