Index: chrome/installer/util/install_util.cc |
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc |
index d98a30b5037145aefa3fcc425c4044ab3cbb8e20..28f03febfb6b4e4f99f0ab590cb763a8017f0e39 100644 |
--- a/chrome/installer/util/install_util.cc |
+++ b/chrome/installer/util/install_util.cc |
@@ -377,14 +377,11 @@ bool InstallUtil::IsChromeSxSProcess() { |
} |
bool InstallUtil::GetSentinelFilePath(const FilePath::CharType* file, |
+ bool system_install, |
BrowserDistribution* dist, |
FilePath* path) { |
- FilePath exe_path; |
- if (!PathService::Get(base::DIR_EXE, &exe_path)) |
- return false; |
- |
- if (IsPerUserInstall(exe_path.value().c_str())) { |
- *path = exe_path; |
+ if (!system_install) { |
+ *path = installer::GetChromeInstallPath(false, dist); |
grt (UTC plus 2)
2013/01/02 17:59:33
This has a different subtle flaw than the old one
gab
2013/01/02 21:15:48
Ah! Good catch :)! Fixed both now I think!
|
} else { |
std::vector<FilePath> user_data_dir_paths; |
installer::GetChromeUserDataPaths(dist, &user_data_dir_paths); |