Remove old (dead) app list code.

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 <stddef.h>
 
 #include <algorithm>
 
@@ skipping 33 matching lines @@
         views::Background::CreateSolidBackground(kCardBackgroundColor));
     AddChildView(content_view);
   }
 
   ~SearchCardView() override {}
 };
 
 }  // namespace
 
 SearchResultPageView::SearchResultPageView() : selected_index_(0) {
-  if (switches::IsExperimentalAppListEnabled()) {
-    gfx::ShadowValue shadow = GetShadowForZHeight(kSearchResultZHeight);
-    std::unique_ptr<views::Border> border(new views::ShadowBorder(shadow));
+  gfx::ShadowValue shadow = GetShadowForZHeight(kSearchResultZHeight);
+  std::unique_ptr<views::Border> border(new views::ShadowBorder(shadow));
 
-    gfx::Insets insets = gfx::Insets(kTopPadding, kExperimentalSearchBoxPadding,
-                                     0, kExperimentalSearchBoxPadding);
-    insets += -border->GetInsets();
+  gfx::Insets insets =
+      gfx::Insets(kTopPadding, kSearchBoxPadding, 0, kSearchBoxPadding);
+  insets += -border->GetInsets();
 
-    views::BoxLayout* layout =
-        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, kGroupSpacing);
-    layout->set_inside_border_insets(insets);
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, kGroupSpacing);
+  layout->set_inside_border_insets(insets);
 
-    SetLayoutManager(layout);
-  } else {
-    SetLayoutManager(new views::FillLayout);
-  }
+  SetLayoutManager(layout);
 }
 
 SearchResultPageView::~SearchResultPageView() {
 }
 
 void SearchResultPageView::SetSelection(bool select) {
   if (select)
     SetSelectedIndex(0, false);
   else
     ClearSelectedIndex();
 }
 
 void SearchResultPageView::AddSearchResultContainerView(
     AppListModel::SearchResults* results_model,
     SearchResultContainerView* result_container) {
-  views::View* view_to_add = result_container;
-  if (switches::IsExperimentalAppListEnabled())
-    view_to_add = new SearchCardView(result_container);
-
-  AddChildView(view_to_add);
+  AddChildView(new SearchCardView(result_container));
   result_container_views_.push_back(result_container);
   result_container->SetResults(results_model);
   result_container->set_delegate(this);
 }
 
 bool SearchResultPageView::OnKeyPressed(const ui::KeyEvent& event) {
   if (HasSelection() &&
       result_container_views_.at(selected_index_)->OnKeyPressed(event)) {
     return true;
   }
@@ skipping 68 matching lines @@
   SearchResultContainerView* old_selection =
       HasSelection() ? result_container_views_[selected_index_] : nullptr;
 
   // Truncate the currently selected container's selection if necessary. If
   // there are no results, the selection will be cleared below.
   if (old_selection && old_selection->num_results() > 0 &&
       old_selection->selected_index() >= old_selection->num_results()) {
     old_selection->SetSelectedIndex(old_selection->num_results() - 1);
   }
 
-  if (switches::IsExperimentalAppListEnabled()) {
-    // Sort the result container views by their score.
-    std::sort(result_container_views_.begin(), result_container_views_.end(),
-              [](const SearchResultContainerView* a,
-                 const SearchResultContainerView* b) -> bool {
-                return a->container_score() > b->container_score();
-              });
+  // Sort the result container views by their score.
+  std::sort(result_container_views_.begin(), result_container_views_.end(),
+            [](const SearchResultContainerView* a,
+               const SearchResultContainerView* b) -> bool {
+              return a->container_score() > b->container_score();
+            });
 
-    int result_y_index = 0;
-    for (size_t i = 0; i < result_container_views_.size(); ++i) {
-      SearchResultContainerView* view = result_container_views_[i];
-      ReorderChildView(view->parent(), i);
+  int result_y_index = 0;
+  for (size_t i = 0; i < result_container_views_.size(); ++i) {
+    SearchResultContainerView* view = result_container_views_[i];
+    ReorderChildView(view->parent(), i);
 
-      view->NotifyFirstResultYIndex(result_y_index);
+    view->NotifyFirstResultYIndex(result_y_index);
 
-      result_y_index += view->GetYSize();
-    }
+    result_y_index += view->GetYSize();
   }
 
   Layout();
 
   SearchResultContainerView* new_selection = nullptr;
   if (HasSelection() &&
       result_container_views_[selected_index_]->num_results() > 0) {
     new_selection = result_container_views_[selected_index_];
   }
 
@@ skipping 32 matching lines @@
 
   gfx::Rect onscreen_bounds(
       GetPageBoundsForState(AppListModel::STATE_SEARCH_RESULTS));
   onscreen_bounds -= bounds().OffsetFromOrigin();
   gfx::Path path;
   path.addRect(gfx::RectToSkRect(onscreen_bounds));
   set_clip_path(path);
 }
 
 int SearchResultPageView::GetSearchBoxZHeight() const {
-  return switches::IsExperimentalAppListEnabled()
-             ? kSearchResultZHeight
-             : AppListPage::GetSearchBoxZHeight();
+  return kSearchResultZHeight;
 }
 
 void SearchResultPageView::OnHidden() {
   ClearSelectedIndex();
 }
 
 }  // namespace app_list