Add multi install support to MasterPreferences and start using it in a few places.I'm also adding a constant for CEEE - I named it kCeee instead of kEnableCeee since it's also used in uninstalls.This change is just a beginning of being aware of having more than one product available in setup.

I added some todos and dcheck for myself to keep track of places that will need more significant changes when running multiple installs.

BUG=61609
TEST=All installations (chrome, chrome frame, ceee) should work as before with the exception that the CEEE switch is now --ceee and not --enable-ceee.

Review URL: http://codereview.chromium.org/4635006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65855 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 1 deletions

diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index ed22874..eb6342e 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -45,12 +45,14 @@ 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-launched as the interactive user
   SXS_OPTION_NOT_SUPPORTED  // The chrome-sxs option provided does not work
                             // with other command line options.
 };
 
 namespace switches {
+extern const wchar_t kCeee[];
+extern const wchar_t kChrome[];
 extern const wchar_t kChromeFrame[];
 extern const wchar_t kChromeSxS[];
 extern const wchar_t kCreateAllShortcuts[];
@@ -67,6 +69,7 @@ extern const char kInstallerData[];
 extern const wchar_t kLogFile[];
 extern const wchar_t kMakeChromeDefault[];
 extern const wchar_t kMsi[];
+extern const wchar_t kMultiInstall[];
 extern const char kNewSetupExe[];
 extern const char kRegisterChromeBrowser[];
 extern const char kRegisterChromeBrowserSuffix[];