From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 19 Dec 2019 22:52:53 +0100 Subject: Disable feeds support by default --- .../chromium/chrome/browser/feed/shared/FeedFeatures.java | 8 +------- .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +- components/feed/feed_feature_list.cc | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java @@ -35,13 +35,7 @@ public final class FeedFeatures { * the user is signed in and confirms it's not a child profile. */ public static boolean isWebFeedUIEnabled() { - // TODO(b/197354832, b/188188861): change consent check to SIGNIN. - return ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED) - && IdentityServicesProvider.get() - .getSigninManager(Profile.getLastUsedRegularProfile()) - .getIdentityManager() - .hasPrimaryAccount(ConsentLevel.SYNC) - && !Profile.getLastUsedRegularProfile().isChild(); + return false; } /** diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java @@ -77,7 +77,7 @@ public class CachedFeatureFlags { .put(ChromeFeatureList.TAB_TO_GTS_ANIMATION, true) .put(ChromeFeatureList.TEST_DEFAULT_DISABLED, false) .put(ChromeFeatureList.TEST_DEFAULT_ENABLED, true) - .put(ChromeFeatureList.INTEREST_FEED_V2, true) + .put(ChromeFeatureList.INTEREST_FEED_V2, false) .put(ChromeFeatureList.THEME_REFACTOR_ANDROID, false) .put(ChromeFeatureList.USE_CHIME_ANDROID_SDK, false) .put(ChromeFeatureList.CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY, false) 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 @@ -12,12 +12,12 @@ namespace feed { const base::Feature kInterestFeedContentSuggestions{ - "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; + "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; // InterestFeedV2 takes precedence over InterestFeedContentSuggestions. // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is // changed, please update the cached one's default value in CachedFeatureFlags. const base::Feature kInterestFeedV2{"InterestFeedV2", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay", base::FEATURE_DISABLED_BY_DEFAULT}; -- 2.17.1