81 lines
3.2 KiB
Diff
81 lines
3.2 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Thu, 19 Dec 2019 22:52:53 +0100
|
|
Subject: Disable feeds support by default
|
|
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|
---
|
|
chrome/browser/prefs/browser_prefs.cc | 4 ++--
|
|
components/feed/core/common/pref_names.cc | 13 +------------
|
|
components/feed/core/shared_prefs/pref_names.cc | 2 +-
|
|
components/feed/feed_feature_list.cc | 3 +++
|
|
4 files changed, 7 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
|
--- a/chrome/browser/prefs/browser_prefs.cc
|
|
+++ b/chrome/browser/prefs/browser_prefs.cc
|
|
@@ -1925,10 +1925,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
|
ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry);
|
|
#endif
|
|
|
|
-#if BUILDFLAG(ENABLE_FEED_V2)
|
|
+//#if BUILDFLAG(ENABLE_FEED_V2)
|
|
feed::prefs::RegisterFeedSharedProfilePrefs(registry);
|
|
feed::RegisterProfilePrefs(registry);
|
|
-#endif
|
|
+//#endif
|
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
cdm::MediaDrmStorageImpl::RegisterProfilePrefs(registry);
|
|
diff --git a/components/feed/core/common/pref_names.cc b/components/feed/core/common/pref_names.cc
|
|
--- a/components/feed/core/common/pref_names.cc
|
|
+++ b/components/feed/core/common/pref_names.cc
|
|
@@ -107,18 +107,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
|
}
|
|
|
|
void MigrateObsoleteProfilePrefsOct_2022(PrefService* prefs) {
|
|
- const base::Value* val =
|
|
- prefs->GetUserPrefValue(prefs::kExperimentsDeprecated);
|
|
- const base::Value::Dict* old = val ? val->GetIfDict() : nullptr;
|
|
- if (old) {
|
|
- base::Value::Dict dict;
|
|
- for (const auto kv : *old) {
|
|
- base::Value::List list;
|
|
- list.Append(kv.second.GetString());
|
|
- dict.Set(kv.first, std::move(list));
|
|
- }
|
|
- prefs->SetDict(feed::prefs::kExperimentsV2, std::move(dict));
|
|
- }
|
|
+ prefs->ClearPref(feed::prefs::kExperimentsV2);
|
|
prefs->ClearPref(prefs::kExperimentsDeprecated);
|
|
}
|
|
|
|
diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
|
|
--- a/components/feed/core/shared_prefs/pref_names.cc
|
|
+++ b/components/feed/core/shared_prefs/pref_names.cc
|
|
@@ -26,7 +26,7 @@ const char kEnableSnippetsByDse[] = "ntp_snippets_by_dse.enable";
|
|
void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {
|
|
registry->RegisterBooleanPref(kEnableSnippets, false);
|
|
registry->RegisterBooleanPref(kArticlesListVisible, false);
|
|
- registry->RegisterBooleanPref(kEnableSnippetsByDse, true);
|
|
+ registry->RegisterBooleanPref(kEnableSnippetsByDse, false);
|
|
}
|
|
|
|
} // namespace prefs
|
|
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
|
|
--- a/components/feed/feed_feature_list.cc
|
|
+++ b/components/feed/feed_feature_list.cc
|
|
@@ -151,9 +151,12 @@ BASE_FEATURE(kFeedContainment,
|
|
base::FEATURE_DISABLED_BY_DEFAULT);
|
|
|
|
bool IsWebFeedEnabledForLocale(const std::string& country) {
|
|
+ if ((true)) return false;
|
|
const std::vector<std::string> launched_countries = {"AU", "CA", "GB",
|
|
"NZ", "US", "ZA"};
|
|
return base::Contains(launched_countries, country);
|
|
}
|
|
|
|
+SET_CROMITE_FEATURE_DISABLED(kInterestFeedV2);
|
|
+
|
|
} // namespace feed
|
|
--
|