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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First version that links (and crashes) Created 9 years, 3 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: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 294e8ab018b1577e20f1ca6fd672040c8e840bf9..b7423fc53143a72e49fd168c9d4cd050e14132d0 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -151,7 +151,6 @@
// progress and should not be taken as an indication of a real refactoring.
#if defined(OS_WIN)
-
#include "base/environment.h" // For PreRead experiment.
#include "base/win/windows_version.h"
#include "chrome/browser/browser_trial.h"
@@ -1362,7 +1361,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
}
}
#endif
-#if defined(USE_AURA)
+#if defined(USE_AURA) && defined(OS_WINDOWS)
browser::InitAuraDesktop();
#endif

Powered by Google App Engine
This is Rietveld 408576698