From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 19 Dec 2019 22:52:53 +0100 Subject: Allow building without feed support --- .../start_surface/StartSurfaceCoordinator.java | 5 ----- .../start_surface/StartSurfaceMediator.java | 17 ----------------- chrome/android/feed/feed_java_sources.gni | 2 -- .../browser/native_page/NativePageFactory.java | 7 ------- components/feed/feed_feature_list.cc | 2 +- 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java +++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java @@ -214,11 +214,6 @@ public class StartSurfaceCoordinator implements StartSurface { mBottomBarCoordinator = new BottomBarCoordinator( mActivity, mActivity.getCompositorViewHolder(), mPropertyModel); } - - mExploreSurfaceCoordinator = new ExploreSurfaceCoordinator(mActivity, - mSurfaceMode == SurfaceMode.SINGLE_PANE ? mTasksSurface.getBodyViewContainer() - : mActivity.getCompositorViewHolder(), - mPropertyModel, mSurfaceMode == SurfaceMode.SINGLE_PANE); } private TabSwitcher.Controller initializeSecondaryTasksSurface() { diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java +++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java @@ -415,15 +415,6 @@ class StartSurfaceMediator assert (isShownState(shownState)); setOverviewState(shownState); - // Make sure FeedSurfaceCoordinator is built before the explore surface is showing by - // default. - if (mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE) - && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null - && !mActivityStateChecker.isFinishingOrDestroyed()) { - mPropertyModel.set(FEED_SURFACE_COORDINATOR, - mFeedSurfaceCreator.createFeedSurfaceCoordinator( - mNightModeStateProvider.isInNightMode())); - } mTabModelSelector.addObserver(mTabModelSelectorObserver); if (mFullScreenListener != null) { @@ -536,14 +527,6 @@ class StartSurfaceMediator private void setExploreSurfaceVisibility(boolean isVisible) { if (isVisible == mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)) return; - if (isVisible && mPropertyModel.get(IS_SHOWING_OVERVIEW) - && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null - && !mActivityStateChecker.isFinishingOrDestroyed()) { - mPropertyModel.set(FEED_SURFACE_COORDINATOR, - mFeedSurfaceCreator.createFeedSurfaceCoordinator( - mNightModeStateProvider.isInNightMode())); - } - mPropertyModel.set(IS_EXPLORE_SURFACE_VISIBLE, isVisible); if (mOverviewModeState == OverviewModeState.SHOWN_TABSWITCHER_TWO_PANES) { diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni --- a/chrome/android/feed/feed_java_sources.gni +++ b/chrome/android/feed/feed_java_sources.gni @@ -35,7 +35,6 @@ if (enable_feed_in_chrome) { "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLifecycleBridge.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLoggingBridge.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNetworkBridge.java", - "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineBridge.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineIndicator.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java", @@ -736,7 +735,6 @@ if (enable_feed_in_chrome) { feed_deps = [] feed_java_sources = [ "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedAppLifecycle.java", - "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java", "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java", "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedRefreshTask.java", "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java", diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java @@ -17,7 +17,6 @@ import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.bookmarks.BookmarkPage; import org.chromium.chrome.browser.download.DownloadPage; import org.chromium.chrome.browser.explore_sites.ExploreSitesPage; -import org.chromium.chrome.browser.feed.FeedNewTabPage; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager; import org.chromium.chrome.browser.history.HistoryPage; @@ -57,12 +56,6 @@ public class NativePageFactory { activity, new TabShim(tab, activity.getFullscreenManager())); } - if (ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)) { - return new FeedNewTabPage(activity, - new TabShim(tab, activity.getFullscreenManager()), tabModelSelector, - activityTabProvider, activityLifecycleDispatcher, (TabImpl) tab); - } - return new NewTabPage(activity, new TabShim(tab, activity.getFullscreenManager()), tabModelSelector, activityTabProvider, activityLifecycleDispatcher, (TabImpl) tab); 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 @@ -7,7 +7,7 @@ namespace feed { const base::Feature kInterestFeedContentSuggestions{ - "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; + "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; const base::FeatureParam kDisableTriggerTypes{ &kInterestFeedContentSuggestions, "disable_trigger_types", ""}; -- 2.17.1