| Index: chrome/browser/ui/ash/ash_util.cc
|
| diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
|
| index 33c69c1abb7dc72dc2d98442f6e26230980b3d90..4609b798fcf30f25527331ce5e2b303ff2ce8bd3 100644
|
| --- a/chrome/browser/ui/ash/ash_util.cc
|
| +++ b/chrome/browser/ui/ash/ash_util.cc
|
| @@ -8,9 +8,23 @@
|
| #include "ash/common/wm_shell.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/ui/ash/ash_init.h"
|
| +#include "content/public/common/service_names.mojom.h"
|
| #include "services/service_manager/runner/common/client_util.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
|
|
| +namespace ash_util {
|
| +
|
| +const char* GetAshServiceName() {
|
| + // Under mash the ash process provides the service.
|
| + if (chrome::IsRunningInMash())
|
| + return "ash";
|
| +
|
| + // Under classic ash the browser process provides the service.
|
| + return content::mojom::kBrowserServiceName;
|
| +}
|
| +
|
| +} // namespace ash_util
|
| +
|
| namespace chrome {
|
|
|
| bool ShouldOpenAshOnStartup() {
|
|
|