Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / apps / app_shim / extension_app_shim_handler_mac.h

diff --git a/src/apps/app_shim/extension_app_shim_handler_mac.h b/src/apps/app_shim/extension_app_shim_handler_mac.h
index 140fc02..0fc8a84 100644 (file)
--- a/src/apps/app_shim/extension_app_shim_handler_mac.h
+++ b/src/apps/app_shim/extension_app_shim_handler_mac.h
@@ -11,7 +11,7 @@
 
 #include "apps/app_lifetime_monitor.h"
 #include "apps/app_shim/app_shim_handler_mac.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/notification_observer.h"
@@ -33,7 +33,7 @@ class Extension;
 
 namespace apps {
 
-class ShellWindow;
+class AppWindow;
 
 // This app shim handler that handles events for app shims that correspond to an
 // extension.
@@ -50,11 +50,15 @@ class ExtensionAppShimHandler : public AppShimHandler,
     virtual void LoadProfileAsync(const base::FilePath& path,
                                   base::Callback<void(Profile*)> callback);
 
-    virtual ShellWindowRegistry::ShellWindowList GetWindows(
-        Profile* profile, const std::string& extension_id);
+    virtual AppWindowRegistry::AppWindowList GetWindows(
+        Profile* profile,
+        const std::string& extension_id);
 
     virtual const extensions::Extension* GetAppExtension(
         Profile* profile, const std::string& extension_id);
+    virtual void EnableExtension(Profile* profile,
+                                 const std::string& extension_id,
+                                 const base::Callback<void()>& callback);
     virtual void LaunchApp(Profile* profile,
                            const extensions::Extension* extension,
                            const std::vector<base::FilePath>& files);
@@ -69,15 +73,15 @@ class ExtensionAppShimHandler : public AppShimHandler,
 
   AppShimHandler::Host* FindHost(Profile* profile, const std::string& app_id);
 
-  static void QuitAppForWindow(ShellWindow* shell_window);
+  static void QuitAppForWindow(AppWindow* app_window);
 
-  static void HideAppForWindow(ShellWindow* shell_window);
+  static void HideAppForWindow(AppWindow* app_window);
 
-  static void FocusAppForWindow(ShellWindow* shell_window);
+  static void FocusAppForWindow(AppWindow* app_window);
 
   // Brings the window to the front without showing it and instructs the shim to
   // request user attention. Returns false if there is no shim for this window.
-  static bool RequestUserAttentionForWindow(ShellWindow* shell_window);
+  static bool RequestUserAttentionForWindow(AppWindow* app_window);
 
   // AppShimHandler overrides:
   virtual void OnShimLaunch(Host* host,
@@ -121,6 +125,12 @@ class ExtensionAppShimHandler : public AppShimHandler,
                        const std::vector<base::FilePath>& files,
                        Profile* profile);
 
+  // This is passed to Delegate::EnableViaPrompt for shim-initiated launches
+  // where the extension is disabled.
+  void OnExtensionEnabled(const base::FilePath& profile_path,
+                          const std::string& app_id,
+                          const std::vector<base::FilePath>& files);
+
   scoped_ptr<Delegate> delegate_;
 
   HostMap hosts_;