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

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

Issue 1764253002: Rename shell.mojom to connector.mojom, ApplicationManager to Shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@32exe
Patch Set: . Created 4 years, 9 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.cc » ('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"
10 #include "mojo/shell/connect_params.h" 9 #include "mojo/shell/connect_params.h"
10 #include "mojo/shell/shell.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 namespace shell { 13 namespace shell {
14 14
15 ScopedMessagePipeHandle ConnectToInterfaceByName( 15 ScopedMessagePipeHandle ConnectToInterfaceByName(
16 ApplicationManager* application_manager, 16 Shell* shell,
17 const Identity& source, 17 const Identity& source,
18 const Identity& target, 18 const Identity& target,
19 const std::string& interface_name) { 19 const std::string& interface_name) {
20 shell::mojom::InterfaceProviderPtr remote_interfaces; 20 shell::mojom::InterfaceProviderPtr remote_interfaces;
21 scoped_ptr<ConnectParams> params(new ConnectParams); 21 scoped_ptr<ConnectParams> params(new ConnectParams);
22 params->set_source(source); 22 params->set_source(source);
23 params->set_target(target); 23 params->set_target(target);
24 params->set_remote_interfaces(GetProxy(&remote_interfaces)); 24 params->set_remote_interfaces(GetProxy(&remote_interfaces));
25 application_manager->Connect(std::move(params)); 25 shell->Connect(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
OLDNEW
« no previous file with comments | « mojo/shell/connect_util.h ('k') | mojo/shell/identity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698