Commit 410247e1 authored by huangs@chromium.org's avatar huangs@chromium.org

Removing deprecated DCHECK's that require App Launcher to be user-level only.

With Chrome / App Launcher unification, the App Launcher can be installed at system-level. Old DCHECK's to enforce otherwise are creating bogus failures, and should be removed. 

This bug is triggered by https://chromiumcodereview.appspot.com/14711006/ , which adds "shadow" App Launcher Clients/ClientState keys to support 7DA tracking for App Launcher. Unfortunately, these keys are read, and are interpreted as the presence of App Launcher (thus triggering DCHECK).

A separate issue is that installation_validator complains about missing information in the "shadow" registry key. This is less urgent, and hence not part of this CL.

BUG=243432

Review URL: https://chromiumcodereview.appspot.com/15915003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202605 0039d316-1c4b-4281-b951-d872f2087c98
parent 4d9d3bc7
...@@ -1140,8 +1140,6 @@ InstallStatus UninstallProduct(const InstallationState& original_state, ...@@ -1140,8 +1140,6 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
DeleteShortcuts(installer_state, product, base::FilePath(chrome_exe)); DeleteShortcuts(installer_state, product, base::FilePath(chrome_exe));
} else if (product.is_chrome_app_host()) { } else if (product.is_chrome_app_host()) {
// TODO(huangs): Remove this check once we have system-level App Host.
DCHECK(!installer_state.system_install());
const base::FilePath app_host_exe( const base::FilePath app_host_exe(
installer_state.target_path().Append(installer::kChromeAppHostExe)); installer_state.target_path().Append(installer::kChromeAppHostExe));
DeleteShortcuts(installer_state, product, app_host_exe); DeleteShortcuts(installer_state, product, app_host_exe);
......
...@@ -115,8 +115,6 @@ BrowserDistribution::Type ...@@ -115,8 +115,6 @@ BrowserDistribution::Type
void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations( void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations(
const ProductContext& ctx, const ProductContext& ctx,
SwitchExpectations* expectations) const { SwitchExpectations* expectations) const {
DCHECK(!ctx.system_install);
// --app-launcher must be present. // --app-launcher must be present.
expectations->push_back( expectations->push_back(
std::make_pair(std::string(switches::kChromeAppLauncher), true)); std::make_pair(std::string(switches::kChromeAppLauncher), true));
...@@ -867,11 +865,6 @@ bool InstallationValidator::ValidateInstallationTypeForState( ...@@ -867,11 +865,6 @@ bool InstallationValidator::ValidateInstallationTypeForState(
ValidateProduct(machine_state, system_level, *product_state, ValidateProduct(machine_state, system_level, *product_state,
chrome_app_host_rules, &rock_on); chrome_app_host_rules, &rock_on);
*type = static_cast<InstallationType>(*type | ProductBits::CHROME_APP_HOST); *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()) { if (!product_state->is_multi_install()) {
LOG(ERROR) << "Chrome App Launcher must always be multi-install."; LOG(ERROR) << "Chrome App Launcher must always be multi-install.";
rock_on = false; rock_on = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment