Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / mojo / service_manager / service_loader.h

diff --git a/src/mojo/service_manager/service_loader.h b/src/mojo/service_manager/service_loader.h
index 6d5be9a..4053957 100644 (file)
--- a/src/mojo/service_manager/service_loader.h
+++ b/src/mojo/service_manager/service_loader.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_
 #define MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_
 
-#include "mojo/public/shell/shell.mojom.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/service_manager/service_manager_export.h"
 #include "url/gurl.h"
 
@@ -17,10 +17,10 @@ class ServiceManager;
 // specific url.
 class MOJO_SERVICE_MANAGER_EXPORT ServiceLoader {
  public:
-  virtual ~ServiceLoader() {};
+  virtual ~ServiceLoader() {}
   virtual void LoadService(ServiceManager* manager,
                            const GURL& url,
-                           ScopedShellHandle service_handle) = 0;
+                           ScopedMessagePipeHandle service_handle) = 0;
   virtual void OnServiceError(ServiceManager* manager, const GURL& url) = 0;
 
  protected: