Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Side by Side Diff: mojo/shell/connect_util.cc

Issue 1706063002: Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@factory
Patch Set: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/shell/connect_util.h ('k') | mojo/shell/identity.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 Identity& source,
18 const GURL& application_url, 19 const GURL& application_url,
19 const std::string& interface_name) { 20 const std::string& interface_name) {
20 shell::mojom::InterfaceProviderPtr remote_interfaces; 21 shell::mojom::InterfaceProviderPtr remote_interfaces;
21 scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams); 22 scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
22 params->set_source(Identity(GURL("mojo://shell/"), std::string(), 23 params->set_source(source);
23 GetPermissiveCapabilityFilter()));
24 params->SetTarget(Identity(application_url, std::string(), 24 params->SetTarget(Identity(application_url, std::string(),
25 GetPermissiveCapabilityFilter())); 25 GetPermissiveCapabilityFilter()));
26 params->set_remote_interfaces(GetProxy(&remote_interfaces)); 26 params->set_remote_interfaces(GetProxy(&remote_interfaces));
27 application_manager->ConnectToApplication(std::move(params)); 27 application_manager->ConnectToApplication(std::move(params));
28 MessagePipe pipe; 28 MessagePipe pipe;
29 remote_interfaces->GetInterface(interface_name, std::move(pipe.handle1)); 29 remote_interfaces->GetInterface(interface_name, std::move(pipe.handle1));
30 return std::move(pipe.handle0); 30 return std::move(pipe.handle0);
31 } 31 }
32 32
33 } // namespace shell 33 } // namespace shell
34 } // namespace mojo 34 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/connect_util.h ('k') | mojo/shell/identity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698