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 6f3748f4bc73e75a2378734280cd664b9ee7055c..d7a98a4a112e26c680cb1a6f8be50a308cc9f81a 100644 |
--- a/chrome/browser/ui/ash/ash_util.h |
+++ b/chrome/browser/ui/ash/ash_util.h |
@@ -21,6 +21,18 @@ class KeyEvent; |
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( |
@@ -30,8 +42,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); |