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

Unified Diff: content/common/mojo/service_registry_impl.h

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/application_setup.mojom ('k') | content/common/mojo/service_registry_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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> >
« no previous file with comments | « content/common/application_setup.mojom ('k') | content/common/mojo/service_registry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698