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

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

Issue 35783003: Revert 230227 "Implement app list folder management page UI, inc..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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
Index: trunk/src/ui/app_list/views/contents_view.h
===================================================================
--- trunk/src/ui/app_list/views/contents_view.h (revision 230254)
+++ trunk/src/ui/app_list/views/contents_view.h (working copy)
@@ -23,11 +23,9 @@
class AppsGridView;
class ApplicationDragAndDropHost;
-class AppListFolderItem;
class AppListMainView;
class AppListModel;
class AppListViewDelegate;
-class AppsContainerView;
class PaginationModel;
// A view to manage sub views under the search box (apps grid view + page
@@ -51,12 +49,9 @@
ApplicationDragAndDropHost* drag_and_drop_host);
void ShowSearchResults(bool show);
- void ShowFolderContent(AppListFolderItem* folder);
void Prerender();
- AppsContainerView* apps_container_view() { return apps_container_view_; }
-
private:
enum ShowState {
SHOW_APPS,
@@ -85,7 +80,7 @@
ShowState show_state_;
PaginationModel* pagination_model_; // Owned by AppListController.
- AppsContainerView* apps_container_view_; // Owned by the views hierarchy.
+ AppsGridView* apps_grid_view_; // Owned by the view.
scoped_ptr<views::ViewModel> view_model_;
scoped_ptr<views::BoundsAnimator> bounds_animator_;
« no previous file with comments | « trunk/src/ui/app_list/views/apps_grid_view_unittest.cc ('k') | trunk/src/ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698