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

Unified Diff: ui/app_list/views/app_list_main_view_unittest.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 | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/app_list_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_main_view_unittest.cc
diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc
index 4007e902d06bf9202a3476964866019ea8613255..f4c5696cfe41bc74fa41b9b7e18dcba9bb433791 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -9,7 +9,6 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "testing/gtest/include/gtest/gtest.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_folder_view.h"
@@ -74,8 +73,7 @@ class AppListMainViewTest : public views::ViewsTestBase {
views::ViewsTestBase::SetUp();
delegate_.reset(new AppListTestViewDelegate);
- main_view_ =
- new AppListMainView(delegate_.get(), &pagination_model_, GetContext());
+ main_view_ = new AppListMainView(delegate_.get(), 0, GetContext());
main_view_->SetPaintToLayer(true);
widget_ = new views::Widget;
@@ -170,7 +168,6 @@ class AppListMainViewTest : public views::ViewsTestBase {
protected:
views::Widget* widget_; // Owned by native window.
AppListMainView* main_view_; // Owned by |widget_|.
- PaginationModel pagination_model_;
scoped_ptr<AppListTestViewDelegate> delegate_;
private:
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/app_list_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698