Adds the ability to run chromeos with mus

chrome/browser/ui/ash/ash_util.cc

 // Copyright (c) 2012 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/ui/ash/ash_util.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/mojo_interface_factory.h"
 #include "ash/shell.h"
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/ash/ash_init.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 namespace ash_util {
 
 namespace {
@@ skipping 29 matching lines @@
 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   return base::MakeUnique<EmbeddedAshService>(task_runner);
 }
 
 bool ShouldOpenAshOnStartup() {
   return !IsRunningInMash();
 }
 
 bool IsRunningInMash() {
-  return service_manager::ServiceManagerIsRemote();
+  return GetConfig() == Config::MASH;
+}
+
+Config GetConfig() {
+  if (!service_manager::ServiceManagerIsRemote())
+    return Config::CLASSIC;
+
+  return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+             switches::kMusConfig) == switches::kMash
+             ? Config::MASH
+             : Config::MUS;
 }
 
 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
   // When running in mash the browser doesn't handle ash accelerators.
   if (IsRunningInMash())
     return false;
 
   return ash::Shell::Get()->accelerator_controller()->IsDeprecated(accelerator);
 }
 
 }  // namespace ash_util