| Index: mash/init/init.cc
|
| diff --git a/mash/init/init.cc b/mash/init/init.cc
|
| index 2789820606aafbc6b9bc61d0b38fcac32d48cce1..a167bf7c4af2010a3d06e4c64faaabc9447e1e6a 100644
|
| --- a/mash/init/init.cc
|
| +++ b/mash/init/init.cc
|
| @@ -19,9 +19,8 @@ namespace init {
|
| Init::Init() {}
|
| Init::~Init() {}
|
|
|
| -void Init::OnStart(service_manager::ServiceContext* context) {
|
| - context_ = context;
|
| - context->connector()->Connect("service:ui");
|
| +void Init::OnStart() {
|
| + context()->connector()->Connect("service:ui");
|
| StartTracing();
|
| StartLogin();
|
| }
|
| @@ -37,7 +36,7 @@ void Init::StartService(const std::string& name, const std::string& user_id) {
|
| service_manager::Connector::ConnectParams params(
|
| service_manager::Identity(name, user_id));
|
| std::unique_ptr<service_manager::Connection> connection =
|
| - context_->connector()->Connect(¶ms);
|
| + context()->connector()->Connect(¶ms);
|
| connection->SetConnectionLostClosure(
|
| base::Bind(&Init::UserServiceQuit, base::Unretained(this), user_id));
|
| user_services_[user_id] = std::move(connection);
|
| @@ -62,11 +61,11 @@ void Init::UserServiceQuit(const std::string& user_id) {
|
| }
|
|
|
| void Init::StartTracing() {
|
| - context_->connector()->Connect("service:tracing");
|
| + context()->connector()->Connect("service:tracing");
|
| }
|
|
|
| void Init::StartLogin() {
|
| - login_connection_ = context_->connector()->Connect("service:login");
|
| + login_connection_ = context()->connector()->Connect("service:login");
|
| mash::login::mojom::LoginPtr login;
|
| login_connection_->GetInterface(&login);
|
| login->ShowLoginUI();
|
|
|