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

Unified Diff: ui/app_list/views/app_list_demo.cc

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 | « chrome/browser/ui/app_list/app_list_shower_views.cc ('k') | ui/app_list/views/app_list_folder_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_demo.cc
diff --git a/ui/app_list/views/app_list_demo.cc b/ui/app_list/views/app_list_demo.cc
index 6f8809d43a3698a2e366ca0596bc74194fed5321..1d615dfd2ee84e73f5883aea80bf388b36f3ec79 100644
--- a/ui/app_list/views/app_list_demo.cc
+++ b/ui/app_list/views/app_list_demo.cc
@@ -9,7 +9,6 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
#include "grit/ui_resources.h"
-#include "ui/app_list/pagination_model.h"
#include "ui/app_list/test/app_list_test_model.h"
#include "ui/app_list/test/app_list_test_view_delegate.h"
#include "ui/app_list/views/app_list_view.h"
@@ -44,7 +43,6 @@ class DemoAppListViewDelegate : public app_list::test::AppListTestViewDelegate {
virtual content::WebContents* GetStartPageContents() OVERRIDE;
private:
- app_list::PaginationModel pagination_model_;
app_list::AppListView* view_; // Weak. Owns this.
content::BrowserContext* browser_context_;
scoped_ptr<content::WebContents> web_contents_;
@@ -57,7 +55,7 @@ app_list::AppListView* DemoAppListViewDelegate::InitView(
// Note AppListView takes ownership of |this| on the next line.
view_ = new app_list::AppListView(this);
view_->InitAsBubbleAtFixedLocation(window_context,
- &pagination_model_,
+ 0,
gfx::Point(300, 300),
views::BubbleBorder::FLOAT,
false /* border_accepts_events */);
« no previous file with comments | « chrome/browser/ui/app_list/app_list_shower_views.cc ('k') | ui/app_list/views/app_list_folder_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698