Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4007)

Unified Diff: chrome/installer/setup/install.h

Issue 164390: Merge 22314 - Use alternate icon for Chrome shortcuts if specified in master ... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/first_run_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/first_run_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698