| Index: chrome/installer/setup/install.h
|
| ===================================================================
|
| --- chrome/installer/setup/install.h (revision 23179)
|
| +++ chrome/installer/setup/install.h (working copy)
|
| @@ -37,8 +37,9 @@
|
| // 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 Version& new_version, const Version* installed_version);
|
| + const std::wstring& install_temp_path, const std::wstring& prefs_path,
|
| + const DictionaryValue* prefs, const Version& new_version,
|
| + const Version* installed_version);
|
|
|
| // This function installs a new version of Chrome to the specified location.
|
| // It returns true if install was successful and false in case of an error.
|
|
|
| Property changes on: chrome\installer\setup\install.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/chrome/installer/setup/install.h:r22314
|
|
|
|
|