Aura under Linux

chrome/browser/chrome_browser_main.cc

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..4cc1d020887430a83498319465e6593dd051cd75 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"
@@ -1328,6 +1327,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
   if (!parsed_command_line().HasSwitch(switches::kViewsDesktop))
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kViewsDesktop,
                                                         "other");
+#elif defined(USE_AURA) && defined(OS_LINUX)
+  // Always add the --views-desktop flag, if not already set.
+  if (!parsed_command_line().HasSwitch(switches::kViewsDesktop))
+    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kViewsDesktop);
 #endif
 
   // Convert active labs into switches. Modifies the current command line.
@@ -1362,7 +1365,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
     }
   }
 #endif
-#if defined(USE_AURA)
+#if defined(USE_AURA) && defined(OS_WIN)
   browser::InitAuraDesktop();
 #endif