| 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_PUBLIC_CPP_SHELL_CONNECT_H_ | 5 #ifndef MOJO_PUBLIC_CPP_SHELL_CONNECT_H_ |
| 6 #define MOJO_PUBLIC_CPP_SHELL_CONNECT_H_ | 6 #define MOJO_PUBLIC_CPP_SHELL_CONNECT_H_ |
| 7 | 7 |
| 8 #include "mojo/public/cpp/bindings/allocation_scope.h" | |
| 9 #include "mojo/public/interfaces/shell/shell.mojom.h" | 8 #include "mojo/public/interfaces/shell/shell.mojom.h" |
| 10 | 9 |
| 11 namespace mojo { | 10 namespace mojo { |
| 12 | 11 |
| 13 template <typename Interface> | 12 template <typename Interface> |
| 14 inline void ConnectTo(Shell* shell, const std::string& url, | 13 inline void ConnectTo(Shell* shell, const std::string& url, |
| 15 InterfacePtr<Interface>* ptr) { | 14 InterfacePtr<Interface>* ptr) { |
| 16 MessagePipe pipe; | 15 MessagePipe pipe; |
| 17 ptr->Bind(pipe.handle0.Pass()); | 16 ptr->Bind(pipe.handle0.Pass()); |
| 18 | 17 |
| 19 AllocationScope scope; | 18 shell->Connect(String::From(url), pipe.handle1.Pass()); |
| 20 shell->Connect(url, pipe.handle1.Pass()); | |
| 21 } | 19 } |
| 22 | 20 |
| 23 } // namespace mojo | 21 } // namespace mojo |
| 24 | 22 |
| 25 #endif // MOJO_PUBLIC_CPP_SHELL_CONNECT_H_ | 23 #endif // MOJO_PUBLIC_CPP_SHELL_CONNECT_H_ |
| OLD | NEW |