PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

v118 patch

Browse Source 
fix disabling shopping and merchant feature not completely disabled by the corresponding policy
add BlockTruncatedCookies v118 policy (https://chromeenterprise.google/policies/#BlockTruncatedCookies)
This commit is contained in:
Carmelo Messina
2023-10-11 11:46:55 +01:00
committed by uazo
parent 40cd52a0d5
commit 50fe823fde
1 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00add-browser-policy.patch
+41 -3
View File
@@ -15,9 +15,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
chrome/browser/signin/chrome_signin_client.cc | 7 +-
.../ui/webui/policy/policy_ui_handler.cc | 104 ++++++++++++-
.../ui/webui/policy/policy_ui_handler.h | 2 +
.../commerce/core/commerce_feature_list.cc | 12 +-
.../core/browser/browser_policy_connector.cc | 3 +
.../common/command_line_policy_provider.cc | 3 +
.../core/common/policy_loader_command_line.cc | 139 ++++++++++++++++--
.../core/common/policy_loader_command_line.cc | 140 ++++++++++++++++--
.../policy/core/common/policy_pref_names.cc | 3 +
.../policy/core/common/policy_pref_names.h | 1 +
.../policy/core/common/policy_service_impl.cc | 3 +
@@ -29,7 +30,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
components/policy_strings.grdp | 4 +-
.../gaia_cookie_manager_service.cc | 4 +
google_apis/gaia/gaia_auth_fetcher.cc | 1 +
25 files changed, 298 insertions(+), 95 deletions(-)
26 files changed, 305 insertions(+), 101 deletions(-)
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
--- a/base/win/win_util.cc
@@ -427,6 +428,42 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.h b/chrome/browser
void HandleListenPoliciesUpdates(const base::Value::List& args);
void HandleReloadPolicies(const base::Value::List& args);
void HandleCopyPoliciesJson(const base::Value::List& args);
diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc
--- a/components/commerce/core/commerce_feature_list.cc
+++ b/components/commerce/core/commerce_feature_list.cc
@@ -160,8 +160,8 @@ BASE_FEATURE(kCommercePriceTrackingChipExperiment,
#if BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kCommercePriceTrackingRegionLaunched,
- "CommercePriceTrackingRegionLaunched",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "CommercePriceTrackingRegionLaunched", // disabled
+ base::FEATURE_DISABLED_BY_DEFAULT); // by default
#else
BASE_FEATURE(kCommercePriceTrackingRegionLaunched,
"CommercePriceTrackingRegionLaunched",
@@ -210,8 +210,8 @@ BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
BASE_FEATURE(kShoppingListRegionLaunched,
- "ShoppingListRegionLaunched",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "ShoppingListRegionLaunched", // disabled
+ base::FEATURE_DISABLED_BY_DEFAULT); // by default
#else
BASE_FEATURE(kShoppingListRegionLaunched,
"ShoppingListRegionLaunched",
@@ -260,8 +260,8 @@ BASE_FEATURE(kCommerceHintAndroid,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMerchantWidePromotion,
- "MerchantWidePromotion",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "MerchantWidePromotion", // disabled
+ base::FEATURE_DISABLED_BY_DEFAULT); // by default
BASE_FEATURE(kCodeBasedRBD, "CodeBasedRBD", base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/components/policy/core/browser/browser_policy_connector.cc b/components/policy/core/browser/browser_policy_connector.cc
--- a/components/policy/core/browser/browser_policy_connector.cc
+++ b/components/policy/core/browser/browser_policy_connector.cc
@@ -488,7 +525,7 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
namespace policy {
@@ -21,25 +46,107 @@ PolicyLoaderCommandLine::~PolicyLoaderCommandLine() = default;
@@ -21,25 +46,108 @@ PolicyLoaderCommandLine::~PolicyLoaderCommandLine() = default;
PolicyBundle PolicyLoaderCommandLine::Load() {
PolicyBundle bundle;
@@ -585,6 +622,7 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kSideSearchEnabled, base::Value(false));
+#endif
+
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kBlockTruncatedCookies, base::Value(true));
+ // kFirstPartySetsEnabled
+ // kLensCameraAssistedSearchEnabled
+ // kPasswordLeakDetectionEnabled