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

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

Issue 12208135: Prevent --ensure-google-update-present switch from blocking install if Google Update is missing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Specifically make the "Google Update is absent" case non-errornous. Created 7 years, 10 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
Index: chrome/installer/util/google_update_util.cc
diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc
index 980664194a54ae16815bf6f92f2f3656ac357262..bde28f1c07db511f95640341d253e407a9c3d600 100644
--- a/chrome/installer/util/google_update_util.cc
+++ b/chrome/installer/util/google_update_util.cc
@@ -180,6 +180,11 @@ bool EnsureUserLevelGoogleUpdatePresent() {
string16 cmd_string;
if (!GetUserLevelGoogleUpdateInstallCommandLine(&cmd_string)) {
LOG(ERROR) << "Cannot find Google Update at system-level.";
+ // Ideally we should return false. However, this case should not be
+ // encountered by regular users, and developers (who often installs
+ // Chrome without Google Update) may be unduly impeded by this case.
+ // Therefore we return true.
+ return true;
grt (UTC plus 2) 2013/02/13 14:22:49 success = true; for consistency since this functio
huangs 2013/02/13 15:35:28 Done.
} else {
success = LaunchProcessAndWaitWithTimeout(cmd_string,
base::TimeDelta::FromMilliseconds(INFINITE));
« chrome/installer/util/google_update_util.h ('K') | « chrome/installer/util/google_update_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698