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

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

Issue 5429002: Support for checking multiple keyfiles when removing an installation package.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « no previous file | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install.cc
===================================================================
--- chrome/installer/setup/install.cc (revision 67902)
+++ chrome/installer/setup/install.cc (working copy)
@@ -624,7 +624,6 @@
}
}
- // TODO(tommi): See if we can't get rid of this parameter.
current_version->reset(package.GetCurrentVersion());
scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
@@ -637,7 +636,7 @@
FilePath new_chrome_exe(
package.path().Append(installer_util::kChromeNewExe));
- install_list->AddDeleteTreeWorkItem(new_chrome_exe.value(), std::wstring());
+ install_list->AddDeleteTreeWorkItem(new_chrome_exe);
install_list->AddCopyTreeWorkItem(
src_path.Append(installer_util::kChromeExe).value(),
package.path().Append(installer_util::kChromeExe).value(),
@@ -673,8 +672,7 @@
// Delete any old_chrome.exe if present.
install_list->AddDeleteTreeWorkItem(
- package.path().Append(installer_util::kChromeOldExe).value(),
- std::wstring());
+ package.path().Append(installer_util::kChromeOldExe));
// Copy installer in install directory and
// add shortcut in Control Panel->Add/Remove Programs.
« no previous file with comments | « no previous file | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698