summaryrefslogtreecommitdiff
path: root/apps/launcher.h
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-02-21 12:16:55 +0000
committerTorne (Richard Coles) <torne@google.com>2014-02-21 12:16:55 +0000
commit5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch)
tree5d4ae202b870bd86673f596f0d424bc4b3e55ebe /apps/launcher.h
parente862bac9c33104a29d98631d62668ae7b6676510 (diff)
downloadchromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py. Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'apps/launcher.h')
-rw-r--r--apps/launcher.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/launcher.h b/apps/launcher.h
index 8da998d4cf..579da0fff1 100644
--- a/apps/launcher.h
+++ b/apps/launcher.h
@@ -23,11 +23,11 @@ namespace apps {
// Launches the platform app |extension|. Creates appropriate launch data for
// the |command_line| fields present. |extension| and |profile| must not be
-// NULL. A NULL |command_line| means there is no launch data. If non-empty,
+// 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.
void LaunchPlatformAppWithCommandLine(Profile* profile,
const extensions::Extension* extension,
- const CommandLine* command_line,
+ const CommandLine& command_line,
const base::FilePath& current_directory);
// Launches the platform app |extension| by issuing an onLaunched event