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

Unified Diff: trunk/src/chrome/browser/signin/signin_error_notifier_ash_unittest.cc

Issue 287783002: Revert 270232 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
Index: trunk/src/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
===================================================================
--- trunk/src/chrome/browser/signin/signin_error_notifier_ash_unittest.cc (revision 270237)
+++ trunk/src/chrome/browser/signin/signin_error_notifier_ash_unittest.cc (working copy)
@@ -80,7 +80,7 @@
AshTestBase::SetUp();
// Set up screen for Windows.
-#if defined(OS_WIN)
+#if !defined(OS_CHROMEOS)
aura::TestScreen* test_screen = aura::TestScreen::Create();
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen);
gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop);

Powered by Google App Engine
This is Rietveld 408576698