Remove separate SearchResultListView from ContentsView.

ui/app_list/views/contents_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 
 #include <map>
 #include <utility>
 
@@ skipping 16 matching lines @@
 
 class AppsGridView;
 class ApplicationDragAndDropHost;
 class AppListFolderItem;
 class AppListMainView;
 class AppListViewDelegate;
 class AppsContainerView;
 class ContentsAnimator;
 class PaginationModel;
 class SearchBoxView;
-class SearchResultListView;
 class SearchResultPageView;
 class StartPageView;
 
 // A view to manage launcher pages within the Launcher (eg. start page, apps
 // grid view, search results). There can be any number of launcher pages, only
 // one of which can be active at a given time. ContentsView provides the user
 // interface for switching between launcher pages, and animates the transition
 // between them.
 class APP_LIST_EXPORT ContentsView : public views::View,
                                      public PaginationModelObserver {
@@ skipping 45 matching lines @@
 
   int NumLauncherPages() const;
 
   void Prerender();
 
   AppsContainerView* apps_container_view() const {
     return apps_container_view_;
   }
   StartPageView* start_page_view() const { return start_page_view_; }
   views::View* custom_page_view() const { return custom_page_view_; }
-  SearchResultListView* search_results_list_view() const {
-    return search_results_list_view_;
-  }
   SearchResultPageView* search_results_page_view() {
     return search_results_page_view_;
   }
   views::View* GetPageView(int index) const;
 
   SearchBoxView* GetSearchBoxView() const;
 
   AppListMainView* app_list_main_view() const { return app_list_main_view_; }
 
   // Adds a blank launcher page. For use in tests only.
@@ skipping 93 matching lines @@
   // the animator should be run in reverse (because it is a |to_page| to
   // |from_page| animator), |reverse| is set to true; otherwise it is set to
   // false.
   ContentsAnimator* GetAnimatorForTransition(int from_page,
                                              int to_page,
                                              bool* reverse) const;
 
   // Special sub views of the ContentsView. All owned by the views hierarchy.
   AppsContainerView* apps_container_view_;
 
-  // Only used in the normal app list.
-  SearchResultListView* search_results_list_view_;
+  SearchResultPageView* search_results_page_view_;
 
   // Only used in the experimental app list.
-  SearchResultPageView* search_results_page_view_;
   StartPageView* start_page_view_;
   views::View* custom_page_view_;
 
   AppListMainView* app_list_main_view_;     // Parent view, owns this.
 
   scoped_ptr<views::ViewModel> view_model_;
 
   // Maps State onto |view_model_| indices.
   std::map<AppListModel::State, int> state_to_view_;
 
@@ skipping 13 matching lines @@
 
   // The animator for transitions not found in |contents_animators_|.
   scoped_ptr<ContentsAnimator> default_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_