From 868fa2fe829687343ffae624259930155e16dbd8 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Tue, 11 Jun 2013 10:57:03 +0100 Subject: Merge from Chromium at DEPS revision r205460 This commit was generated by merge_to_master.py. Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540 --- apps/app_shim/extension_app_shim_handler_mac.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'apps/app_shim/extension_app_shim_handler_mac.h') diff --git a/apps/app_shim/extension_app_shim_handler_mac.h b/apps/app_shim/extension_app_shim_handler_mac.h index ea9a8c7eee..f5a7d668eb 100644 --- a/apps/app_shim/extension_app_shim_handler_mac.h +++ b/apps/app_shim/extension_app_shim_handler_mac.h @@ -14,6 +14,10 @@ class Profile; +namespace extensions { +class Extension; +} + namespace apps { // This app shim handler that handles events for app shims that correspond to an @@ -25,9 +29,10 @@ class ExtensionAppShimHandler : public AppShimHandler, virtual ~ExtensionAppShimHandler(); // AppShimHandler overrides: - virtual bool OnShimLaunch(Host* host) OVERRIDE; + virtual bool OnShimLaunch(Host* host, AppShimLaunchType launch_type) OVERRIDE; virtual void OnShimClose(Host* host) OVERRIDE; virtual void OnShimFocus(Host* host) OVERRIDE; + virtual void OnShimQuit(Host* host) OVERRIDE; protected: typedef std::map, AppShimHandler::Host*> @@ -38,7 +43,9 @@ class ExtensionAppShimHandler : public AppShimHandler, content::NotificationRegistrar& registrar() { return registrar_; } private: - virtual bool LaunchApp(Profile* profile, const std::string& app_id); + virtual bool LaunchApp(Profile* profile, + const std::string& app_id, + AppShimLaunchType launch_type); // Listen to the NOTIFICATION_EXTENSION_HOST_DESTROYED message to detect when // an app closes. When that happens, call OnAppClosed on the relevant @@ -48,6 +55,8 @@ class ExtensionAppShimHandler : public AppShimHandler, const content::NotificationSource& source, const content::NotificationDetails& details) OVERRIDE; + void StartShim(Profile* profile, const extensions::Extension* extension); + void CloseShim(Profile* profile, const std::string& app_id); HostMap hosts_; -- cgit v1.2.3