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

diff --git a/chrome/installer/util/master_preferences_constants.cc b/chrome/installer/util/master_preferences_constants.cc
index 3ac6b92..d3e013c 100644
--- a/chrome/installer/util/master_preferences_constants.cc
+++ b/chrome/installer/util/master_preferences_constants.cc
@@ -8,9 +8,12 @@ namespace installer_util {
 namespace master_preferences {
   const char kAltFirstRunBubble[] = "oem_bubble";
   const char kAltShortcutText[] = "alternate_shortcut_text";
+  const char kCeee[] = "ceee";
+  const char kChrome[] = "chrome";
   const char kChromeFrame[] = "chrome_frame";
   const char kChromeShortcutIconIndex[] = "chrome_shortcut_icon_index";
   const char kCreateAllShortcuts[] = "create_all_shortcuts";
+  const char kDisableLogging[] = "disable_logging";
   const char kDistroImportBookmarksPref[] = "import_bookmarks";
   const char kDistroImportBookmarksFromFilePref[] =
       "import_bookmarks_from_file";
@@ -25,9 +28,11 @@ namespace master_preferences {
   const char kDoNotLaunchChrome[] = "do_not_launch_chrome";
   const char kDoNotRegisterForUpdateLaunch[] =
       "do_not_register_for_update_launch";
+  const char kLogFile[] = "log_file";
   const char kMakeChromeDefault[] = "make_chrome_default";
   const char kMakeChromeDefaultForUser[] = "make_chrome_default_for_user";
   const char kMsi[] = "msi";
+  const char kMultiInstall[] = "multi_install";
   const char kRequireEula[] = "require_eula";
   const char kSearchEngineExperimentPref[] = "search_engine_experiment";
   const char kSearchEngineExperimentRandomizePref[] =