Index: ui/app_list/views/apps_grid_view.h |
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h |
index 546d1f8bc812a88ab14c2f09f69f8a86446ff7d1..17cb798b419876e5027def13d2faa6bae67c76c5 100644 |
--- a/ui/app_list/views/apps_grid_view.h |
+++ b/ui/app_list/views/apps_grid_view.h |
@@ -50,7 +50,7 @@ class AppListItemView; |
class AppsGridViewDelegate; |
class AppsGridViewFolderDelegate; |
class PageSwitcher; |
-class PaginationModel; |
+class PaginationController; |
// AppsGridView displays a grid for AppListItemList sub model. |
class APP_LIST_EXPORT AppsGridView : public views::View, |
@@ -224,8 +224,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View, |
DROP_FOR_FOLDER, |
}; |
- enum ScrollAxis { SCROLL_AXIS_HORIZONTAL, SCROLL_AXIS_VERTICAL }; |
- |
// Represents the index to an item view in the grid. |
struct Index { |
Index() : page(-1), slot(-1) {} |
@@ -461,9 +459,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View, |
const base::FilePath& path); |
#endif |
- // Determines whether the grid view scrolls horizontally or vertically. |
- static ScrollAxis GetScrollAxis(); |
- |
AppListModel* model_; // Owned by AppListView. |
AppListItemList* item_list_; // Not owned. |
AppsGridViewDelegate* delegate_; |
@@ -472,6 +467,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View, |
AppsGridViewFolderDelegate* folder_delegate_; |
PaginationModel pagination_model_; |
+ // Must appear after |pagination_model_|. |
+ scoped_ptr<PaginationController> pagination_controller_; |
PageSwitcher* page_switcher_view_; // Owned by views hierarchy. |
int cols_; |