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

Side by Side Diff: mojo/application/public/cpp/lib/service_registry.cc

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 7 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
OLDNEW
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 #include "mojo/public/cpp/application/lib/service_registry.h" 5 #include "mojo/application/public/cpp/lib/service_registry.h"
6 6
7 #include "mojo/public/cpp/application/application_connection.h" 7 #include "mojo/application/public/cpp/application_connection.h"
8 #include "mojo/public/cpp/application/application_impl.h" 8 #include "mojo/application/public/cpp/application_impl.h"
9 #include "mojo/public/cpp/application/service_connector.h" 9 #include "mojo/application/public/cpp/service_connector.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace internal { 12 namespace internal {
13 13
14 ServiceRegistry::ServiceRegistry( 14 ServiceRegistry::ServiceRegistry(
15 ApplicationImpl* application_impl, 15 ApplicationImpl* application_impl,
16 const std::string& connection_url, 16 const std::string& connection_url,
17 const std::string& remote_url, 17 const std::string& remote_url,
18 ServiceProviderPtr remote_services, 18 ServiceProviderPtr remote_services,
19 InterfaceRequest<ServiceProvider> local_services) 19 InterfaceRequest<ServiceProvider> local_services)
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } 64 }
65 65
66 void ServiceRegistry::ConnectToService(const mojo::String& service_name, 66 void ServiceRegistry::ConnectToService(const mojo::String& service_name,
67 ScopedMessagePipeHandle client_handle) { 67 ScopedMessagePipeHandle client_handle) {
68 service_connector_registry_.ConnectToService(this, service_name, 68 service_connector_registry_.ConnectToService(this, service_name,
69 client_handle.Pass()); 69 client_handle.Pass());
70 } 70 }
71 71
72 } // namespace internal 72 } // namespace internal
73 } // namespace mojo 73 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698