Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5482)

Unified Diff: chrome/browser/ui/ash/ash_util.cc

Issue 2552483002: mash: Have chrome set itself as a controller interface for changing volume (Closed)
Patch Set: comment Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/ash_util.h ('k') | chrome/browser/ui/ash/volume_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « chrome/browser/ui/ash/ash_util.h ('k') | chrome/browser/ui/ash/volume_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698