From 84c03ef3a5631759c66ee5c82f71106a77563bd0 Mon Sep 17 00:00:00 2001 From: "kuchhal@chromium.org" Date: Fri, 31 Jul 2009 22:16:26 +0000 Subject: Revert changes from r22198 to r22204 and r22194. None of these changes were supposed to be commited. Seems like git took all the temporary commits from the base branch and uploaded them to svn. Review URL: http://codereview.chromium.org/159736 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22206 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/setup/install.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chrome/installer/setup/install.h') diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h index de468b3..6613e6fb 100644 --- a/chrome/installer/setup/install.h +++ b/chrome/installer/setup/install.h @@ -7,7 +7,8 @@ #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_ #define CHROME_INSTALLER_SETUP_INSTALL_H_ -#include +#include +#include #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/version.h" @@ -28,7 +29,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. -// prefs: master preferences. See chrome/installer/util/master_preferences.h. +// options: install options. See chrome/installer/util/util_constants.h. // new_version: new Chrome version that needs to be installed // installed_version: currently installed version of Chrome, if any, or // NULL otherwise @@ -37,7 +38,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, const DictionaryValue* prefs, + const std::wstring& install_temp_path, int options, const Version& new_version, const Version* installed_version); // This function installs a new version of Chrome to the specified location. -- cgit v1.1