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

Index: chrome/installer/util/installer_state.h
===================================================================
--- chrome/installer/util/installer_state.h	(revision 91508)
+++ chrome/installer/util/installer_state.h	(working copy)
@@ -105,6 +105,11 @@
   // 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;
+
   // The full path to the place where the operand resides.
   const FilePath& target_path() const { return target_path_; }
 
@@ -190,6 +195,8 @@
       const InstallationState& machine_state);
   bool IsMultiInstallUpdate(const MasterPreferences& prefs,
                             const InstallationState& machine_state);
+  bool IsFileInUse(const FilePath& file);

[grt (UTC plus 2), 2011/07/14 14:25:29]

this can be static.

[robertshield, 2011/07/15 13:49:18]

Done.

+  bool DetectChromeFrameInUse(const InstallationState& machine_state);
 
   // Sets this object's level and updates the root_key_ accordingly.
   void set_level(Level level);
@@ -211,6 +218,7 @@
 #endif
   bool msi_;
   bool verbose_logging_;
+  bool is_chrome_frame_running_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallerState);