| Index: content/common/mojo/service_registry_impl.h
|
| diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h
|
| index ca8043aba7d21d9695b60461dea94a66c28d7080..6fd40432689f6fa85e450aa99c0978735e594313 100644
|
| --- a/content/common/mojo/service_registry_impl.h
|
| +++ b/content/common/mojo/service_registry_impl.h
|
| @@ -22,7 +22,7 @@ namespace content {
|
|
|
| class CONTENT_EXPORT ServiceRegistryImpl
|
| : public ServiceRegistry,
|
| - public NON_EXPORTED_BASE(mojo::InterfaceProvider) {
|
| + public NON_EXPORTED_BASE(mojo::shell::mojom::InterfaceProvider) {
|
| public:
|
| using ServiceFactory = base::Callback<void(mojo::ScopedMessagePipeHandle)>;
|
|
|
| @@ -30,13 +30,14 @@ class CONTENT_EXPORT ServiceRegistryImpl
|
| ~ServiceRegistryImpl() override;
|
|
|
| // Binds this ServiceProvider implementation to a message pipe endpoint.
|
| - void Bind(mojo::InterfaceRequest<mojo::InterfaceProvider> request);
|
| + void Bind(mojo::shell::mojom::InterfaceProviderRequest request);
|
|
|
| // Binds to a remote ServiceProvider. This will expose added services to the
|
| // remote ServiceProvider with the corresponding handle and enable
|
| // ConnectToRemoteService to provide access to services exposed by the remote
|
| // ServiceProvider.
|
| - void BindRemoteServiceProvider(mojo::InterfaceProviderPtr service_provider);
|
| + void BindRemoteServiceProvider(
|
| + mojo::shell::mojom::InterfaceProviderPtr service_provider);
|
|
|
| // Registers a local service factory to intercept ConnectToRemoteService
|
| // requests instead of actually connecting to the remote registry. Used only
|
| @@ -62,8 +63,8 @@ class CONTENT_EXPORT ServiceRegistryImpl
|
|
|
| void OnConnectionError();
|
|
|
| - mojo::Binding<mojo::InterfaceProvider> binding_;
|
| - mojo::InterfaceProviderPtr remote_provider_;
|
| + mojo::Binding<mojo::shell::mojom::InterfaceProvider> binding_;
|
| + mojo::shell::mojom::InterfaceProviderPtr remote_provider_;
|
|
|
| std::map<std::string, ServiceFactory> service_factories_;
|
| std::queue<std::pair<std::string, mojo::MessagePipeHandle> >
|
|
|