Remove separate SearchResultListView from ContentsView.

ui/app_list/views/search_result_page_view.cc

Index: ui/app_list/views/search_result_page_view.cc
diff --git a/ui/app_list/views/search_result_page_view.cc b/ui/app_list/views/search_result_page_view.cc
index a923ba95139be4cf40bc3d2315a8a03ddbf1e3cc..fca91384a5d11ecf1c0abf90b3ce30d4c99f4a32 100644
--- a/ui/app_list/views/search_result_page_view.cc
+++ b/ui/app_list/views/search_result_page_view.cc
@@ -5,6 +5,7 @@
 #include "ui/app_list/views/search_result_page_view.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_main_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
@@ -45,9 +46,13 @@ class SearchCardView : public views::View {
 }  // namespace
 
 SearchResultPageView::SearchResultPageView() : selected_index_(0) {
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
-                                        kExperimentalWindowPadding, kTopPadding,
-                                        kGroupSpacing));
+  if (switches::IsExperimentalAppListEnabled()) {
+    SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
+                                          kExperimentalWindowPadding,
+                                          kTopPadding, kGroupSpacing));
+  } else {
+    SetLayoutManager(new views::FillLayout);
+  }
 }
 
 SearchResultPageView::~SearchResultPageView() {
@@ -56,7 +61,11 @@ SearchResultPageView::~SearchResultPageView() {
 void SearchResultPageView::AddSearchResultContainerView(
     AppListModel::SearchResults* results_model,
     SearchResultContainerView* result_container) {
-  AddChildView(new SearchCardView(result_container));
+  views::View* view_to_add = result_container;

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

view_to_add = IsExperimentalAppListEnabled ? new SCV(...) : result_container;

(and maybe embed that into the next line so you don't have do name a variable.)

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

Compiler says no.

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

Acknowledged.


(Compiler is a bastard.)

+  if (switches::IsExperimentalAppListEnabled())
+    view_to_add = new SearchCardView(result_container);
+
+  AddChildView(view_to_add);
   result_container_views_.push_back(result_container);
   result_container->SetResults(results_model);
 }