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

chrome/installer/util/install_util.h

 // Copyright (c) 2006-2008 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 declares utility functions for the installer. The original reason
 // for putting these functions in installer\util library is so that we can
 // separate out the critical logic and write unit tests for it.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
 #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
@@ skipping 39 matching lines @@
                                    int string_resource_id,
                                    const std::wstring* const launch_cmd);
 
   // Returns true if this installation path is per user, otherwise returns
   // false (per machine install, meaning: the exe_path contains path to
   // Program Files).
   static bool IsPerUserInstall(const wchar_t* const exe_path);
 
   // Returns true if this is a Chrome Frame installation (as indicated by the
   // presence of --chrome-frame on the command line) or if this is running
-  // inside of the Chrome Frame dll.
+  // inside of the Chrome Frame dll. Also returns true if a master.preferences
+  // file containing chrome_frame: true is specified on the command line.
   static bool IsChromeFrameProcess();
 
   // Returns true if this is running setup process for Chrome SxS (as
   // indicated by the presence of --chrome-sxs on the command line) or if this
   // is running Chrome process from the Chrome SxS installation (as indicated
   // by either --chrome-sxs or the executable path).
   static bool IsChromeSxSProcess();
 
   // Returns true if this setup process is running as an install managed by an
-  // MSI wrapper. This is indicated by the presence of --msi on the command line
-  // or the presence of "msi": true in the master preferences file.
-  static bool IsMSIProcess();
+  // MSI wrapper. There are three things that are checked:
+  // 1) the presence of --msi on the command line
+  // 2) the presence of "msi": true in the master preferences file
+  // 3) the presence of a DWORD value in the ClientState key called msi with
+  //    value 1
+  // NOTE: This method is NOT thread safe.
+  static bool IsMSIProcess(bool system_level);
+
+
+  // Sets the boolean MSI marker for this installation if set is true or clears
+  // it otherwise. The MSI marker is stored in the registry under the
+  // ClientState key.
+  static bool SetMSIMarker(bool system_level, bool set);
 
   // Adds all DLLs in install_path whose names are given by dll_names to a
   // work item list containing registration or unregistration actions.
   //
   // install_path: Install path containing the registrable DLLs.
   // dll_names: the array of strings containing dll_names
   // dll_names_count: the number of DLL names in dll_names
   // do_register: whether to register or unregister the DLLs
   // registration_list: the WorkItemList that this method populates
   //
   // Returns true if at least one DLL was successfully added to
   // registration_list.
   static bool BuildDLLRegistrationList(const std::wstring& install_path,
                                        const wchar_t** const dll_names,
                                        int dll_names_count,
                                        bool do_register,
                                        WorkItemList* registration_list);
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(InstallUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__