summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authorhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-24 03:53:00 +0000
committerhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-24 03:53:00 +0000
commitabd4dc785c3b59eabedcbd51d6c518e8273b6a26 (patch)
treeda8914053a9b48b7f31851c519339d23e66c3a0a /chrome/installer/util
parentcc37a23a18d3cdaf1aa922708d1dbb9d02d1dfee (diff)
downloadchromium_src-abd4dc785c3b59eabedcbd51d6c518e8273b6a26.zip
chromium_src-abd4dc785c3b59eabedcbd51d6c518e8273b6a26.tar.gz
chromium_src-abd4dc785c3b59eabedcbd51d6c518e8273b6a26.tar.bz2
Disabling options that sxs channel does not support.
BUG=35574 TEST=Run setup with those options and "--chrome-sxs". Review URL: http://codereview.chromium.org/652197 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/util_constants.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index a197303..1fc582f 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -43,7 +43,9 @@ enum InstallStatus {
UNINSTALL_REQUIRES_REBOOT, // Uninstallation required a reboot.
IN_USE_UPDATED, // Chrome successfully updated but old version running
SAME_VERSION_REPAIR_FAILED, // Chrome repair failed as Chrome was running
- REENTRY_SYS_UPDATE // Setup has been re-lauched as the interactive user
+ REENTRY_SYS_UPDATE, // Setup has been re-lauched as the interactive user
+ SXS_OPTION_NOT_SUPPORTED // The chrome-sxs option provided does not work
+ // with other command line options.
};
namespace switches {