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 13aba813f6bb19033f065b3a02ca532c0965bab9..7ffaa77d446bd34984c9a6f1b6c828ca898f0a99 100644 |
--- a/content/common/mojo/service_registry_impl.h |
+++ b/content/common/mojo/service_registry_impl.h |
@@ -15,6 +15,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "content/public/common/service_registry.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
+#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" |
#include "third_party/mojo/src/mojo/public/cpp/system/core.h" |
#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" |
@@ -22,7 +23,8 @@ namespace content { |
class CONTENT_EXPORT ServiceRegistryImpl |
: public ServiceRegistry, |
- public NON_EXPORTED_BASE(mojo::ServiceProvider) { |
+ public NON_EXPORTED_BASE(mojo::ServiceProvider), |
+ public NON_EXPORTED_BASE(mojo::ErrorHandler) { |
public: |
ServiceRegistryImpl(); |
~ServiceRegistryImpl() override; |
@@ -44,6 +46,8 @@ class CONTENT_EXPORT ServiceRegistryImpl |
void ConnectToRemoteService(const base::StringPiece& service_name, |
mojo::ScopedMessagePipeHandle handle) override; |
+ bool IsBound() const; |
+ |
base::WeakPtr<ServiceRegistry> GetWeakPtr(); |
private: |
@@ -51,6 +55,9 @@ class CONTENT_EXPORT ServiceRegistryImpl |
void ConnectToService(const mojo::String& name, |
mojo::ScopedMessagePipeHandle client_handle) override; |
+ // mojo::ErrorHandler overrides. |
+ void OnConnectionError() override; |
+ |
mojo::Binding<mojo::ServiceProvider> binding_; |
mojo::ServiceProviderPtr remote_provider_; |