Additional changes to support Chrome / CF installation wrapped in an MSI:...

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/master_preferences.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/common/json_value_serializer.h"
@@ skipping 96 matching lines @@
 #if defined(OS_WIN)
   if (cmd_line.HasSwitch(installer_util::switches::kInstallerData)) {
     FilePath prefs_path(
         cmd_line.GetSwitchValue(installer_util::switches::kInstallerData));
     prefs = installer_util::ParseDistributionPreferences(prefs_path);
   }
 
   if (!prefs)
     prefs = new DictionaryValue();
 
+  if (cmd_line.HasSwitch(installer_util::switches::kChromeFrame))
+    installer_util::SetDistroBooleanPreference(
+        prefs, installer_util::master_preferences::kChromeFrame, true);
+
   if (cmd_line.HasSwitch(installer_util::switches::kCreateAllShortcuts))
     installer_util::SetDistroBooleanPreference(
         prefs, installer_util::master_preferences::kCreateAllShortcuts, true);
 
   if (cmd_line.HasSwitch(installer_util::switches::kDoNotCreateShortcuts))
     installer_util::SetDistroBooleanPreference(
         prefs, installer_util::master_preferences::kDoNotCreateShortcuts, true);
 
   if (cmd_line.HasSwitch(installer_util::switches::kMsi))
     installer_util::SetDistroBooleanPreference(
@@ skipping 66 matching lines @@
   return true;
 }
 
 bool HasExtensionsBlock(const DictionaryValue* prefs,
                         DictionaryValue** extensions) {
   return (prefs->GetDictionary(master_preferences::kExtensionsBlock,
                                extensions));
 }
 
 }  // installer_util