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

Unified Diff: chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc

Issue 2509853002: Convert //mash to define service names in mojom (Closed)
Patch Set: . Created 4 years, 1 month 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
Index: chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc
diff --git a/chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc b/chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc
index 17196d6e897a534dae3c06918cda523907ff2149..b6ec58c7fd13a8297838e0da556198e9cba85d62 100644
--- a/chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc
+++ b/chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "content/public/common/service_manager_connection.h"
+#include "content/public/common/service_names.mojom.h"
#include "services/service_manager/public/cpp/connector.h"
namespace chromeos {
@@ -29,10 +30,12 @@ void ShutdownPolicyForwarder::OnShutdownPolicyChanged(bool reboot_on_shutdown) {
// Under mash the ShutdownController interface is in the ash process. In
// classic ash the browser provides it to itself.
- if (chrome::IsRunningInMash())
+ if (chrome::IsRunningInMash()) {
connector->ConnectToInterface("ash", &shutdown_controller);
- else
- connector->ConnectToInterface("content_browser", &shutdown_controller);
+ } else {
+ connector->ConnectToInterface(content::mojom::kBrowserServiceName,
+ &shutdown_controller);
+ }
// Forward the setting to ash.
shutdown_controller->SetRebootOnShutdown(reboot_on_shutdown);
« no previous file with comments | « chrome/browser/chromeos/locale_change_guard.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698