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

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

Issue 438533002: MacViews: Changes to allow app_list_unittests to compile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Ash Created 6 years, 5 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 | « no previous file | ui/app_list/views/app_list_view_unittest.cc » ('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 5ccd17e7982bd4c5890aad04a58e19184b51a3a8..625a86c2519336f12215bae39906d495be1d1937 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -73,7 +73,10 @@ class AppListMainViewTest : public views::ViewsTestBase {
views::ViewsTestBase::SetUp();
delegate_.reset(new AppListTestViewDelegate);
- main_view_ = new AppListMainView(delegate_.get(), 0, GetContext());
+ // In Ash, the third argument is a container aura::Window, but it is always
+ // NULL on Windows, and not needed for tests. It is only used to determine
+ // the scale factor for preloading icons.
+ main_view_ = new AppListMainView(delegate_.get(), 0, NULL);
main_view_->SetPaintToLayer(true);
main_view_->model()->SetFoldersEnabled(true);
« no previous file with comments | « no previous file | ui/app_list/views/app_list_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698