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

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

Issue 2379543002: installer and some misc files: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: regroup ifs Created 4 years, 3 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/installer/setup/install_unittest.cc ('k') | chrome/installer/setup/setup_singleton_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 3c192b34d9627e8687fe1c4d11dd84eda6e66af7..966ac436cf6d69fa4edda23d967cb45996b202c9 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1129,18 +1129,17 @@ bool HandleNonInstallCmdLineOptions(const base::FilePath& setup_exe,
installer::switches::kUpdateSetupExe));
VLOG(1) << "Opening archive " << compressed_archive.value();
if (installer::ArchivePatchHelper::UncompressAndPatch(
- temp_path.path(),
- compressed_archive,
- setup_exe,
+ temp_path.GetPath(), compressed_archive, setup_exe,
cmd_line.GetSwitchValuePath(installer::switches::kNewSetupExe))) {
status = installer::NEW_VERSION_UPDATED;
}
if (!temp_path.Delete()) {
// PLOG would be nice, but Delete() doesn't leave a meaningful value in
// the Windows last-error code.
- LOG(WARNING) << "Scheduling temporary path " << temp_path.path().value()
+ LOG(WARNING) << "Scheduling temporary path "
+ << temp_path.GetPath().value()
<< " for deletion at reboot.";
- ScheduleDirectoryForDeletion(temp_path.path());
+ ScheduleDirectoryForDeletion(temp_path.GetPath());
}
}
« no previous file with comments | « chrome/installer/setup/install_unittest.cc ('k') | chrome/installer/setup/setup_singleton_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698