Enforce kSystemFeaturesDisableList in Lacros
This feature (amongst other things) blocks entering the URL for a
preinstalled app. This is currently not enforced in Lacros. This CL
ensures that that part of the feature works in Lacros by using the
correct apps navigation throttle.
Bug: 1251490
Test: Flashed and verified with canvas.apps.chrome
Change-Id: I310976b0c3c07a4a3b2f52f6740ea7c838babb29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3223000
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Maggie Cai <[email protected]>
Reviewed-by: Roman Sorokin [CET] <[email protected]>
Commit-Queue: Ben Franz <[email protected]>
Cr-Commit-Position: refs/heads/main@{#939312}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 98e7e2d..eefd6cf 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -186,7 +186,6 @@
#include "chrome/browser/ash/login/easy_unlock/easy_unlock_service.h"
#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h"
-#include "chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.h"
#include "chrome/browser/ash/policy/networking/euicc_status_uploader.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/chromeos/extensions/extensions_permissions_tracker.h"
@@ -262,6 +261,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.h"
+#include "chrome/browser/policy/system_features_disable_list_policy_handler.h"
#include "chrome/browser/ui/webui/certificates_handler.h"
#if defined(USE_CUPS)
#include "chrome/browser/extensions/api/printing/printing_api_handler.h"
@@ -1075,12 +1075,15 @@
policy::MinimumVersionPolicyHandler::RegisterPrefs(registry);
policy::EuiccStatusUploader::RegisterLocalStatePrefs(registry);
policy::TPMAutoUpdateModePolicyHandler::RegisterPrefs(registry);
- policy::SystemFeaturesDisableListPolicyHandler::RegisterPrefs(registry);
quirks::QuirksManager::RegisterPrefs(registry);
UpgradeDetectorChromeos::RegisterPrefs(registry);
RegisterNearbySharingLocalPrefs(registry);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if defined(OS_CHROMEOS)
+ policy::SystemFeaturesDisableListPolicyHandler::RegisterPrefs(registry);
+#endif // defined(OS_CHROMEOS)
+
// TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the
// migration is complete.
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
