Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / mojo / public / cpp / application / service_provider_impl.h

diff --git a/src/mojo/public/cpp/application/service_provider_impl.h b/src/mojo/public/cpp/application/service_provider_impl.h
index 0f56a0d..45ad7b8 100644 (file)
--- a/src/mojo/public/cpp/application/service_provider_impl.h
+++ b/src/mojo/public/cpp/application/service_provider_impl.h
@@ -18,7 +18,7 @@ class ServiceConnectorBase;
 class ServiceProviderImpl : public InterfaceImpl<ServiceProvider> {
  public:
   ServiceProviderImpl();
-  virtual ~ServiceProviderImpl();
+  ~ServiceProviderImpl() override;
 
   template <typename Interface>
   void AddService(InterfaceFactory<Interface>* factory) {
@@ -42,15 +42,13 @@ class ServiceProviderImpl : public InterfaceImpl<ServiceProvider> {
   friend class internal::WeakServiceProvider;
 
   // Overridden from ServiceProvider:
-  virtual void ConnectToService(
-      const String& service_name,
-      ScopedMessagePipeHandle client_handle) MOJO_OVERRIDE;
+  void ConnectToService(const String& service_name,
+                        ScopedMessagePipeHandle client_handle) override;
 
   // Overridden from InterfaceImpl:
-  virtual void OnConnectionError() MOJO_OVERRIDE;
+  void OnConnectionError() override;
 
-  void AddServiceConnector(
-      internal::ServiceConnectorBase* service_connector);
+  void AddServiceConnector(internal::ServiceConnectorBase* service_connector);
   void RemoveServiceConnector(
       internal::ServiceConnectorBase* service_connector);