summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup
diff options
context:
space:
mode:
authorhuangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-01 03:11:16 +0000
committerhuangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-01 03:11:16 +0000
commitcc12fbb00143737e4cb59b17fb8052f68891859a (patch)
treeb9d7c5334bf8365fe8788ba5c03d98c7bcd6856a /chrome/installer/setup
parente856430efde38c9f55bfdce3dda0bddd5e15db3b (diff)
downloadchromium_src-cc12fbb00143737e4cb59b17fb8052f68891859a.zip
chromium_src-cc12fbb00143737e4cb59b17fb8052f68891859a.tar.gz
chromium_src-cc12fbb00143737e4cb59b17fb8052f68891859a.tar.bz2
Removing non-Launcher Apps V2 flow, interpreting --app-host as --app-launcher.
The non-Launcher Apps V2 flow: - Was installed by the "--app-host" switch, and has ap value "-apphost". - Enables V2 apps to appear in the NTP. - Cannot be directly uninstalled. Keeping it around increased complexity, and led to "missed-a-spot" bugs, such as Issue 178025 where app_host.exe passes "--app-host" to setup.exe when app_host.exe updates itself. Now we remove this flow from the installer, and not keep track of the distinction between "App Host" and "App Launcher". However, for backwards compatibility, setup.exe will still interpret "--app-host" as "--app-launcher", but will not genreate commands with "--app-host". BUG=178025,178834 Review URL: https://chromiumcodereview.appspot.com/12388022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r--chrome/installer/setup/install.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index aa78944..362acd7 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -553,8 +553,7 @@ InstallStatus InstallOrUpdateProduct(
const Product* app_launcher_product =
installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST);
// Creates shortcuts for App Launcher.
- if (app_launcher_product &&
- app_launcher_product->HasOption(kOptionAppHostIsLauncher)) {
+ if (app_launcher_product) {
// TODO(huangs): Remove this check once we have system-level App Host.
DCHECK(!installer_state.system_install());
const base::FilePath app_host_exe(