Remove old (dead) app list code.

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 31 matching lines @@
 
 ContentsView::~ContentsView() {
   pagination_model_.RemoveObserver(this);
 }
 
 void ContentsView::Init(AppListModel* model) {
   DCHECK(model);
 
   AppListViewDelegate* view_delegate = app_list_main_view_->view_delegate();
 
-  if (app_list::switches::IsExperimentalAppListEnabled()) {
-    std::vector<views::View*> custom_page_views =
-        view_delegate->CreateCustomPageWebViews(GetLocalBounds().size());
-    // Only add the first custom page view as STATE_CUSTOM_LAUNCHER_PAGE. Ignore
-    // any subsequent custom pages.
-    if (!custom_page_views.empty()) {
-      custom_page_view_ = new CustomLauncherPageView(custom_page_views[0]);
+  std::vector<views::View*> custom_page_views =
+      view_delegate->CreateCustomPageWebViews(GetLocalBounds().size());
+  // Only add the first custom page view as STATE_CUSTOM_LAUNCHER_PAGE. Ignore
+  // any subsequent custom pages.
+  if (!custom_page_views.empty()) {
+    custom_page_view_ = new CustomLauncherPageView(custom_page_views[0]);
 
-      AddLauncherPage(custom_page_view_,
-                      AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
-    }
+    AddLauncherPage(custom_page_view_,
+                    AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
+  }
 
-    // Start page.
-    start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
-    AddLauncherPage(start_page_view_, AppListModel::STATE_START);
-  }
+  // 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();
 
   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(), view_delegate));
-  }
+  search_results_page_view_->AddSearchResultContainerView(
+      results, new SearchResultTileItemListView(
+                   GetSearchBoxView()->search_box(), view_delegate));
   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);
+  int initial_page_index = GetPageIndexForState(AppListModel::STATE_START);
   DCHECK_GE(initial_page_index, 0);
 
   page_before_search_ = initial_page_index;
   // Must only call SetTotalPages once all the launcher pages have been added
   // (as it will trigger a SelectedPageChanged call).
   pagination_model_.SetTotalPages(app_list_pages_.size());
 
   // Page 0 is selected by SetTotalPages and needs to be 'hidden' when selecting
   // the initial page.
   app_list_pages_[GetActivePageIndex()]->OnWillBeHidden();
@@ skipping 92 matching lines @@
 
   std::map<int, AppListModel::State>::const_iterator it =
       view_to_state_.find(GetActivePageIndex());
   if (it != view_to_state_.end())
     state = it->second;
 
   app_list_pages_[GetActivePageIndex()]->OnWillBeShown();
 
   app_list_main_view_->model()->SetState(state);
 
-  if (switches::IsExperimentalAppListEnabled()) {
-    DCHECK(start_page_view_);
+  DCHECK(start_page_view_);
 
-    // 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();
-    bool folder_active = (state == AppListModel::STATE_APPS)
-        ? apps_container_view_->IsInFolderView() : false;
-    app_list_main_view_->search_box_view()->SetBackButtonLabel(folder_active);
+  // 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();
+  bool folder_active = (state == AppListModel::STATE_APPS)
+                           ? apps_container_view_->IsInFolderView()
+                           : false;
+  app_list_main_view_->search_box_view()->SetBackButtonLabel(folder_active);
 
-    // Whenever the page changes, the custom launcher page is considered to have
-    // been reset.
-    app_list_main_view_->model()->ClearCustomLauncherPageSubpages();
-  }
-
+  // Whenever the page changes, the custom launcher page is considered to have
+  // been reset.
+  app_list_main_view_->model()->ClearCustomLauncherPageSubpages();
   app_list_main_view_->search_box_view()->ResetTabFocus(false);
 }
 
 void ContentsView::ShowSearchResults(bool show) {
   int search_page = GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS);
   DCHECK_GE(search_page, 0);
 
   search_results_page_view_->ClearSelectedIndex();
 
   SetActiveStateInternal(show ? search_page : page_before_search_, show, true);
@@ skipping 124 matching lines @@
             view_to_state_.insert(std::make_pair(page_index, state)).second;
 
   // There shouldn't be duplicates in either map.
   DCHECK(success);
   return page_index;
 }
 
 gfx::Rect ContentsView::GetDefaultSearchBoxBounds() const {
   gfx::Rect search_box_bounds(0, 0, GetDefaultContentsSize().width(),
                               GetSearchBoxView()->GetPreferredSize().height());
-  if (switches::IsExperimentalAppListEnabled()) {
-    search_box_bounds.set_y(kExperimentalSearchBoxPadding);
-    search_box_bounds.Inset(kExperimentalSearchBoxPadding, 0);
-  }
+  search_box_bounds.set_y(kSearchBoxPadding);
+  search_box_bounds.Inset(kSearchBoxPadding, 0);
   return search_box_bounds;
 }
 
 gfx::Rect ContentsView::GetSearchBoxBoundsForState(
     AppListModel::State state) const {
   AppListPage* page = GetPageView(GetPageIndexForState(state));
   return page->GetSearchBoxBounds();
 }
 
 gfx::Rect ContentsView::GetDefaultContentsBounds() const {
@@ skipping 99 matching lines @@
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list