From 6b236ea282f27cf132d55658b375367e2fd9e18c Mon Sep 17 00:00:00 2001 From: "asargent@chromium.org" Date: Wed, 19 Sep 2012 04:07:58 +0000 Subject: [PATCH] Installer changes for app host to support command line install from webstore This a companion to codereview.chromium.org/10907104/ (which added the support in chrome itself to do the install). TBR=sky@chromium.org (chrome/common/chrome_switches.{h,cc} changes) BUG=138311 Review URL: https://chromiumcodereview.appspot.com/10919321 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157493 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/chrome_switches.cc | 7 ------- chrome/common/chrome_switches.h | 1 - chrome/installer/setup/install_worker.cc | 2 +- chrome/installer/util/installation_validator.cc | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index b77aa6c970a4..6eca948e7e5d 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -91,13 +91,6 @@ const char kAppsGalleryURL[] = "apps-gallery-url"; // The update url used by gallery/webstore extensions. const char kAppsGalleryUpdateURL[] = "apps-gallery-update-url"; -// TODO(asargent) - remove this flag and change uses of it to instead use -// kInstallFromWebstore. -// -// Specifies the URL of an application manifest to retrieve. The user will be -// prompted for consent and the application retrieved/installed if consented. -const char kAppsInstallFromManifestURL[] = "apps-install-from-manifest-url"; - // Whether to always use the new app install bubble when installing an app. const char kAppsNewInstallBubble[] = "apps-new-install-bubble"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 73757b045985..d6a900f0a3ae 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -41,7 +41,6 @@ extern const char kAppsGalleryInstallAutoConfirmForTests[]; extern const char kAppsGalleryReturnTokens[]; extern const char kAppsGalleryURL[]; extern const char kAppsGalleryUpdateURL[]; -extern const char kAppsInstallFromManifestURL[]; extern const char kAppsNewInstallBubble[]; extern const char kAppsNoThrob[]; extern const char kAuthNegotiateDelegateWhitelist[]; diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 9f9ccad03f7c..9d2eaa660294 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -188,7 +188,7 @@ void AddInstallAppCommandWorkItems(const InstallerState& installer_state, } else { CommandLine cmd_line( installer_state.target_path().Append(installer::kChromeAppHostExe)); - cmd_line.AppendSwitchASCII(::switches::kAppsInstallFromManifestURL, "%1"); + cmd_line.AppendSwitchASCII(::switches::kInstallFromWebstore, "%1"); AppCommand cmd(cmd_line.GetCommandLineString()); cmd.set_sends_pings(true); diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc index cbb6c0075d19..206eb5003c35 100644 --- a/chrome/installer/util/installation_validator.cc +++ b/chrome/installer/util/installation_validator.cc @@ -224,7 +224,7 @@ void InstallationValidator::ValidateInstallAppCommand( SwitchExpectations expected; expected.push_back( - std::make_pair(std::string(::switches::kAppsInstallFromManifestURL), + std::make_pair(std::string(::switches::kInstallFromWebstore), true)); ValidateCommandExpectations(ctx, the_command, expected, "install application", -- 2.11.4.GIT