Add a CEEE mode to the ChromeFrame distribution class.

Pass a MasterPreferences into BrowserDistribution et al. to allow for preferences-based behaviour.
Add a GetComDllList() method that returns the set of registerable components for that distribution.
Change GetKeyFile() on BrowserDistribution to GetKeyFiles().
Refactor GetMasterPreferencesForCurrentProcess into a static method on MasterPreferences.

BUG=61609
TEST=None

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

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

1 files changed, 5 insertions, 10 deletions

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 8aa5638..239d4fa 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -42,7 +42,7 @@
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 
-#include "installer_util_strings.h"
+#include "installer_util_strings.h"  // NOLINT
 
 using installer::Product;
 using installer::ProductPackageMapping;
@@ -282,7 +282,7 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
 
   FilePath unpack_path(temp_path.Append(installer::kInstallSourceDir));
   bool incremental_install = false;
-  if (UnPackArchive(archive, installation,temp_path, unpack_path,
+  if (UnPackArchive(archive, installation, temp_path, unpack_path,
                     incremental_install)) {
     install_status = installer_util::UNCOMPRESSION_FAILED;
     WriteInstallerResult(products, install_status,
@@ -696,17 +696,12 @@ void PopulateInstallations(const MasterPreferences& prefs,
   DCHECK(installations);
   if (prefs.install_chrome()) {
     VLOG(1) << "Install distribution: Chrome";
-    installations->AddDistribution(BrowserDistribution::CHROME_BROWSER);
+    installations->AddDistribution(BrowserDistribution::CHROME_BROWSER, prefs);
   }
 
   if (prefs.install_chrome_frame()) {
     VLOG(1) << "Install distribution: Chrome Frame";
-    installations->AddDistribution(BrowserDistribution::CHROME_FRAME);
-  }
-
-  if (prefs.install_ceee()) {
-    VLOG(1) << "Install distribution: CEEE";
-    installations->AddDistribution(BrowserDistribution::CHROME_FRAME);
+    installations->AddDistribution(BrowserDistribution::CHROME_FRAME, prefs);
   }
 }
 
@@ -719,7 +714,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
   CommandLine::Init(0, NULL);
 
   const MasterPreferences& prefs =
-      InstallUtil::GetMasterPreferencesForCurrentProcess();
+      installer_util::MasterPreferences::ForCurrentProcess();
   installer::InitInstallerLogging(prefs);
 
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();