Remove separate SearchResultListView from ContentsView.

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 13 matching lines @@
 #include "ui/events/event.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view)
     : apps_container_view_(nullptr),
-      search_results_list_view_(nullptr),
       search_results_page_view_(nullptr),
       start_page_view_(nullptr),
       custom_page_view_(nullptr),
       app_list_main_view_(app_list_main_view),
       view_model_(new views::ViewModel),
       page_before_search_(0) {
   pagination_model_.SetTransitionDurations(kPageTransitionDurationInMs,
                                            kOverscrollPageTransitionDurationMs);
   pagination_model_.AddObserver(this);
 }
@@ skipping 21 matching lines @@
 
         AddLauncherPage(*it, AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
       } else {
         AddLauncherPage(*it);
       }
     }
 
     // Start page.
     start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
     AddLauncherPage(start_page_view_, AppListModel::STATE_START);
+  }
 
-    // Search results UI.
-    search_results_page_view_ = new SearchResultPageView();
+  // Search results UI.
+  search_results_page_view_ = new SearchResultPageView();
 
-    AppListModel::SearchResults* results = view_delegate->GetModel()->results();
-    search_results_page_view_->AddSearchResultContainerView(
-        results, new SearchResultListView(app_list_main_view_, view_delegate));
+  AppListModel::SearchResults* results = view_delegate->GetModel()->results();
+  search_results_page_view_->AddSearchResultContainerView(
+      results, new SearchResultListView(app_list_main_view_, view_delegate));
+
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
     search_results_page_view_->AddSearchResultContainerView(
         results,
         new SearchResultTileItemListView(GetSearchBoxView()->search_box()));
-
-    AddLauncherPage(search_results_page_view_,
-                    AppListModel::STATE_SEARCH_RESULTS);
-  } else {
-    search_results_list_view_ =
-        new SearchResultListView(app_list_main_view_, view_delegate);
-    AddLauncherPage(search_results_list_view_,
-                    AppListModel::STATE_SEARCH_RESULTS);
-    search_results_list_view_->SetResults(model->results());
   }
+  AddLauncherPage(search_results_page_view_,
+                  AppListModel::STATE_SEARCH_RESULTS);
 
   apps_container_view_ = new AppsContainerView(app_list_main_view_, model);
 
   AddLauncherPage(apps_container_view_, 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);
 
@@ skipping 111 matching lines @@
     // Set the visibility of the search box's back button.
     app_list_main_view_->search_box_view()->back_button()->SetVisible(
         state != AppListModel::STATE_START);
     app_list_main_view_->search_box_view()->Layout();
 
     // Whenever the page changes, the custom launcher page is considered to have
     // been reset.
     app_list_main_view_->model()->ClearCustomLauncherPageSubpages();
   }
 
-  // TODO(xiyuan): Highlight default match instead of the first.
-  if (state == AppListModel::STATE_SEARCH_RESULTS &&
-      search_results_list_view_ && search_results_list_view_->visible()) {
-    search_results_list_view_->OnContainerSelected(false);
-  }
-
-  if (search_results_list_view_)
-    search_results_list_view_->UpdateAutoLaunchState();
-
   if (custom_page_view_) {
     custom_page_view_->SetFocusable(state ==
                                     AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
   }
 }
 
 void ContentsView::ShowSearchResults(bool show) {
   int search_page = GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS);
   DCHECK_GE(search_page, 0);
 
@@ skipping 189 matching lines @@
       ShowSearchResults(false);
       break;
     case AppListModel::INVALID_STATE:
       NOTREACHED();
       break;
   }
   return true;
 }
 
 gfx::Size ContentsView::GetDefaultContentsSize() const {
-  const gfx::Size container_size =
-      apps_container_view_->apps_grid_view()->GetPreferredSize();
-  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);
+  return apps_container_view_->apps_grid_view()->GetPreferredSize();
 }
 
 gfx::Size ContentsView::GetPreferredSize() const {
   gfx::Rect search_box_bounds = GetDefaultSearchBoxBounds();
   gfx::Rect default_contents_bounds = GetDefaultContentsBounds();
   gfx::Vector2d bottom_right =
       search_box_bounds.bottom_right().OffsetFromOrigin();
   bottom_right.SetToMax(
       default_contents_bounds.bottom_right().OffsetFromOrigin());
   return gfx::Size(bottom_right.x(), bottom_right.y());
@@ skipping 70 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list