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, 11 insertions, 0 deletions

diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
index 412dd50..2cb5ceb 100644
--- a/chrome/installer/util/util_constants.cc
+++ b/chrome/installer/util/util_constants.cc
@@ -8,6 +8,13 @@ namespace installer_util {
 
 namespace switches {
 
+// Install CEEE.
+const wchar_t kCeee[] = L"ceee";
+
+// Install Chrome.
+// Currently this is only required when used in combination with kMultiInstall.
+const wchar_t kChrome[] = L"chrome";
+
 // Run the installer in Chrome Frame mode.
 const wchar_t kChromeFrame[] = L"chrome-frame";
 
@@ -65,6 +72,10 @@ const wchar_t kMakeChromeDefault[] = L"make-chrome-default";
 // Tells installer to expect to be run as a subsidiary to an MSI.
 const wchar_t kMsi[] = L"msi";
 
+// Tells installer to install multiple products specified on the command line.
+// (e.g. Chrome Frame, CEEE, Chrome)
+const wchar_t kMultiInstall[] = L"multi-install";
+
 // Useful only when used with --update-setup-exe, otherwise ignored. It
 // specifies the full path where updated setup.exe will be stored.
 const char kNewSetupExe[] = "new-setup-exe";