OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mash/session/session.h" | 5 #include "mash/session/session.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "mash/login/public/interfaces/login.mojom.h" | 10 #include "mash/login/public/interfaces/login.mojom.h" |
11 #include "services/service_manager/public/cpp/connection.h" | 11 #include "services/service_manager/public/cpp/connection.h" |
12 #include "services/service_manager/public/cpp/connector.h" | 12 #include "services/service_manager/public/cpp/connector.h" |
13 | 13 |
14 namespace { | 14 namespace { |
15 | 15 |
16 void LogAndCallServiceRestartCallback(const std::string& url, | 16 void LogAndCallServiceRestartCallback(const std::string& url, |
17 const base::Closure& callback) { | 17 const base::Closure& callback) { |
18 LOG(ERROR) << "Restarting service: " << url; | 18 LOG(ERROR) << "Restarting service: " << url; |
19 callback.Run(); | 19 callback.Run(); |
20 } | 20 } |
21 | 21 |
22 } // namespace | 22 } // namespace |
23 | 23 |
24 namespace mash { | 24 namespace mash { |
25 namespace session { | 25 namespace session { |
26 | 26 |
27 Session::Session() : screen_locked_(false) {} | 27 Session::Session() : screen_locked_(false) {} |
28 Session::~Session() {} | 28 Session::~Session() {} |
29 | 29 |
30 void Session::OnStart(const shell::Identity& identity) { | 30 void Session::OnStart(const service_manager::Identity& identity) { |
31 StartAppDriver(); | 31 StartAppDriver(); |
32 StartWindowManager(); | 32 StartWindowManager(); |
33 StartQuickLaunch(); | 33 StartQuickLaunch(); |
34 // Launch a chrome window for dev convience; don't do this in the long term. | 34 // Launch a chrome window for dev convience; don't do this in the long term. |
35 connector()->Connect("service:content_browser"); | 35 connector()->Connect("service:content_browser"); |
36 } | 36 } |
37 | 37 |
38 bool Session::OnConnect(const shell::Identity& remote_identity, | 38 bool Session::OnConnect(const service_manager::Identity& remote_identity, |
39 shell::InterfaceRegistry* registry) { | 39 service_manager::InterfaceRegistry* registry) { |
40 registry->AddInterface<mojom::Session>(this); | 40 registry->AddInterface<mojom::Session>(this); |
41 return true; | 41 return true; |
42 } | 42 } |
43 | 43 |
44 void Session::Logout() { | 44 void Session::Logout() { |
45 // TODO(beng): Notify connected listeners that login is happening, potentially | 45 // TODO(beng): Notify connected listeners that login is happening, potentially |
46 // give them the option to stop it. | 46 // give them the option to stop it. |
47 mash::login::mojom::LoginPtr login; | 47 mash::login::mojom::LoginPtr login; |
48 connector()->ConnectToInterface("service:login", &login); | 48 connector()->ConnectToInterface("service:login", &login); |
49 login->ShowLoginUI(); | 49 login->ShowLoginUI(); |
(...skipping 27 matching lines...) Expand all Loading... |
77 if (!screen_locked_) | 77 if (!screen_locked_) |
78 return; | 78 return; |
79 screen_locked_ = false; | 79 screen_locked_ = false; |
80 screenlock_listeners_.ForAllPtrs( | 80 screenlock_listeners_.ForAllPtrs( |
81 [](mojom::ScreenlockStateListener* listener) { | 81 [](mojom::ScreenlockStateListener* listener) { |
82 listener->ScreenlockStateChanged(false); | 82 listener->ScreenlockStateChanged(false); |
83 }); | 83 }); |
84 StopScreenlock(); | 84 StopScreenlock(); |
85 } | 85 } |
86 | 86 |
87 void Session::Create(const shell::Identity& remote_identity, | 87 void Session::Create(const service_manager::Identity& remote_identity, |
88 mojom::SessionRequest request) { | 88 mojom::SessionRequest request) { |
89 bindings_.AddBinding(this, std::move(request)); | 89 bindings_.AddBinding(this, std::move(request)); |
90 } | 90 } |
91 | 91 |
92 void Session::StartWindowManager() { | 92 void Session::StartWindowManager() { |
93 StartRestartableService( | 93 StartRestartableService( |
94 "service:ash", | 94 "service:ash", |
95 base::Bind(&Session::StartWindowManager, | 95 base::Bind(&Session::StartWindowManager, |
96 base::Unretained(this))); | 96 base::Unretained(this))); |
97 } | 97 } |
(...skipping 22 matching lines...) Expand all Loading... |
120 auto connection = connections_.find("service:screenlock"); | 120 auto connection = connections_.find("service:screenlock"); |
121 DCHECK(connections_.end() != connection); | 121 DCHECK(connections_.end() != connection); |
122 connections_.erase(connection); | 122 connections_.erase(connection); |
123 } | 123 } |
124 | 124 |
125 void Session::StartRestartableService( | 125 void Session::StartRestartableService( |
126 const std::string& url, | 126 const std::string& url, |
127 const base::Closure& restart_callback) { | 127 const base::Closure& restart_callback) { |
128 // TODO(beng): This would be the place to insert logic that counted restarts | 128 // TODO(beng): This would be the place to insert logic that counted restarts |
129 // to avoid infinite crash-restart loops. | 129 // to avoid infinite crash-restart loops. |
130 std::unique_ptr<shell::Connection> connection = | 130 std::unique_ptr<service_manager::Connection> connection = |
131 connector()->Connect(url); | 131 connector()->Connect(url); |
132 // Note: |connection| may be null if we've lost our connection to the shell. | 132 // Note: |connection| may be null if we've lost our connection to the shell. |
133 if (connection) { | 133 if (connection) { |
134 connection->SetConnectionLostClosure( | 134 connection->SetConnectionLostClosure( |
135 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); | 135 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); |
136 connections_[url] = std::move(connection); | 136 connections_[url] = std::move(connection); |
137 } | 137 } |
138 } | 138 } |
139 | 139 |
140 } // namespace session | 140 } // namespace session |
141 } // namespace main | 141 } // namespace main |
OLD | NEW |