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

Unified Diff: mash/login/login.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 | « mash/init/manifest.json ('k') | mash/login/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/login/login.cc
diff --git a/mash/login/login.cc b/mash/login/login.cc
index 4a5cb3f23338f1066652dd4c1594de50c16288e7..8f83374a8faa15f61be3506cca3354a41756beca 100644
--- a/mash/login/login.cc
+++ b/mash/login/login.cc
@@ -111,7 +111,7 @@ class UI : public views::WidgetDelegateView,
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
void StartWindowManager(const shell::Identity& identity) {
- mash_wm_connection_ = connector_->Connect("mojo:ash");
+ mash_wm_connection_ = connector_->Connect("service:ash");
mash_wm_connection_->SetConnectionLostClosure(
base::Bind(&UI::StartWindowManager, base::Unretained(this), identity));
window_manager_connection_ =
@@ -140,8 +140,8 @@ class Login : public shell::Service,
void LoginAs(const std::string& user_id) {
user_access_manager_->SetActiveUser(user_id);
mash::init::mojom::InitPtr init;
- connector()->ConnectToInterface("mojo:mash_init", &init);
- init->StartService("mojo:mash_session", user_id);
+ connector()->ConnectToInterface("service:mash_init", &init);
+ init->StartService("service:mash_session", user_id);
}
private:
@@ -153,7 +153,7 @@ class Login : public shell::Service,
aura_init_.reset(
new views::AuraInit(connector(), "views_mus_resources.pak"));
- connector()->ConnectToInterface("mojo:ui", &user_access_manager_);
+ connector()->ConnectToInterface("service:ui", &user_access_manager_);
user_access_manager_->SetActiveUser(identity.user_id());
}
bool OnConnect(const shell::Identity& remote_identity,
« no previous file with comments | « mash/init/manifest.json ('k') | mash/login/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698