Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: ui/app_list/views/contents_view.h

Issue 896633005: Remove separate SearchResultListView from ContentsView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@separate_start_page_tile_container
Patch Set: insert_newline Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/contents_view.h
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index 1b7b0cb9f79371bfbf30cd9f284cc537840d8afd..3d296d8d4f8b8730d223d828c9a06c34295b8d0a 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -34,7 +34,6 @@ class AppsContainerView;
class ContentsAnimator;
class PaginationModel;
class SearchBoxView;
-class SearchResultListView;
class SearchResultPageView;
class StartPageView;
@@ -100,9 +99,6 @@ class APP_LIST_EXPORT ContentsView : public views::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_;
}
@@ -216,11 +212,9 @@ class APP_LIST_EXPORT ContentsView : public views::View,
// 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_;
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698