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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/mojo/mojo_shell_connection_impl.cc ('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 caf95b5ef5ee5e1904c06db6639181cd94d2b92b..c53ba10efcb8c8485d42499d80e604e32ead961d 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::shell::mojom::InterfaceProvider) {
+ public NON_EXPORTED_BASE(shell::mojom::InterfaceProvider) {
public:
using ServiceFactory = base::Callback<void(mojo::ScopedMessagePipeHandle)>;
@@ -30,14 +30,14 @@ class CONTENT_EXPORT ServiceRegistryImpl
~ServiceRegistryImpl() override;
// Binds this ServiceProvider implementation to a message pipe endpoint.
- void Bind(mojo::shell::mojom::InterfaceProviderRequest request);
+ void Bind(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::shell::mojom::InterfaceProviderPtr service_provider);
+ shell::mojom::InterfaceProviderPtr service_provider);
// ServiceRegistry overrides.
void AddService(const std::string& service_name,
@@ -61,8 +61,8 @@ class CONTENT_EXPORT ServiceRegistryImpl
void OnConnectionError();
- mojo::Binding<mojo::shell::mojom::InterfaceProvider> binding_;
- mojo::shell::mojom::InterfaceProviderPtr remote_provider_;
+ mojo::Binding<shell::mojom::InterfaceProvider> binding_;
+ 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/mojo/mojo_shell_connection_impl.cc ('k') | content/common/mojo/service_registry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698