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

Unified Diff: mash/init/init.h

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/example/window_type_launcher/window_type_launcher.cc ('k') | mash/init/init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/init/init.h
diff --git a/mash/init/init.h b/mash/init/init.h
index 98982c01608e426fe8f116f84c54c00c6ac66707..8395dd1882723aec5b816978d821c172e8192b1c 100644
--- a/mash/init/init.h
+++ b/mash/init/init.h
@@ -22,21 +22,21 @@ class Connection;
namespace mash {
namespace init {
-class Init : public shell::Service,
- public shell::InterfaceFactory<mojom::Init>,
+class Init : public service_manager::Service,
+ public service_manager::InterfaceFactory<mojom::Init>,
public mojom::Init {
public:
Init();
~Init() override;
private:
- // shell::Service:
- void OnStart(const shell::Identity& identity) override;
- bool OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) override;
+ // service_manager::Service:
+ void OnStart(const service_manager::Identity& identity) override;
+ bool OnConnect(const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) override;
- // shell::InterfaceFactory<mojom::Login>:
- void Create(const shell::Identity& remote_identity,
+ // service_manager::InterfaceFactory<mojom::Login>:
+ void Create(const service_manager::Identity& remote_identity,
mojom::InitRequest request) override;
// mojom::Init:
@@ -49,9 +49,10 @@ class Init : public shell::Service,
void StartTracing();
void StartLogin();
- std::unique_ptr<shell::Connection> login_connection_;
+ std::unique_ptr<service_manager::Connection> login_connection_;
mojo::BindingSet<mojom::Init> init_bindings_;
- std::map<std::string, std::unique_ptr<shell::Connection>> user_services_;
+ std::map<std::string, std::unique_ptr<service_manager::Connection>>
+ user_services_;
DISALLOW_COPY_AND_ASSIGN(Init);
};
« no previous file with comments | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/init/init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698