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/BUILD.gn | 9 +++++++++ chrome/browser/feed/android/web_feed_bridge.cc | 18 ++++++++++++++++++ chrome/browser/prefs/browser_prefs.cc | 10 +++++----- .../feed/core/shared_prefs/pref_names.cc | 2 +- components/feed/feed_feature_list.cc | 3 +++ 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2658,6 +2658,15 @@ static_library("browser") { ] } + if (is_android && !enable_feed_v2) { + sources += [ + "feed/feed_service_factory.cc", + "feed/feed_service_factory.h", + ] + deps += [ + "//components/feed:feature_list", + ] + } if (enable_feed_v2) { sources += [ "feed/feed_service_factory.cc", diff --git a/chrome/browser/feed/android/web_feed_bridge.cc b/chrome/browser/feed/android/web_feed_bridge.cc --- a/chrome/browser/feed/android/web_feed_bridge.cc +++ b/chrome/browser/feed/android/web_feed_bridge.cc @@ -24,6 +24,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "components/country_codes/country_codes.h" +#include "components/feed/buildflags.h" #include "components/feed/core/v2/config.h" #include "components/feed/core/v2/public/feed_service.h" #include "components/feed/core/v2/public/types.h" @@ -81,10 +82,14 @@ base::android::ScopedJavaLocalRef ToJavaWebFeedId( } WebFeedSubscriptions* GetSubscriptions() { +#if BUILDFLAG(ENABLE_FEED_V2) Profile* profile = ProfileManager::GetLastUsedProfile(); if (!profile) return nullptr; return GetSubscriptionsForProfile(profile); +#else + return nullptr; +#endif } FeedApi* GetStream() { @@ -220,10 +225,14 @@ static void JNI_WebFeedBridge_FollowWebFeed( return; } +#if BUILDFLAG(ENABLE_FEED_V2) FollowWebFeed( page_info.web_contents, static_cast(change_reason), std::move(callback)); +#else + std::move(callback).Run({}); +#endif } static jboolean JNI_WebFeedBridge_IsCormorantEnabledForLocale(JNIEnv* env) { @@ -264,11 +273,16 @@ static void JNI_WebFeedBridge_UnfollowWebFeed( auto callback = AdaptCallbackForJava( env, j_callback); + +#if BUILDFLAG(ENABLE_FEED_V2) UnfollowWebFeed( ToNativeWebFeedId(env, webFeedId), /*is_durable_request=*/is_durable, static_cast(change_reason), std::move(callback)); +#else + std::move(callback).Run({}); +#endif } static void JNI_WebFeedBridge_FindWebFeedInfoForPage( @@ -280,6 +294,7 @@ static void JNI_WebFeedBridge_FindWebFeedInfoForPage( AdaptCallbackForJava(env, j_callback); PageInformation page_info = ToNativePageInformation(env, pageInfo); +#if BUILDFLAG(ENABLE_FEED_V2) // Make sure web_contents is not NULL since the user might navigate away from // the current tab that is requested to find info. if (!page_info.web_contents) { @@ -290,6 +305,9 @@ static void JNI_WebFeedBridge_FindWebFeedInfoForPage( page_info.web_contents, static_cast(reason), std::move(callback)); +#else + std::move(callback).Run({}); +#endif } static void JNI_WebFeedBridge_FindWebFeedInfoForWebFeedId( 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 @@ -251,11 +251,11 @@ #endif #include "components/feed/buildflags.h" -#if BUILDFLAG(ENABLE_FEED_V2) +//#if BUILDFLAG(ENABLE_FEED_V2) #include "components/feed/core/common/pref_names.h" // nogncheck #include "components/feed/core/shared_prefs/pref_names.h" // nogncheck #include "components/feed/core/v2/ios_shared_prefs.h" // nogncheck -#endif +//#endif #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h" @@ -1898,10 +1898,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); @@ -2688,7 +2688,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, syncer::SyncPrefs::MaybeMigrateAutofillToPerAccountPref(profile_prefs); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_FEED_V2) // Added 06/2024 feed::prefs::MigrateObsoleteFeedExperimentPref_Jun_2024(profile_prefs); #endif // BUILDFLAG(IS_ANDROID) 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 @@ -150,4 +150,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) { !base::FeatureList::IsEnabled(kWebFeedKillSwitch); } +SET_CROMITE_FEATURE_DISABLED(kInterestFeedV2); +SET_CROMITE_FEATURE_ENABLED(kWebFeedKillSwitch); + } // namespace feed --