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

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

Issue 2398783002: Rename a bunch of Mojo Application stuff to reference Services. (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
Index: chrome/browser/ui/ash/system_tray_client.cc
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc
index 2e3414e19ff3136e5b81eb0f06368543f7210cd1..54b2a3661d1a15eb1c64236277c09d7caf2e441e 100644
--- a/chrome/browser/ui/ash/system_tray_client.cc
+++ b/chrome/browser/ui/ash/system_tray_client.cc
@@ -23,7 +23,7 @@
#include "chrome/grit/generated_resources.h"
#include "chromeos/login/login_state.h"
#include "content/public/browser/user_metrics.h"
-#include "content/public/common/mojo_shell_connection.h"
+#include "content/public/common/service_manager_connection.h"
#include "net/base/escape.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/base/l10n/l10n_util.h"
@@ -183,7 +183,7 @@ void SystemTrayClient::ConnectToSystemTray() {
return;
shell::Connector* connector =
- content::MojoShellConnection::GetForProcess()->GetConnector();
+ content::ServiceManagerConnection::GetForProcess()->GetConnector();
// Under mash the SystemTray interface is in the ash process. In classic ash
// we provide it to ourself.
if (chrome::IsRunningInMash())
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698