Index: apps/launcher.h |
diff --git a/apps/launcher.h b/apps/launcher.h |
index fa6ea1582d27dee47fee5d9b51d3a946f83c2931..3a23411fca97afa3ad3e99813bef30b599c9937c 100644 |
--- a/apps/launcher.h |
+++ b/apps/launcher.h |
@@ -5,6 +5,7 @@ |
#ifndef APPS_LAUNCHER_H_ |
#define APPS_LAUNCHER_H_ |
+#include <memory> |
#include <string> |
#include <vector> |
@@ -20,55 +21,67 @@ class FilePath; |
namespace extensions { |
class Extension; |
+namespace api { |
+namespace app_runtime { |
+struct ActionData; |
+} |
+} |
} |
namespace apps { |
-// Launches the platform app |extension|. Creates appropriate launch data for |
-// the |command_line| fields present. |extension| and |profile| must not be |
-// NULL. An empty |command_line| means there is no launch data. If non-empty, |
+// Launches the platform app |app|. Creates appropriate launch data for the |
+// |command_line| fields present. |app| and |profile| must not be NULL. An empty |
+// |command_line| means there is no launch data. If non-empty, |
// |current_directory| is used to expand any relative paths on the command line. |
// |source| is one of the enumerated values which trace how the app is launched. |
void LaunchPlatformAppWithCommandLine(Profile* profile, |
- const extensions::Extension* extension, |
+ const extensions::Extension* app, |
const base::CommandLine& command_line, |
const base::FilePath& current_directory, |
extensions::AppLaunchSource source); |
-// Launches the platform app |extension| by issuing an onLaunched event |
-// with the contents of |file_path| available through the launch data. |
+// Launches the platform app |app| by issuing an onLaunched event with the |
+// contents of |file_path| available through the launch data. |
void LaunchPlatformAppWithPath(Profile* profile, |
- const extensions::Extension* extension, |
+ const extensions::Extension* app, |
const base::FilePath& file_path); |
-// Launches the platform app |extension|. |source| tells us how the app is |
-// launched. |
+// Launches the platform app |app| with the specific |action_data|. |file_path| |
+// is an optional argument and if present contains the file that the app should |
+// open w.r.t. the given action. |
+void LaunchPlatformAppWithAction( |
+ Profile* profile, |
+ const extensions::Extension* app, |
+ std::unique_ptr<extensions::api::app_runtime::ActionData> action_data, |
+ const base::FilePath& file_path); |
+ |
+// Launches the platform app |app|. |source| tells us how the app is launched. |
void LaunchPlatformApp(Profile* profile, |
- const extensions::Extension* extension, |
+ const extensions::Extension* app, |
extensions::AppLaunchSource source); |
-// Launches the platform app |extension| with |handler_id| and the contents of |
+// Launches the platform app |app| with |handler_id| and the contents of |
// |file_paths| available through the launch data. |handler_id| corresponds to |
// the id of the file_handlers item in the manifest that resulted in a match |
// that triggered this launch. |
void LaunchPlatformAppWithFileHandler( |
Profile* profile, |
- const extensions::Extension* extension, |
+ const extensions::Extension* app, |
const std::string& handler_id, |
const std::vector<base::FilePath>& file_paths); |
-// Launches the platform app |extension| with |handler_id|, |url| and |
-// |referrer_url| available through the launch data. |handler_id| corresponds to |
-// the id of the file_handlers item in the manifest that resulted in a match |
-// that triggered this launch. |
+// Launches the platform app |app| with |handler_id|, |url| and |referrer_url| |
+// available through the launch data. |handler_id| corresponds to the id of the |
+// file_handlers item in the manifest that resulted in a match that triggered |
+// this launch. |
void LaunchPlatformAppWithUrl(Profile* profile, |
- const extensions::Extension* extension, |
+ const extensions::Extension* app, |
const std::string& handler_id, |
const GURL& url, |
const GURL& referrer_url); |
-void RestartPlatformApp(Profile* profile, |
- const extensions::Extension* extension); |
+void RestartPlatformApp(Profile* profile, const extensions::Extension* app); |
} // namespace apps |