Do machine inspection on install....

chrome/installer/util/chrome_frame_distribution.cc

 // Copyright (c) 2010 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.
 //
 // This file defines a specific implementation of BrowserDistribution class for
 // Chrome Frame. It overrides the bare minimum of methods necessary to get a
 // Chrome Frame installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_frame_distribution.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
 namespace {
 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
 }
 
 ChromeFrameDistribution::ChromeFrameDistribution(
     const installer::MasterPreferences& prefs)
         : BrowserDistribution(prefs), ceee_(prefs.install_ceee()),
           ready_mode_(false) {
   type_ = BrowserDistribution::CHROME_FRAME;
   prefs.GetBool(installer::master_preferences::kChromeFrameReadyMode,
                 &ready_mode_);
+
+  bool system_install = false;
+  prefs.GetBool(installer::master_preferences::kSystemLevel, &system_install);
+
+  // See if Chrome Frame is already installed.  If so, we must make sure that
+  // the ceee and ready mode flags match.
+  CommandLine uninstall(CommandLine::NO_PROGRAM);
+  if (installer::GetUninstallSwitches(system_install, this, &uninstall)) {
+    if (!ceee_) {
+      LOG(INFO) << "CEEE is not specified on the command line but CEEE is "

[grt (UTC plus 2), 2010/12/29 16:51:50]

This log message says that CEEE is already installed, but isn't that only the
case if the call to uninstall.HasSwitch below returns true?

[tommi (sloooow) - chröme, 2010/12/29 17:30:09]

Thanks for catching this.  Must have happened when I was shuffling the code
around a bit

+                   "already installed. Implicitly enabling CEEE.";
+      ceee_ = uninstall.HasSwitch(installer::switches::kCeee);
+    }
+
+    // If the user has already opted in to CF, we shouldn't set the ready-mode
+    // flag.  If we don't do this, we might have two entries in the Add/Remove
+    // Programs list that can uninstall GCF.  Also, we can only enable
+    // ready-mode if Chrome is also being installed.  Without it, there's no way
+    // to uninstall Chrome Frame.
+    if (ready_mode_) {
+      if (!uninstall.HasSwitch(installer::switches::kChromeFrameReadyMode)) {
+        LOG(INFO) << "Ready mode was specified on the command line but GCF "
+                     "is already fully installed.  Ignoring command line.";
+        ready_mode_ = false;
+      } else if (!prefs.install_chrome()) {
+        LOG(WARNING) << "Cannot enable ready mode without installing Chrome.";
+        ready_mode_ = false;
+      }
+    }
+  }
 }
 
 std::wstring ChromeFrameDistribution::GetAppGuid() {
   return kChromeFrameGuid;
 }
 
 std::wstring ChromeFrameDistribution::GetApplicationName() {
   const std::wstring& product_name =
       installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
   return product_name;
@@ skipping 102 matching lines @@
 
   if (ready_mode_)
     cmd_line->AppendSwitch(installer::switches::kChromeFrameReadyMode);
 }
 
 bool ChromeFrameDistribution::ShouldCreateUninstallEntry() {
   // If Chrome Frame is being installed in ready mode, then we will not
   // add an entry to the add/remove dialog.
   return !ready_mode_;
 }