| Index: mojo/public/cpp/application/lib/service_registry.h
|
| diff --git a/mojo/public/cpp/application/lib/service_registry.h b/mojo/public/cpp/application/lib/service_registry.h
|
| index 2ac8eb89c087ce78e4dd4876ae35fde62f1d5da9..b02f63da4dbe254fbd1d35be25fc587fc1dc944f 100644
|
| --- a/mojo/public/cpp/application/lib/service_registry.h
|
| +++ b/mojo/public/cpp/application/lib/service_registry.h
|
| @@ -26,22 +26,20 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
|
| ServiceRegistry(ApplicationImpl* application_impl,
|
| const std::string& url,
|
| ServiceProviderPtr service_provider);
|
| - virtual ~ServiceRegistry();
|
| + ~ServiceRegistry() override;
|
|
|
| // ApplicationConnection overrides.
|
| - virtual void AddServiceConnector(
|
| - ServiceConnectorBase* service_connector) override;
|
| - virtual const std::string& GetRemoteApplicationURL() override;
|
| - virtual ApplicationConnection* ConnectToApplication(
|
| - const std::string& url) override;
|
| - virtual ServiceProvider* GetServiceProvider() override;
|
| + void AddServiceConnector(ServiceConnectorBase* service_connector) override;
|
| + const std::string& GetRemoteApplicationURL() override;
|
| + ApplicationConnection* ConnectToApplication(const std::string& url) override;
|
| + ServiceProvider* GetServiceProvider() override;
|
|
|
| virtual void RemoveServiceConnector(ServiceConnectorBase* service_connector);
|
|
|
| private:
|
| // ServiceProvider method.
|
| - virtual void ConnectToService(const mojo::String& service_name,
|
| - ScopedMessagePipeHandle client_handle) override;
|
| + void ConnectToService(const mojo::String& service_name,
|
| + ScopedMessagePipeHandle client_handle) override;
|
|
|
| ApplicationImpl* application_impl_;
|
| const std::string url_;
|
|
|