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

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

Issue 132583002: Installer string cleaning following Chrome Frame removal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/app/google_chrome_strings.grd ('k') | chrome/installer/util/chrome_frame_distribution.h » ('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 fa258abc65eaeacbad63109ace978903c3c116fa..94c0a2b31f4bfac93d215c86494426122f8396b9 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -581,10 +581,8 @@ bool CheckPreInstallConditions(const InstallationState& original_state,
base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
}
} else {
- // Display an error message for other products.
- *status = installer::SYSTEM_LEVEL_INSTALL_EXISTS;
- installer_state->WriteInstallerResult(
- *status, IDS_INSTALL_SYSTEM_LEVEL_EXISTS_BASE, NULL);
+ // It's not possible to install anything other than Chrome.
+ NOTREACHED();
gab 2014/01/09 21:59:15 It is possible that an old multi-install system-le
grt (UTC plus 2) 2014/01/10 12:10:52 No. They would have already been removed by now by
gab 2014/01/10 16:28:03 Well if you install user-level Chrome, it means yo
gab 2014/01/10 20:41:39 Ah ok, just realized this was doing the check whet
grt (UTC plus 2) 2014/01/10 21:42:27 Done. Thanks for putting a lot of thought into th
}
return false;
}
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/installer/util/chrome_frame_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698