diff options
Diffstat (limited to 'chrome/installer/setup/install.h')
| -rw-r--r-- | chrome/installer/setup/install.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h index 6613e6fb..de468b3 100644 --- a/chrome/installer/setup/install.h +++ b/chrome/installer/setup/install.h @@ -7,8 +7,7 @@ #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_ #define CHROME_INSTALLER_SETUP_INSTALL_H_ -#include <string> -#include <windows.h> +#include <base/values.h> #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/version.h" @@ -29,7 +28,7 @@ std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path, // install_temp_path: working directory used during install/update. It should // also has a sub dir source that contains a complete // and unpacked Chrome package. -// options: install options. See chrome/installer/util/util_constants.h. +// prefs: master preferences. See chrome/installer/util/master_preferences.h. // new_version: new Chrome version that needs to be installed // installed_version: currently installed version of Chrome, if any, or // NULL otherwise @@ -38,7 +37,7 @@ std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path, // is responsible for cleaning up install_temp_path. installer_util::InstallStatus InstallOrUpdateChrome( const std::wstring& exe_path, const std::wstring& archive_path, - const std::wstring& install_temp_path, int options, + const std::wstring& install_temp_path, const DictionaryValue* prefs, const Version& new_version, const Version* installed_version); // This function installs a new version of Chrome to the specified location. |