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