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

Unified Diff: mash/session/session.cc

Issue 2420253002: Rename shell namespace to service_manager (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/session/session.h ('k') | mash/task_viewer/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/session/session.cc
diff --git a/mash/session/session.cc b/mash/session/session.cc
index 358496d7b63ef44e04ac520d7d18f36e58348f1d..395a59a3f49cd6e5ea32ed3e4cf955003ae1e02b 100644
--- a/mash/session/session.cc
+++ b/mash/session/session.cc
@@ -27,7 +27,7 @@ namespace session {
Session::Session() : screen_locked_(false) {}
Session::~Session() {}
-void Session::OnStart(const shell::Identity& identity) {
+void Session::OnStart(const service_manager::Identity& identity) {
StartAppDriver();
StartWindowManager();
StartQuickLaunch();
@@ -35,8 +35,8 @@ void Session::OnStart(const shell::Identity& identity) {
connector()->Connect("service:content_browser");
}
-bool Session::OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) {
+bool Session::OnConnect(const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::Session>(this);
return true;
}
@@ -84,7 +84,7 @@ void Session::UnlockScreen() {
StopScreenlock();
}
-void Session::Create(const shell::Identity& remote_identity,
+void Session::Create(const service_manager::Identity& remote_identity,
mojom::SessionRequest request) {
bindings_.AddBinding(this, std::move(request));
}
@@ -127,7 +127,7 @@ void Session::StartRestartableService(
const base::Closure& restart_callback) {
// TODO(beng): This would be the place to insert logic that counted restarts
// to avoid infinite crash-restart loops.
- std::unique_ptr<shell::Connection> connection =
+ std::unique_ptr<service_manager::Connection> connection =
connector()->Connect(url);
// Note: |connection| may be null if we've lost our connection to the shell.
if (connection) {
« no previous file with comments | « mash/session/session.h ('k') | mash/task_viewer/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698