diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /apps/launcher.h | |
parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'apps/launcher.h')
-rw-r--r-- | apps/launcher.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/launcher.h b/apps/launcher.h index 579da0fff1..d41f51780d 100644 --- a/apps/launcher.h +++ b/apps/launcher.h @@ -7,11 +7,11 @@ #include <string> -class CommandLine; class GURL; class Profile; namespace base { +class CommandLine; class FilePath; } @@ -27,7 +27,7 @@ namespace apps { // |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 base::CommandLine& command_line, const base::FilePath& current_directory); // Launches the platform app |extension| by issuing an onLaunched event |