| Index: chrome/browser/extensions/startup_helper.h
|
| diff --git a/chrome/browser/extensions/startup_helper.h b/chrome/browser/extensions/startup_helper.h
|
| index 68441941da8a40f937afcf6f19b663d482a8771e..9efb7cba4efed8b938fae21f35d652f0baeb2eef 100644
|
| --- a/chrome/browser/extensions/startup_helper.h
|
| +++ b/chrome/browser/extensions/startup_helper.h
|
| @@ -8,9 +8,12 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "chrome/browser/extensions/pack_extension_job.h"
|
|
|
| -class CommandLine;
|
| class Profile;
|
|
|
| +namespace base {
|
| +class CommandLine;
|
| +}
|
| +
|
| namespace extensions {
|
|
|
| // Initialization helpers for various Extension startup actions.
|
| @@ -27,23 +30,23 @@ class StartupHelper : public PackExtensionJob::Client {
|
|
|
| // Handle --pack-extension flag from the |cmd_line| by packing the specified
|
| // extension. Returns false if the pack job failed.
|
| - bool PackExtension(const CommandLine& cmd_line);
|
| + bool PackExtension(const base::CommandLine& cmd_line);
|
|
|
| // Validates a crx at the path given by the --validate-extension flag - can
|
| // it be installed? Returns true if the crx is valid, or false otherwise.
|
| // If the return value is false, a description of the problem may be written
|
| // into |error|.
|
| - bool ValidateCrx(const CommandLine& cmd_line, std::string* error);
|
| + bool ValidateCrx(const base::CommandLine& cmd_line, std::string* error);
|
|
|
| // Handle --uninstall-extension flag from the |cmd_line| by uninstalling the
|
| // specified extension from |profile|. Returns false if the uninstall job
|
| // could not be started.
|
| - bool UninstallExtension(const CommandLine& cmd_line, Profile* profile);
|
| + bool UninstallExtension(const base::CommandLine& cmd_line, Profile* profile);
|
|
|
| // Handle --install-from-webstore flag from |cmd_line| by downloading
|
| // metadata from the webstore for the given id, prompting the user to
|
| // confirm, and then downloading the crx and installing it.
|
| - bool InstallFromWebstore(const CommandLine& cmd_line, Profile* profile);
|
| + bool InstallFromWebstore(const base::CommandLine& cmd_line, Profile* profile);
|
|
|
| // Handle --limited-install-from-webstore flag from |cmd_line| by downloading
|
| // metadata from the webstore for the given id, prompting the user to
|
| @@ -51,12 +54,14 @@ class StartupHelper : public PackExtensionJob::Client {
|
| // This whole process is only kicked off by this function and completed
|
| // asynchronously unlike InstallFromWebstore which finishes everything before
|
| // returning.
|
| - void LimitedInstallFromWebstore(const CommandLine& cmd_line, Profile* profile,
|
| + void LimitedInstallFromWebstore(const base::CommandLine& cmd_line,
|
| + Profile* profile,
|
| base::Callback<void()> done_callback);
|
|
|
| // Maps the command line argument to the extension id. Returns an empty string
|
| // in the case when there is no mapping.
|
| - std::string WebStoreIdFromLimitedInstallCmdLine(const CommandLine& cmd_line);
|
| + std::string WebStoreIdFromLimitedInstallCmdLine(
|
| + const base::CommandLine& cmd_line);
|
| private:
|
| scoped_refptr<PackExtensionJob> pack_job_;
|
| bool pack_job_succeeded_;
|
|
|