Upstream version 7.36.152.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / browser / application.h

diff --git a/src/xwalk/application/browser/application.h b/src/xwalk/application/browser/application.h
index 9ea52cc..76a27e2 100644 (file)
--- a/src/xwalk/application/browser/application.h
+++ b/src/xwalk/application/browser/application.h
@@ -115,7 +115,7 @@ class Application : public Runtime::Observer,
                                           const std::string& api_name) const;
 
   StoredPermission GetPermission(PermissionType type,
-                                 std::string& permission_name) const;
+                                 const std::string& permission_name) const;
   bool SetPermission(PermissionType type,
                      const std::string& permission_name,
                      StoredPermission perm);
@@ -127,7 +127,7 @@ class Application : public Runtime::Observer,
   Application(scoped_refptr<ApplicationData> data,
               RuntimeContext* context,
               Observer* observer);
-
+  virtual bool Launch(const LaunchParams& launch_params);
   virtual void InitSecurityPolicy();
   void AddSecurityPolicy(const GURL& url, bool subdomains);
 
@@ -150,13 +150,11 @@ class Application : public Runtime::Observer,
   virtual void RenderProcessHostDestroyed(
       content::RenderProcessHost* host) OVERRIDE;
 
-
-  bool Launch(const LaunchParams& launch_params);
-
   // Try to extract the URL from different possible keys for entry points in the
   // manifest, returns it and the entry point used.
   GURL GetStartURL(const LaunchParams& params, LaunchEntryPoint* used);
-  ui::WindowShowState GetWindowShowState(const LaunchParams& params);
+  ui::WindowShowState GetWindowShowStateWGT(const LaunchParams& params);
+  ui::WindowShowState GetWindowShowStateXPK(const LaunchParams& params);
 
   GURL GetURLFromURLKey();