Adds the ability to run chromeos with mus

chrome/browser/ui/ash/ash_util.h

Index: chrome/browser/ui/ash/ash_util.h
diff --git a/chrome/browser/ui/ash/ash_util.h b/chrome/browser/ui/ash/ash_util.h
index 59d5283f145b0518061a7fc926284712417296bd..26bf8928c8d082086a409be9133caa9dda8aea36 100644
--- a/chrome/browser/ui/ash/ash_util.h
+++ b/chrome/browser/ui/ash/ash_util.h
@@ -20,6 +20,18 @@ class Accelerator;
 
 namespace ash_util {
 
+enum class Config {
+  // Classic mode does not use mus.
+  CLASSIC,
+
+  // Aura is backed by mus, but chrome and ash are still in the same process.
+  MUS,
+
+  // Aura is backed by mus and chrome and ash are in separate processes. In this
+  // mode chrome code can only use ash code in ash/public/cpp.
+  MASH,
+};
+
 // Creates an in-process Service instance of which can host common ash
 // interfaces.
 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
@@ -29,8 +41,11 @@ std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
 bool ShouldOpenAshOnStartup();
 
 // Returns true if Chrome is running in the mash shell.
+// TODO(sky): convert to GetConfig().
 bool IsRunningInMash();
 
+Config GetConfig();
+
 // Returns true if the given |accelerator| has been deprecated and hence can
 // be consumed by web contents if needed.
 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator);