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

Unified Diff: ui/app_list/views/contents_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, 7 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/apps_grid_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 270f0eab2653ec45980f83e57f1733578e855681..670eae169a4a7f05d4461e6712c33f8527aa6d57 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -45,7 +45,6 @@ class APP_LIST_EXPORT ContentsView : public views::View {
};
ContentsView(AppListMainView* app_list_main_view,
- PaginationModel* pagination_model,
AppListModel* model,
AppListViewDelegate* view_delegate);
virtual ~ContentsView();
@@ -84,12 +83,14 @@ class APP_LIST_EXPORT ContentsView : public views::View {
void CalculateIdealBounds();
void AnimateToIdealBounds();
+ // Gets the PaginationModel owned by the AppsGridView.
+ PaginationModel* GetAppsPaginationModel();
+
// Overridden from ui::EventHandler:
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
ShowState show_state_;
- PaginationModel* pagination_model_; // Owned by AppListController.
AppsContainerView* apps_container_view_; // Owned by the views hierarchy.
StartPageView* start_page_view_; // Owned by the views hierarchy.
« no previous file with comments | « ui/app_list/views/apps_grid_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