| Index: mojo/public/cpp/application/lib/service_registry.h
|
| diff --git a/mojo/public/cpp/application/lib/service_registry.h b/mojo/public/cpp/application/lib/service_registry.h
|
| index b02f63da4dbe254fbd1d35be25fc587fc1dc944f..af1613b85b4f9a35bf506379fc6ea75c13e58d8e 100644
|
| --- a/mojo/public/cpp/application/lib/service_registry.h
|
| +++ b/mojo/public/cpp/application/lib/service_registry.h
|
| @@ -25,7 +25,8 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
|
| ServiceRegistry();
|
| ServiceRegistry(ApplicationImpl* application_impl,
|
| const std::string& url,
|
| - ServiceProviderPtr service_provider);
|
| + ServiceProviderPtr remote_services,
|
| + InterfaceRequest<ServiceProvider> local_services);
|
| ~ServiceRegistry() override;
|
|
|
| // ApplicationConnection overrides.
|
| @@ -51,6 +52,7 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
|
| typedef std::map<std::string, ServiceConnectorBase*>
|
| NameToServiceConnectorMap;
|
| NameToServiceConnectorMap name_to_service_connector_;
|
| + Binding<ServiceProvider> local_binding_;
|
| ServiceProviderPtr remote_service_provider_;
|
|
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry);
|
|
|