Skip to content

Commit

Permalink
[Android] Changes in FeedSurfaceCoordinator
Browse files Browse the repository at this point in the history
Chromium change:
https://chromium.googlesource.com/chromium/src/+/e274ab4bfbb68201b4c2cf36e8b7c0cf29981c17

Add enable_feed_v1 compile flag

And restructure feed code so that we can use it.

This flag pulls Feed v1 out of the build.
It's a bit different that enable_feed_v2. enable_feed_v2
retains most of the v2 code in chromium -- only the internal
code is actually removed when enable_feed_v2 is off.
If both flags are ON (the default), we use the InterestFeedV2
feature to select which version to use. To facilitate this,
only feed_feature_list.cc and FeedFeatures.java should inspect
the state of this feature directly.

If both build flags are OFF, we use the V2 UI classes as
essentially a pass-through to a recycler view, but will
not request any Feed content.

The compile flag enable_feed_in_chrome was removed.

Other changes:
* I've moved some files around to make it more clear what code
  is for v1 only.
* I've added FeedV1 and FeedV2 java classes to wrap access to
  version specific things, so that FeedV1 can be removed using
  the compile flag.

Bug: 1129187
  • Loading branch information
samartnik committed Oct 9, 2020
1 parent 53cd583 commit 1deb9a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feed.action.FeedActionHandler;
import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi;
import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate;
import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
Expand All @@ -37,13 +36,13 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
TabModelSelector tabModelSelector, Supplier<Tab> tabProvider,
@Nullable SnapScrollHelper snapScrollHelper, @Nullable View ntpHeader,
@Nullable SectionHeaderView sectionHeaderView, FeedActionHandler.Options actionOptions,
@Nullable SectionHeaderView sectionHeaderView, FeedV1ActionOptions actionOptions,
boolean showDarkBackground, FeedSurfaceDelegate delegate,
@Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile,
boolean isPlaceholderShown, BottomSheetController bottomSheetController) {
boolean isPlaceholderRequested, BottomSheetController bottomSheetController) {
super(activity, snackbarManager, tabModelSelector, tabProvider, snapScrollHelper, ntpHeader,
sectionHeaderView, actionOptions, showDarkBackground, delegate,
pageNavigationDelegate, profile, isPlaceholderShown, bottomSheetController);
pageNavigationDelegate, profile, isPlaceholderRequested, bottomSheetController);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
import org.chromium.chrome.browser.feed.FeedProcessScopeFactory;
import org.chromium.chrome.browser.feed.shared.FeedFeatures;
import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.profiles.Profile;
Expand Down Expand Up @@ -52,7 +52,7 @@ protected void initializeMainView(Activity activity, Supplier<Tab> tabProvider,
// Override surface provider
Profile profile = Profile.fromWebContents(mTab.getWebContents());

assert !FeedProcessScopeFactory.isFeedProcessEnabled();
assert !FeedFeatures.isFeedEnabled();
mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
tabModelSelector, tabProvider,
new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout,
Expand Down

0 comments on commit 1deb9a2

Please sign in to comment.