74 lines
3.0 KiB
Diff
74 lines
3.0 KiB
Diff
|
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||
|
|
Date: Sun, 31 Jul 2022 22:13:11 +0200
|
||
|
|
Subject: Disable PrivacyGuide
|
||
|
|
|
||
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||
|
|
---
|
||
|
|
.../browser/ui/webui/settings/settings_ui.cc | 2 +-
|
||
|
|
chrome/common/chrome_features.cc | 20 +++++++++----------
|
||
|
|
2 files changed, 11 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
|
||
|
|
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
|
||
|
|
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
|
||
|
|
@@ -331,7 +331,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
|
||
|
|
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
||
|
|
|
||
|
|
bool show_privacy_guide =
|
||
|
|
- !chrome::ShouldDisplayManagedUi(profile) && !profile->IsChild();
|
||
|
|
+ false;
|
||
|
|
html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
|
||
|
|
|
||
|
|
html_source->AddBoolean("enablePrivacyGuide3", base::FeatureList::IsEnabled(
|
||
|
|
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||
|
|
--- a/chrome/common/chrome_features.cc
|
||
|
|
+++ b/chrome/common/chrome_features.cc
|
||
|
|
@@ -475,26 +475,26 @@ BASE_FEATURE(kGeoLanguage, "GeoLanguage", base::FEATURE_DISABLED_BY_DEFAULT);
|
||
|
|
// Enables or disables the Privacy Guide v3 update of the Privacy Guide feature
|
||
|
|
// in Chrome Settings.
|
||
|
|
BASE_FEATURE(kPrivacyGuide3,
|
||
|
|
- "PrivacyGuide3",
|
||
|
|
- base::FEATURE_DISABLED_BY_DEFAULT);
|
||
|
|
+ "PrivacyGuide3", // always disabled
|
||
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
|
||
|
|
|
||
|
|
// Enables or disables the Privacy Guide preload card update of the Privacy
|
||
|
|
// Guide feature in Chrome Settings. Also, this requires the PrivacyGuide3
|
||
|
|
// feature to be enabled as well.
|
||
|
|
BASE_FEATURE(kPrivacyGuidePreload,
|
||
|
|
- "PrivacyGuidePreload",
|
||
|
|
- base::FEATURE_DISABLED_BY_DEFAULT);
|
||
|
|
+ "PrivacyGuidePreload", // always disabled
|
||
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
|
||
|
|
|
||
|
|
#if BUILDFLAG(IS_ANDROID)
|
||
|
|
BASE_FEATURE(kPrivacyGuideAndroid3,
|
||
|
|
- "PrivacyGuideAndroid3",
|
||
|
|
- base::FEATURE_DISABLED_BY_DEFAULT);
|
||
|
|
+ "PrivacyGuideAndroid3", // always disabled
|
||
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if BUILDFLAG(IS_ANDROID)
|
||
|
|
BASE_FEATURE(kPrivacyGuidePreloadAndroid,
|
||
|
|
- "PrivacyGuidePreloadAndroid",
|
||
|
|
- base::FEATURE_DISABLED_BY_DEFAULT);
|
||
|
|
+ "PrivacyGuidePreloadAndroid", // disabled
|
||
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT); // by default
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if !BUILDFLAG(IS_ANDROID)
|
||
|
|
@@ -1050,8 +1050,8 @@ BASE_FEATURE(kPrintPreviewSetupAssistance,
|
||
|
|
|
||
|
|
#if BUILDFLAG(IS_ANDROID)
|
||
|
|
BASE_FEATURE(kPrivacyGuideAndroid,
|
||
|
|
- "PrivacyGuideAndroid",
|
||
|
|
- base::FEATURE_ENABLED_BY_DEFAULT);
|
||
|
|
+ "PrivacyGuideAndroid", // disabled
|
||
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT); // by default
|
||
|
|
|
||
|
|
BASE_FEATURE(kPrivacyGuideAndroidPostMVP,
|
||
|
|
"PrivacyGuideAndroidPostMVP",
|
||
|
|
--
|
||
|
|
2.25.1
|