Disable shopping list
This commit is contained in:
Carmelo Messina
@@ -7,13 +7,13 @@ Subject: Add browser policy
|
||||
.../metrics/chrome_feature_list_creator.cc | 12 ++
|
||||
.../policy/chrome_browser_policy_connector.cc | 2 -
|
||||
...nfiguration_policy_handler_list_factory.cc | 6 +-
|
||||
.../account_consistency_mode_manager.cc | 22 +++-
|
||||
.../account_consistency_mode_manager.cc | 5 +-
|
||||
chrome/browser/signin/chrome_signin_client.cc | 7 +-
|
||||
.../ui/webui/policy/policy_ui_handler.cc | 105 ++++++++++++++-
|
||||
.../ui/webui/policy/policy_ui_handler.h | 2 +
|
||||
.../core/browser/browser_policy_connector.cc | 3 +
|
||||
.../common/command_line_policy_provider.cc | 3 +
|
||||
.../core/common/policy_loader_command_line.cc | 120 +++++++++++++++---
|
||||
.../core/common/policy_loader_command_line.cc | 123 +++++++++++++++---
|
||||
.../policy/core/common/policy_pref_names.cc | 3 +
|
||||
.../policy/core/common/policy_pref_names.h | 1 +
|
||||
.../policy/core/common/policy_service_impl.cc | 3 +
|
||||
@@ -23,10 +23,9 @@ Subject: Add browser policy
|
||||
.../policy/resources/webui/policy_row.html | 1 +
|
||||
.../policy/resources/webui/policy_row.js | 12 ++
|
||||
components/policy_strings.grdp | 4 +-
|
||||
components/signin/features.gni | 6 +-
|
||||
.../gaia_cookie_manager_service.cc | 4 +
|
||||
google_apis/gaia/gaia_auth_fetcher.cc | 1 +
|
||||
23 files changed, 294 insertions(+), 33 deletions(-)
|
||||
22 files changed, 278 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
|
||||
--- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
|
||||
@@ -87,7 +86,7 @@ diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/b
|
||||
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -1923,9 +1923,9 @@ bool AreFuturePoliciesEnabledByDefault() {
|
||||
@@ -1924,9 +1924,9 @@ bool AreFuturePoliciesEnabledByDefault() {
|
||||
// Enable future policies for branded browser tests.
|
||||
if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
|
||||
return true;
|
||||
@@ -103,23 +102,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
@@ -34,7 +34,14 @@
|
||||
#error "Dice and Mirror cannot be both enabled."
|
||||
#endif
|
||||
|
||||
-// #if !BUILDFLAG(ENABLE_DICE_SUPPORT) && !BUILDFLAG(ENABLE_MIRROR)
|
||||
+// In Android Dice AND Mirror are disabled in gn
|
||||
+#if BUILDFLAG(IS_ANDROID) && (BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(ENABLE_MIRROR))
|
||||
+#error "Either Dice and Mirror should be disabled."
|
||||
+#endif
|
||||
+
|
||||
+// but in Windows, DICE need to be enabled in build
|
||||
+// (uazo) rimosso temporaneamente
|
||||
+// #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(ENABLE_DICE_SUPPORT) && !BUILDFLAG(ENABLE_MIRROR)
|
||||
// #error "Either Dice or Mirror should be enabled."
|
||||
// #endif
|
||||
|
||||
@@ -198,7 +205,8 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
|
||||
@@ -198,7 +198,8 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_MIRROR)
|
||||
@@ -129,22 +112,15 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
|
||||
@@ -208,8 +216,12 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
|
||||
@@ -208,7 +209,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
|
||||
return AccountConsistencyMethod::kDisabled;
|
||||
}
|
||||
|
||||
- return AccountConsistencyMethod::kDice;
|
||||
-#endif
|
||||
-
|
||||
return AccountConsistencyMethod::kDisabled;
|
||||
+#endif // the shift of this line is intentional
|
||||
+#if BUILDFLAG(IS_ANDROID)
|
||||
+ return AccountConsistencyMethod::kDisabled;
|
||||
+#else
|
||||
+// (uazo) aggiunto temporaneamente
|
||||
+ return AccountConsistencyMethod::kDisabled;
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
NOTREACHED();
|
||||
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
|
||||
--- a/chrome/browser/signin/chrome_signin_client.cc
|
||||
+++ b/chrome/browser/signin/chrome_signin_client.cc
|
||||
@@ -383,7 +359,7 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
|
||||
|
||||
namespace policy {
|
||||
|
||||
@@ -21,25 +46,88 @@ PolicyLoaderCommandLine::~PolicyLoaderCommandLine() = default;
|
||||
@@ -21,25 +46,91 @@ PolicyLoaderCommandLine::~PolicyLoaderCommandLine() = default;
|
||||
|
||||
PolicyBundle PolicyLoaderCommandLine::Load() {
|
||||
PolicyBundle bundle;
|
||||
@@ -458,6 +434,9 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
|
||||
+ enabled_future_policies.Append(policy::key::kMetricsReportingEnabled);
|
||||
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kMetricsReportingEnabled, base::Value(false));
|
||||
+
|
||||
+ // Disable shopping list
|
||||
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kShoppingListEnabled, base::Value(false));
|
||||
+
|
||||
+ // AddPolicy(disabled_policies_list, policy_map, policy::key::ShoppingListEnabled, base::Value(false));
|
||||
+
|
||||
+ // kFirstPartySetsEnabled
|
||||
@@ -635,22 +614,6 @@ diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
|
||||
</message>
|
||||
<message name="IDS_POLICY_SOURCE_CLOUD" desc="Indicates that the policy originates from the cloud.">
|
||||
Cloud
|
||||
diff --git a/components/signin/features.gni b/components/signin/features.gni
|
||||
--- a/components/signin/features.gni
|
||||
+++ b/components/signin/features.gni
|
||||
@@ -5,7 +5,11 @@
|
||||
import("//build/config/chromeos/ui_mode.gni")
|
||||
|
||||
# Dice is supported on the platform (but not necessarily enabled).
|
||||
-enable_dice_support = false
|
||||
+# we need to enable dice support in sources because
|
||||
+# too many build problems appear in windows.
|
||||
+# Dice is disabled in android
|
||||
+enable_dice_support = false # is_linux || is_mac || is_win || is_fuchsia
|
||||
|
||||
# Mirror is enabled and other account consistency mechanisms are not available.
|
||||
+# Disable mirror mode in android
|
||||
enable_mirror = false
|
||||
diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
|
||||
--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
|
||||
+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
|
||||
|
||||
Reference in New Issue
Block a user