| 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 3400b67eaad3ad6f2dd31c957619748b0fce7d73..32d4b2b522acb11712d3d886fb8b2ee5437fc5bf 100644
|
| --- a/mojo/public/cpp/application/lib/service_registry.h
|
| +++ b/mojo/public/cpp/application/lib/service_registry.h
|
| @@ -29,20 +29,19 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
|
| virtual ~ServiceRegistry();
|
|
|
| // ApplicationConnection overrides.
|
| - virtual void AddServiceConnector(ServiceConnectorBase* service_connector)
|
| - MOJO_OVERRIDE;
|
| - virtual const std::string& GetRemoteApplicationURL() MOJO_OVERRIDE;
|
| + virtual void AddServiceConnector(
|
| + ServiceConnectorBase* service_connector) override;
|
| + virtual const std::string& GetRemoteApplicationURL() override;
|
| virtual ApplicationConnection* ConnectToApplication(
|
| - const std::string& url) MOJO_OVERRIDE;
|
| - virtual ServiceProvider* GetServiceProvider() MOJO_OVERRIDE;
|
| + const std::string& url) override;
|
| + virtual ServiceProvider* GetServiceProvider() override;
|
|
|
| virtual void RemoveServiceConnector(ServiceConnectorBase* service_connector);
|
|
|
| private:
|
| // ServiceProvider method.
|
| virtual void ConnectToService(const mojo::String& service_name,
|
| - ScopedMessagePipeHandle client_handle)
|
| - MOJO_OVERRIDE;
|
| + ScopedMessagePipeHandle client_handle) override;
|
|
|
| ApplicationImpl* application_impl_;
|
| const std::string url_;
|
|
|