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

Unified Diff: ash/common/system/tray/system_tray_controller.cc

Issue 2390013002: Rename mojo: to service: (Closed)
Patch Set: . Created 4 years, 2 months 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 | « ash/autoclick/mus/manifest.json ('k') | ash/mus/accelerators/accelerator_controller_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_controller.cc
diff --git a/ash/common/system/tray/system_tray_controller.cc b/ash/common/system/tray/system_tray_controller.cc
index 15054e342add06d3de100058e76be8b65248f3fd..d5dd3f798dcf5b851f0453f9ddc50c2a7f206a15 100644
--- a/ash/common/system/tray/system_tray_controller.cc
+++ b/ash/common/system/tray/system_tray_controller.cc
@@ -97,10 +97,12 @@ bool SystemTrayController::ConnectToSystemTrayClient() {
return true;
// Connect (or reconnect) to the interface.
- if (WmShell::Get()->IsRunningInMash())
+ if (WmShell::Get()->IsRunningInMash()) {
connector_->ConnectToInterface("exe:chrome", &system_tray_client_);
- else
- connector_->ConnectToInterface("exe:content_browser", &system_tray_client_);
+ } else {
+ connector_->ConnectToInterface("service:content_browser",
+ &system_tray_client_);
+ }
// Handle chrome crashes by forcing a reconnect on the next request.
system_tray_client_.set_connection_error_handler(base::Bind(
« no previous file with comments | « ash/autoclick/mus/manifest.json ('k') | ash/mus/accelerators/accelerator_controller_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698