Remove separate SearchResultListView from ContentsView.

ui/app_list/views/search_result_page_view.cc

 // Copyright 2014 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/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"
 #include "ui/app_list/views/search_result_tile_item_list_view.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/shadow_border.h"
 
 namespace app_list {
@@ skipping 20 matching lines @@
 
   void ChildPreferredSizeChanged(views::View* child) override {
     Layout();
     PreferredSizeChanged();
   }
 };
 
 }  // 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() {
 }
 
 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);
 }
 
 bool SearchResultPageView::OnKeyPressed(const ui::KeyEvent& event) {
   if (result_container_views_.at(selected_index_)->OnKeyPressed(event))
     return true;
 
   int dir = 0;
   switch (event.key_code()) {
@@ skipping 40 matching lines @@
   return index >= 0 && index < static_cast<int>(result_container_views_.size());
 }
 
 void SearchResultPageView::ChildPreferredSizeChanged(views::View* child) {
   DCHECK(!result_container_views_.empty());
   Layout();
   SetSelectedIndex(0);
 }
 
 }  // namespace app_list