Cause new_chrome.exe to always be written if Chrome Frame is in use, resulting in updates being d...

chrome/installer/util/installer_state.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 87 matching lines @@
   Operation operation() const { return operation_; }
 
   // A convenience method returning level() == SYSTEM_LEVEL.
   // TODO(grt): Eradicate the bool in favor of the enum.
   bool system_install() const;
 
   // A convenience method returning package_type() == MULTI_PACKAGE.
   // TODO(grt): Eradicate the bool in favor of the enum.
   bool is_multi_install() const;
 
+  // Returns whether or not there is currently a Chrome Frame instance running.
+  // Note that there isn't a mechanism to lock Chrome Frame in place, so Chrome
+  // Frame may either exit or start up after this is called.
+  bool is_chrome_frame_running() const { return is_chrome_frame_running_; }
+
   // The full path to the place where the operand resides.
   const FilePath& target_path() const { return target_path_; }
 
   // True if the "msi" preference is set or if a product with the "msi" state
   // flag is set is to be operated on.
   bool is_msi() const { return msi_; }
 
   // True if the --verbose-logging command-line flag is set or if the
   // verbose_logging master preferences option is true.
   bool verbose_logging() const { return verbose_logging_; }
@@ skipping 55 matching lines @@
   // (FAILED_CUSTOM_ERROR) depending on whether |status| maps to success or not.
   // |status| itself is written to the InstallerError value.
   // |string_resource_id|, if non-zero, identifies a localized string written to
   // the InstallerResultUIString value.  |launch_cmd|, if non-NULL and
   // non-empty, is written to the InstallerSuccessLaunchCmdLine value.
   void WriteInstallerResult(InstallStatus status,
                             int string_resource_id,
                             const std::wstring* launch_cmd) const;
 
  protected:
+  static bool IsFileInUse(const FilePath& file);
+
   FilePath GetDefaultProductInstallPath(BrowserDistribution* dist) const;
   bool CanAddProduct(const Product& product, const FilePath* product_dir) const;
   Product* AddProductInDirectory(const FilePath* product_dir,
                                  scoped_ptr<Product>* product);
   Product* AddProductFromPreferences(
       BrowserDistribution::Type distribution_type,
       const MasterPreferences& prefs,
       const InstallationState& machine_state);
   bool IsMultiInstallUpdate(const MasterPreferences& prefs,
                             const InstallationState& machine_state);
+  bool DetectChromeFrameInUse(const InstallationState& machine_state);
 
   // Sets this object's level and updates the root_key_ accordingly.
   void set_level(Level level);
 
   // Sets this object's package type and updates the multi_package_distribution_
   // accordingly.
   void set_package_type(PackageType type);
 
   Operation operation_;
   FilePath target_path_;
   std::wstring state_key_;
   BrowserDistribution::Type state_type_;
   ScopedVector<Product> products_;
   BrowserDistribution* multi_package_distribution_;
   Level level_;
   PackageType package_type_;
 #if defined(OS_WIN)
   HKEY root_key_;
 #endif
   bool msi_;
   bool verbose_logging_;
+  bool is_chrome_frame_running_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallerState);
 };  // class InstallerState
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_