| 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/shell/public/cpp/connection.h" |
| 12 #include "services/shell/public/cpp/connector.h" | 12 #include "services/shell/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) << "JAMES not restarting service! " << url; |
| 19 callback.Run(); | 19 // LOG(ERROR) << "Restarting service: " << url; |
| 20 // callback.Run(); |
| 20 } | 21 } |
| 21 | 22 |
| 22 } // namespace | 23 } // namespace |
| 23 | 24 |
| 24 namespace mash { | 25 namespace mash { |
| 25 namespace session { | 26 namespace session { |
| 26 | 27 |
| 27 Session::Session() : connector_(nullptr), screen_locked_(false) {} | 28 Session::Session() : connector_(nullptr), screen_locked_(false) {} |
| 28 Session::~Session() {} | 29 Session::~Session() {} |
| 29 | 30 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 if (connection) { | 140 if (connection) { |
| 140 connection->SetConnectionLostClosure( | 141 connection->SetConnectionLostClosure( |
| 141 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); | 142 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); |
| 142 connection->AddInterface<mojom::Session>(this); | 143 connection->AddInterface<mojom::Session>(this); |
| 143 connections_[url] = std::move(connection); | 144 connections_[url] = std::move(connection); |
| 144 } | 145 } |
| 145 } | 146 } |
| 146 | 147 |
| 147 } // namespace session | 148 } // namespace session |
| 148 } // namespace main | 149 } // namespace main |
| OLD | NEW |