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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 const std::string& url, | 130 const std::string& url, |
131 const base::Closure& restart_callback) { | 131 const base::Closure& restart_callback) { |
132 // TODO(beng): This would be the place to insert logic that counted restarts | 132 // TODO(beng): This would be the place to insert logic that counted restarts |
133 // to avoid infinite crash-restart loops. | 133 // to avoid infinite crash-restart loops. |
134 std::unique_ptr<shell::Connection> connection = | 134 std::unique_ptr<shell::Connection> connection = |
135 connector()->Connect(url); | 135 connector()->Connect(url); |
136 // Note: |connection| may be null if we've lost our connection to the shell. | 136 // Note: |connection| may be null if we've lost our connection to the shell. |
137 if (connection) { | 137 if (connection) { |
138 connection->SetConnectionLostClosure( | 138 connection->SetConnectionLostClosure( |
139 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); | 139 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); |
140 connection->AddInterface<mojom::Session>(this); | |
141 connections_[url] = std::move(connection); | 140 connections_[url] = std::move(connection); |
142 } | 141 } |
143 } | 142 } |
144 | 143 |
145 } // namespace session | 144 } // namespace session |
146 } // namespace main | 145 } // namespace main |
OLD | NEW |