| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/mus/client_connection.h" | 5 #include "components/mus/client_connection.h" |
| 6 | 6 |
| 7 #include "components/mus/connection_manager.h" | 7 #include "components/mus/connection_manager.h" |
| 8 #include "components/mus/view_tree_impl.h" | 8 #include "components/mus/view_tree_impl.h" |
| 9 | 9 |
| 10 namespace view_manager { | 10 namespace mus { |
| 11 | 11 |
| 12 ClientConnection::ClientConnection(scoped_ptr<ViewTreeImpl> service, | 12 ClientConnection::ClientConnection(scoped_ptr<ViewTreeImpl> service, |
| 13 mojo::ViewTreeClient* client) | 13 mojo::ViewTreeClient* client) |
| 14 : service_(service.Pass()), client_(client) {} | 14 : service_(service.Pass()), client_(client) {} |
| 15 | 15 |
| 16 ClientConnection::~ClientConnection() {} | 16 ClientConnection::~ClientConnection() {} |
| 17 | 17 |
| 18 DefaultClientConnection::DefaultClientConnection( | 18 DefaultClientConnection::DefaultClientConnection( |
| 19 scoped_ptr<ViewTreeImpl> service_impl, | 19 scoped_ptr<ViewTreeImpl> service_impl, |
| 20 ConnectionManager* connection_manager, | 20 ConnectionManager* connection_manager, |
| 21 mojo::InterfaceRequest<mojo::ViewTree> service_request, | 21 mojo::InterfaceRequest<mojo::ViewTree> service_request, |
| 22 mojo::ViewTreeClientPtr client) | 22 mojo::ViewTreeClientPtr client) |
| 23 : ClientConnection(service_impl.Pass(), client.get()), | 23 : ClientConnection(service_impl.Pass(), client.get()), |
| 24 connection_manager_(connection_manager), | 24 connection_manager_(connection_manager), |
| 25 binding_(service(), service_request.Pass()), | 25 binding_(service(), service_request.Pass()), |
| 26 client_(client.Pass()) { | 26 client_(client.Pass()) { |
| 27 binding_.set_connection_error_handler( | 27 binding_.set_connection_error_handler( |
| 28 [this]() { connection_manager_->OnConnectionError(this); }); | 28 [this]() { connection_manager_->OnConnectionError(this); }); |
| 29 } | 29 } |
| 30 | 30 |
| 31 DefaultClientConnection::~DefaultClientConnection() {} | 31 DefaultClientConnection::~DefaultClientConnection() {} |
| 32 | 32 |
| 33 } // namespace view_manager | 33 } // namespace mus |
| OLD | NEW |