diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 21:58:12 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 21:58:12 +0000 |
| commit | d23c9b7b8ddf903fee60da371c902a3fec8f66e7 (patch) | |
| tree | ebfe1a887d6e7195676f159ef4f2f0ce2077bc9d /chrome/installer/setup/install.h | |
| parent | cec4a2709d524929d1da9a0ad806644274e36b12 (diff) | |
| download | chromium_src-d23c9b7b8ddf903fee60da371c902a3fec8f66e7.zip chromium_src-d23c9b7b8ddf903fee60da371c902a3fec8f66e7.tar.gz chromium_src-d23c9b7b8ddf903fee60da371c902a3fec8f66e7.tar.bz2 | |
Refactoring of master preferences parsing before adding a new preference.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22198 0039d316-1c4b-4281-b951-d872f2087c98
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. |