| Index: chrome/installer/setup/app_launcher_installer.cc
|
| diff --git a/chrome/installer/setup/app_launcher_installer.cc b/chrome/installer/setup/app_launcher_installer.cc
|
| index 882b73d421673eaf7047dcd1c897867954aab51e..e59e66f66d5f74a441d9dab8644f466b25e68950 100644
|
| --- a/chrome/installer/setup/app_launcher_installer.cc
|
| +++ b/chrome/installer/setup/app_launcher_installer.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/strings/string16.h"
|
| #include "base/version.h"
|
| +#include "chrome/installer/setup/brand_constants.h"
|
| #include "chrome/installer/setup/install_worker.h"
|
| #include "chrome/installer/setup/setup_util.h"
|
| #include "chrome/installer/util/google_update_constants.h"
|
| @@ -51,7 +52,7 @@ void AddLegacyAppCommandRemovalItem(const InstallerState& installer_state,
|
| } // namespace
|
|
|
| void RemoveAppLauncherVersionKey(HKEY reg_root) {
|
| - DCHECK(!InstallUtil::IsChromeSxSProcess());
|
| + DCHECK(GetBrandConstants().supported_app_launcher);
|
| const UpdatingAppRegistrationData app_launcher_reg_data(kAppLauncherGuid);
|
| InstallUtil::DeleteRegistryKey(
|
| reg_root, app_launcher_reg_data.GetVersionKey(), KEY_WOW64_32KEY);
|
| @@ -60,7 +61,7 @@ void RemoveAppLauncherVersionKey(HKEY reg_root) {
|
| void AddRemoveLegacyAppHostExeWorkItems(const base::FilePath& target_path,
|
| const base::FilePath& temp_path,
|
| WorkItemList* list) {
|
| - DCHECK(!InstallUtil::IsChromeSxSProcess());
|
| + DCHECK(GetBrandConstants().supported_app_launcher);
|
| auto* delete_tree_work_item = list->AddDeleteTreeWorkItem(
|
| target_path.Append(kLegacyChromeAppHostExe), temp_path);
|
| delete_tree_work_item->set_best_effort(true);
|
| @@ -69,7 +70,7 @@ void AddRemoveLegacyAppHostExeWorkItems(const base::FilePath& target_path,
|
|
|
| void AddRemoveLegacyAppCommandsWorkItems(const InstallerState& installer_state,
|
| WorkItemList* list) {
|
| - DCHECK(!InstallUtil::IsChromeSxSProcess());
|
| + DCHECK(GetBrandConstants().supported_app_launcher);
|
| DCHECK(list);
|
| for (const auto* p : installer_state.products()) {
|
| if (p->is_chrome()) {
|
|
|