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

Side by Side Diff: ui/app_list/views/app_list_folder_view.h

Issue 302803002: Refactor app list so AppsGridView owns the PaginationModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error (conflict). Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/app_list/views/app_list_demo.cc ('k') | ui/app_list/views/app_list_folder_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/app_list/app_list_item_list_observer.h" 10 #include "ui/app_list/app_list_item_list_observer.h"
(...skipping 11 matching lines...) Expand all
22 22
23 namespace app_list { 23 namespace app_list {
24 24
25 class AppsContainerView; 25 class AppsContainerView;
26 class AppsGridView; 26 class AppsGridView;
27 class AppListFolderItem; 27 class AppListFolderItem;
28 class AppListItemView; 28 class AppListItemView;
29 class AppListMainView; 29 class AppListMainView;
30 class AppListModel; 30 class AppListModel;
31 class FolderHeaderView; 31 class FolderHeaderView;
32 class PaginationModel;
33 32
34 class AppListFolderView : public views::View, 33 class AppListFolderView : public views::View,
35 public FolderHeaderViewDelegate, 34 public FolderHeaderViewDelegate,
36 public AppListModelObserver, 35 public AppListModelObserver,
37 public ui::ImplicitAnimationObserver, 36 public ui::ImplicitAnimationObserver,
38 public AppsGridViewFolderDelegate { 37 public AppsGridViewFolderDelegate {
39 public: 38 public:
40 AppListFolderView(AppsContainerView* container_view, 39 AppListFolderView(AppsContainerView* container_view,
41 AppListModel* model, 40 AppListModel* model,
42 AppListMainView* app_list_main_view); 41 AppListMainView* app_list_main_view);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 AppsContainerView* container_view_; // Not owned. 111 AppsContainerView* container_view_; // Not owned.
113 AppListMainView* app_list_main_view_; // Not Owned. 112 AppListMainView* app_list_main_view_; // Not Owned.
114 FolderHeaderView* folder_header_view_; // Owned by views hierarchy. 113 FolderHeaderView* folder_header_view_; // Owned by views hierarchy.
115 AppsGridView* items_grid_view_; // Owned by the views hierarchy. 114 AppsGridView* items_grid_view_; // Owned by the views hierarchy.
116 115
117 scoped_ptr<views::ViewModel> view_model_; 116 scoped_ptr<views::ViewModel> view_model_;
118 117
119 AppListModel* model_; // Not owned. 118 AppListModel* model_; // Not owned.
120 AppListFolderItem* folder_item_; // Not owned. 119 AppListFolderItem* folder_item_; // Not owned.
121 120
122 scoped_ptr<PaginationModel> pagination_model_;
123
124 bool hide_for_reparent_; 121 bool hide_for_reparent_;
125 122
126 base::string16 accessible_name_; 123 base::string16 accessible_name_;
127 124
128 DISALLOW_COPY_AND_ASSIGN(AppListFolderView); 125 DISALLOW_COPY_AND_ASSIGN(AppListFolderView);
129 }; 126 };
130 127
131 } // namespace app_list 128 } // namespace app_list
132 129
133 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_ 130 #endif // UI_APP_LIST_VIEWS_APP_LIST_FOLDER_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_demo.cc ('k') | ui/app_list/views/app_list_folder_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698