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

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

Issue 11685006: [Fixit-Dec-2012] Auto-launch system-level Chrome post user-level Chrome self-destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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
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);

Powered by Google App Engine
This is Rietveld 408576698