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/shell/public/cpp/connection.h" | 11 #include "services/service_manager/public/cpp/connection.h" |
12 #include "services/shell/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 |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |