| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 StopScreenlock(); | 85 StopScreenlock(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void Session::Create(shell::Connection* connection, | 88 void Session::Create(shell::Connection* connection, |
| 89 mojom::SessionRequest request) { | 89 mojom::SessionRequest request) { |
| 90 bindings_.AddBinding(this, std::move(request)); | 90 bindings_.AddBinding(this, std::move(request)); |
| 91 } | 91 } |
| 92 | 92 |
| 93 void Session::StartWindowManager() { | 93 void Session::StartWindowManager() { |
| 94 StartRestartableService( | 94 StartRestartableService( |
| 95 "mojo:desktop_wm", | 95 "mojo:ash", |
| 96 base::Bind(&Session::StartWindowManager, | 96 base::Bind(&Session::StartWindowManager, |
| 97 base::Unretained(this))); | 97 base::Unretained(this))); |
| 98 } | 98 } |
| 99 | 99 |
| 100 void Session::StartSystemUI() { | 100 void Session::StartSystemUI() { |
| 101 StartRestartableService("mojo:ash_sysui", | 101 StartRestartableService("mojo:ash_sysui", |
| 102 base::Bind(&Session::StartSystemUI, | 102 base::Bind(&Session::StartSystemUI, |
| 103 base::Unretained(this))); | 103 base::Unretained(this))); |
| 104 } | 104 } |
| 105 | 105 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 if (connection) { | 139 if (connection) { |
| 140 connection->SetConnectionLostClosure( | 140 connection->SetConnectionLostClosure( |
| 141 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); | 141 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); |
| 142 connection->AddInterface<mojom::Session>(this); | 142 connection->AddInterface<mojom::Session>(this); |
| 143 connections_[url] = std::move(connection); | 143 connections_[url] = std::move(connection); |
| 144 } | 144 } |
| 145 } | 145 } |
| 146 | 146 |
| 147 } // namespace session | 147 } // namespace session |
| 148 } // namespace main | 148 } // namespace main |
| OLD | NEW |