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

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

Issue 15915003: Removing deprecated DCHECK's that require App Launcher to be user-level only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Decided to leave install.cc alone. Created 7 years, 7 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/installer/setup/uninstall.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/installation_validator.cc
diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc
index 2875beb4045b5f1f0bf90bb4d1b9a339bcd0f9df..c49c5875bda2ee2195bb6a1eec66d268442fee2d 100644
--- a/chrome/installer/util/installation_validator.cc
+++ b/chrome/installer/util/installation_validator.cc
@@ -115,8 +115,6 @@ BrowserDistribution::Type
void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations(
const ProductContext& ctx,
SwitchExpectations* expectations) const {
- DCHECK(!ctx.system_install);
-
// --app-launcher must be present.
expectations->push_back(
std::make_pair(std::string(switches::kChromeAppLauncher), true));
@@ -867,11 +865,6 @@ bool InstallationValidator::ValidateInstallationTypeForState(
ValidateProduct(machine_state, system_level, *product_state,
chrome_app_host_rules, &rock_on);
*type = static_cast<InstallationType>(*type | ProductBits::CHROME_APP_HOST);
- if (system_level) {
- LOG(ERROR) <<
- "Chrome App Launcher must not be installed at system level.";
- rock_on = false;
- }
if (!product_state->is_multi_install()) {
LOG(ERROR) << "Chrome App Launcher must always be multi-install.";
rock_on = false;
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698