Index: content/child/mojo/mojo_application.h |
diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h |
index 68602c4fd36d892d966b4dc1a09031fdf6fbce58..c1005b9373f6fe28dd7299255062d43056e955b9 100644 |
--- a/content/child/mojo/mojo_application.h |
+++ b/content/child/mojo/mojo_application.h |
@@ -8,7 +8,8 @@ |
#include <string> |
#include "base/macros.h" |
-#include "content/common/mojo/service_registry_impl.h" |
+#include "services/shell/public/cpp/interface_provider.h" |
+#include "services/shell/public/cpp/interface_registry.h" |
namespace content { |
@@ -25,10 +26,16 @@ class MojoApplication { |
// |token|. |
void InitWithToken(const std::string& token); |
- ServiceRegistry* service_registry() { return &service_registry_; } |
+ shell::InterfaceRegistry* interface_registry() { |
+ return interface_registry_.get(); |
+ } |
+ shell::InterfaceProvider* remote_interfaces() { |
+ return remote_interfaces_.get(); |
+ } |
private: |
- ServiceRegistryImpl service_registry_; |
+ std::unique_ptr<shell::InterfaceRegistry> interface_registry_; |
+ std::unique_ptr<shell::InterfaceProvider> remote_interfaces_; |
DISALLOW_COPY_AND_ASSIGN(MojoApplication); |
}; |