Remove separate SearchResultListView from ContentsView.

ui/app_list/views/contents_view.cc

Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 069afa01d921e6bed28db5f6f4395d369bd8bc67..2638af3c5102baf2ec1e278eda5a65e2e53cadbb 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -31,7 +31,6 @@ 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),
@@ -73,26 +72,21 @@ void ContentsView::Init(AppListModel* model) {
     // 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));

[Matt Giuca, 2015/02/05 04:33:17]

nit: Newline here.

[calamity, 2015/02/05 07:08:40]

Done.

+  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);
 
@@ -224,15 +218,6 @@ void ContentsView::ActivePageChanged() {
     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);

[Matt Giuca, 2015/02/05 04:33:17]

Where is this logic in the SearchResultsPageView version? (I can't find it.)
Also the UpdateAutoLaunchState.

Just want to make sure that the behaviour is equivalent in the classic app list,
despite using code from experimental app list.

[calamity, 2015/02/05 07:08:40]

SearchResultPageView calls OnContainerSelected when it gets shown.
This is getting called on Update() which is every time a new search result comes
in.

-  }
-
-  if (search_results_list_view_)
-    search_results_list_view_->UpdateAutoLaunchState();
-
   if (custom_page_view_) {
     custom_page_view_->SetFocusable(state ==
                                     AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
@@ -442,15 +427,7 @@ bool ContentsView::Back() {
 }
 
 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()

[Matt Giuca, 2015/02/05 04:33:17]

Similarly, where is the logic to take the max of the container size and the
SRLV? (I'm not sure what this logic was for, but I can't find any equivalent
logic in the experimental version which we are now using.)

[calamity, 2015/02/05 07:08:40]

The logic was 'if search results bigger, then use that as size, else use apps
container'. We just use the apps container size.

[Matt Giuca, 2015/02/06 05:07:14]

But that means if the search results are bigger, we no longer use the bigger
size, right? Just I'm not sure when this would happen.

Oh well, seems unnecessary to preserve that behaviour. (Is that your logic?)

-                                : 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 {