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

Unified Diff: chrome/installer/util/package.cc

Issue 5738009: Revert 69167, itself a revert of 69165 - Merge the installer, installer_util ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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/util/master_preferences_unittest.cc ('k') | chrome/installer/util/package_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/package.cc
===================================================================
--- chrome/installer/util/package.cc (revision 69167)
+++ chrome/installer/util/package.cc (working copy)
@@ -58,14 +58,14 @@
FilePath Package::GetInstallerDirectory(
const Version& version) const {
return path_.Append(version.GetString())
- .Append(installer_util::kInstallerDir);
+ .Append(installer::kInstallerDir);
}
Version* Package::GetCurrentVersion() const {
scoped_ptr<Version> current_version;
// Be aware that there might be a pending "new_chrome.exe" already in the
// installation path.
- FilePath new_chrome_exe(path_.Append(installer_util::kChromeNewExe));
+ FilePath new_chrome_exe(path_.Append(installer::kChromeNewExe));
bool new_chrome_exists = file_util::PathExists(new_chrome_exe);
for (size_t i = 0; i < products_.size(); ++i) {
« no previous file with comments | « chrome/installer/util/master_preferences_unittest.cc ('k') | chrome/installer/util/package_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698