| 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" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 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 shell::Identity& identity) { |
| 31 StartAppDriver(); | 31 StartAppDriver(); |
| 32 StartWindowManager(); | 32 StartWindowManager(); |
| 33 StartSystemUI(); | 33 StartSystemUI(); |
| 34 StartQuickLaunch(); | 34 StartQuickLaunch(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool Session::OnConnect(shell::Connection* connection) { | 37 bool Session::OnConnect(const shell::Identity& remote_identity, |
| 38 connection->AddInterface<mojom::Session>(this); | 38 shell::InterfaceRegistry* registry) { |
| 39 registry->AddInterface<mojom::Session>(this); |
| 39 return true; | 40 return true; |
| 40 } | 41 } |
| 41 | 42 |
| 42 void Session::Logout() { | 43 void Session::Logout() { |
| 43 // TODO(beng): Notify connected listeners that login is happening, potentially | 44 // TODO(beng): Notify connected listeners that login is happening, potentially |
| 44 // give them the option to stop it. | 45 // give them the option to stop it. |
| 45 mash::login::mojom::LoginPtr login; | 46 mash::login::mojom::LoginPtr login; |
| 46 connector()->ConnectToInterface("mojo:login", &login); | 47 connector()->ConnectToInterface("mojo:login", &login); |
| 47 login->ShowLoginUI(); | 48 login->ShowLoginUI(); |
| 48 // This kills the user environment. | 49 // This kills the user environment. |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 // Note: |connection| may be null if we've lost our connection to the shell. | 137 // Note: |connection| may be null if we've lost our connection to the shell. |
| 137 if (connection) { | 138 if (connection) { |
| 138 connection->SetConnectionLostClosure( | 139 connection->SetConnectionLostClosure( |
| 139 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); | 140 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); |
| 140 connections_[url] = std::move(connection); | 141 connections_[url] = std::move(connection); |
| 141 } | 142 } |
| 142 } | 143 } |
| 143 | 144 |
| 144 } // namespace session | 145 } // namespace session |
| 145 } // namespace main | 146 } // namespace main |
| OLD | NEW |