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

Unified Diff: ui/app_list/views/apps_grid_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_container_view.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8ae31176729a61c88c7c050d56c1df6314371587..1319e120e61b2735094d2e4bfb6671313d1c26d7 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -10,10 +10,12 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
#include "base/timer/timer.h"
#include "ui/app_list/app_list_export.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_model_observer.h"
+#include "ui/app_list/pagination_model.h"
#include "ui/app_list/pagination_model_observer.h"
#include "ui/base/models/list_model_observer.h"
#include "ui/compositor/layer_animation_observer.h"
@@ -70,10 +72,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
};
// Constructs the app icon grid view. |delegate| is the delegate of this
- // view, which usually is the hosting AppListView. |pagination_model| is
- // the paging info shared within the launcher UI.
- AppsGridView(AppsGridViewDelegate* delegate,
- PaginationModel* pagination_model);
+ // view, which usually is the hosting AppListView.
+ explicit AppsGridView(AppsGridViewDelegate* delegate);
virtual ~AppsGridView();
// Sets fixed layout parameters. After setting this, CalculateLayout below
@@ -131,6 +131,9 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
bool has_dragged_view() const { return drag_view_ != NULL; }
bool dragging() const { return drag_pointer_ != NONE; }
+ // Gets the PaginationModel used for the grid view.
+ PaginationModel* pagination_model() { return &pagination_model_; }
+
// Overridden from views::View:
virtual gfx::Size GetPreferredSize() const OVERRIDE;
virtual void Layout() OVERRIDE;
@@ -461,7 +464,7 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
// This can be NULL. Only grid views inside folders have a folder delegate.
AppsGridViewFolderDelegate* folder_delegate_;
- PaginationModel* pagination_model_; // Owned by AppListController.
+ PaginationModel pagination_model_;
PageSwitcher* page_switcher_view_; // Owned by views hierarchy.
gfx::Size icon_size_;
« no previous file with comments | « ui/app_list/views/apps_container_view.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698