Aura under Linux

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 133 matching lines @@
 #include "chrome/browser/oom_priority_manager.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #endif
 
 // TODO(port): several win-only methods have been pulled out of this, but
 // BrowserMain() as a whole needs to be broken apart so that it's usable by
 // other platforms. For now, it's just a stub. This is a serious work in
 // 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"
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
 #include "chrome/browser/first_run/upgrade_util_win.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/ui/views/user_data_dir_dialog.h"
 #include "chrome/installer/util/helper.h"
@@ skipping 1156 matching lines @@
   }
 #endif
 
 #if defined(TOUCH_UI)
   // Always add the --views-desktop flag, if not already set.
   // If the user disabled the flag from about:flags, it will get unset by the
   // call to ConvertFlagsToSwitches in the following line.
   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.
   about_flags::ConvertFlagsToSwitches(local_state,
                                       CommandLine::ForCurrentProcess());
 
   // Reset the command line in the crash report details, since we may have
   // just changed it to include experiments.
   child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
 
@@ skipping 14 matching lines @@
       else
         desktop_type = views::desktop::DesktopWindowView::DESKTOP_DEFAULT;
       views::desktop::DesktopWindowView::CreateDesktopWindow(desktop_type);
       ChromeViewsDelegate* chrome_views_delegate = static_cast
           <ChromeViewsDelegate*>(views::ViewsDelegate::views_delegate);
       chrome_views_delegate->default_parent_view =
         views::desktop::DesktopWindowView::desktop_window_view;
     }
   }
 #endif
-#if defined(USE_AURA)
+#if defined(USE_AURA) && defined(OS_WIN)
   browser::InitAuraDesktop();
 #endif
 
   InitializeNetworkOptions(parsed_command_line());
   InitializeURLRequestThrottlerManager(browser_process_->net_log());
 
   // Initialize histogram synchronizer system. This is a singleton and is used
   // for posting tasks via NewRunnableMethod. Its deleted when it goes out of
   // scope. Even though NewRunnableMethod does AddRef and Release, the object
   // will not be deleted after the Task is executed.
@@ skipping 662 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }