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

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

Issue 305013014: Disable folder UI when app sync is disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
« ui/app_list/app_list_model.cc ('K') | « ui/app_list/views/apps_grid_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_grid_view_unittest.cc
diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc
index d93943d9c6270f775407df0ce4a8a8c6e0eebb4c..0db03601d1ea18579f227f11844bedccb68abe69 100644
--- a/ui/app_list/views/apps_grid_view_unittest.cc
+++ b/ui/app_list/views/apps_grid_view_unittest.cc
@@ -106,6 +106,7 @@ class AppsGridViewTest : public views::ViewsTestBase {
virtual void SetUp() OVERRIDE {
views::ViewsTestBase::SetUp();
model_.reset(new AppListTestModel);
+ model_->SetFoldersEnabled(true);
pagination_model_.reset(new PaginationModel);
apps_grid_view_.reset(new AppsGridView(NULL, pagination_model_.get()));
@@ -278,7 +279,7 @@ TEST_F(AppsGridViewTest, RemoveSelectedLastApp) {
}
TEST_F(AppsGridViewTest, MouseDragWithFolderDisabled) {
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSyncAppList);
+ model_->SetFoldersEnabled(false);
const int kTotalItems = 4;
model_->PopulateApps(kTotalItems);
EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
@@ -549,7 +550,7 @@ TEST_F(AppsGridViewTest, MouseDragFlipPage) {
}
TEST_F(AppsGridViewTest, SimultaneousDragWithFolderDisabled) {
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSyncAppList);
+ model_->SetFoldersEnabled(false);
const int kTotalItems = 4;
model_->PopulateApps(kTotalItems);
EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
« ui/app_list/app_list_model.cc ('K') | « ui/app_list/views/apps_grid_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698