| 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 #ifndef MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ | 5 #ifndef MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ |
| 6 #define MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ | 6 #define MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ |
| 7 | 7 |
| 8 #include <utility> |
| 9 |
| 8 #include "mojo/application/public/interfaces/service_provider.mojom.h" | 10 #include "mojo/application/public/interfaces/service_provider.mojom.h" |
| 9 | 11 |
| 10 namespace mojo { | 12 namespace mojo { |
| 11 | 13 |
| 12 // Binds |ptr| to a remote implementation of Interface from |service_provider|. | 14 // Binds |ptr| to a remote implementation of Interface from |service_provider|. |
| 13 template <typename Interface> | 15 template <typename Interface> |
| 14 inline void ConnectToService(ServiceProvider* service_provider, | 16 inline void ConnectToService(ServiceProvider* service_provider, |
| 15 InterfacePtr<Interface>* ptr) { | 17 InterfacePtr<Interface>* ptr) { |
| 16 MessagePipe pipe; | 18 MessagePipe pipe; |
| 17 ptr->Bind(InterfacePtrInfo<Interface>(pipe.handle0.Pass(), 0u)); | 19 ptr->Bind(InterfacePtrInfo<Interface>(std::move(pipe.handle0), 0u)); |
| 18 service_provider->ConnectToService(Interface::Name_, pipe.handle1.Pass()); | 20 service_provider->ConnectToService(Interface::Name_, std::move(pipe.handle1)); |
| 19 } | 21 } |
| 20 | 22 |
| 21 } // namespace mojo | 23 } // namespace mojo |
| 22 | 24 |
| 23 #endif // MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ | 25 #endif // MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ |
| OLD | NEW |