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 "mojo/shell/connect_util.h" | 5 #include "mojo/shell/connect_util.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "mojo/shell/application_manager.h" | 9 #include "mojo/shell/application_manager.h" |
8 #include "mojo/shell/capability_filter.h" | 10 #include "mojo/shell/capability_filter.h" |
9 #include "mojo/shell/connect_to_application_params.h" | 11 #include "mojo/shell/connect_to_application_params.h" |
10 | 12 |
11 namespace mojo { | 13 namespace mojo { |
12 namespace shell { | 14 namespace shell { |
13 | 15 |
14 ScopedMessagePipeHandle ConnectToServiceByName( | 16 ScopedMessagePipeHandle ConnectToServiceByName( |
15 ApplicationManager* application_manager, | 17 ApplicationManager* application_manager, |
16 const GURL& application_url, | 18 const GURL& application_url, |
17 const std::string& interface_name) { | 19 const std::string& interface_name) { |
18 ServiceProviderPtr services; | 20 ServiceProviderPtr services; |
19 scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams); | 21 scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams); |
20 params->SetTarget(Identity(application_url, std::string(), | 22 params->SetTarget(Identity(application_url, std::string(), |
21 GetPermissiveCapabilityFilter())); | 23 GetPermissiveCapabilityFilter())); |
22 params->set_services(GetProxy(&services)); | 24 params->set_services(GetProxy(&services)); |
23 application_manager->ConnectToApplication(params.Pass()); | 25 application_manager->ConnectToApplication(std::move(params)); |
24 MessagePipe pipe; | 26 MessagePipe pipe; |
25 services->ConnectToService(interface_name, pipe.handle1.Pass()); | 27 services->ConnectToService(interface_name, std::move(pipe.handle1)); |
26 return pipe.handle0.Pass(); | 28 return std::move(pipe.handle0); |
27 } | 29 } |
28 | 30 |
29 } // namespace shell | 31 } // namespace shell |
30 } // namespace mojo | 32 } // namespace mojo |
OLD | NEW |