[Android] Adjustments for FeedSurfaceCoordinator code changes

Chromium change:
https://chromium.googlesource.com/chromium/src/+/c84e15f86da8a6f00920d4dd03087cc88b8970f5

More feed launch reliability logging

* Log the "feed reloading" start event
* Log a catch-all launch end event when the stream is unbound: more specific feed launch end conditions (user navigated away, switched tabs/apps, etc.) will be added in another CL
* Use no-op logger in public builds or if reliability logging is disabled

Bug: 1195940
This commit is contained in:
samartnik
2021-08-18 10:53:08 -04:00
committed by mkarolin
parent 0423fd8b95
commit e762e35637
5 changed files with 51 additions and 14 deletions
+17 -1
View File
@@ -321,4 +321,20 @@
-keep class org.chromium.chrome.browser.omnibox.status.BraveStatusMediator {
public <init>(...);
}
}
-keep class org.chromium.chrome.browser.feed.FeedSurfaceCoordinator {
*** mScrollViewForPolicy;
*** mNtpHeader;
*** mRootView;
*** isEnhancedProtectionPromoEnabled(...);
*** isReliabilityLoggingEnabled(...);
}
-keep class org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator {
*** mScrollViewForPolicy;
*** mNtpHeader;
*** mRootView;
*** isEnhancedProtectionPromoEnabled(...);
*** isReliabilityLoggingEnabled(...);
}
@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
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.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
@@ -37,7 +38,7 @@ public class BraveNewTabPage extends NewTabPage {
boolean isTablet, NewTabPageUma uma, boolean isInNightMode,
NativePageHost nativePageHost, Tab tab, String url,
BottomSheetController bottomSheetController,
ObservableSupplier<ShareDelegate> shareDelegateSupplier, WindowAndroid windowAndroid) {
Supplier<ShareDelegate> shareDelegateSupplier, WindowAndroid windowAndroid) {
super(activity, browserControlsStateProvider, activityTabProvider, snackbarManager,
lifecycleDispatcher, tabModelSelector, isTablet, uma, isInNightMode, nativePageHost,
tab, url, bottomSheetController, shareDelegateSupplier, windowAndroid);
@@ -52,8 +53,8 @@ public class BraveNewTabPage extends NewTabPage {
protected void initializeMainView(Activity activity, WindowAndroid windowAndroid,
SnackbarManager snackbarManager, NewTabPageUma uma, boolean isInNightMode,
BottomSheetController bottomSheetController,
ObservableSupplier<ShareDelegate> shareDelegateSupplier,
TabModelSelector tabModelSelector, String url) {
Supplier<ShareDelegate> shareDelegateSupplier, TabModelSelector tabModelSelector,
String url) {
super.initializeMainView(activity, windowAndroid, snackbarManager, uma, isInNightMode,
bottomSheetController, shareDelegateSupplier, tabModelSelector, url);
// Override surface provider
@@ -66,6 +67,8 @@ public class BraveNewTabPage extends NewTabPage {
mNewTabPageManager.getNavigationDelegate(), profile,
/* isPlaceholderShownInitially= */ false, bottomSheetController,
shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null,
tabModelSelector, NewTabPageUtils.decodeOriginFromNtpUrl(url));
tabModelSelector, NewTabPageUtils.decodeOriginFromNtpUrl(url),
PrivacyPreferencesManagerImpl.getInstance(),
/* FeedLaunchReliabilityLoggingState */ null);
}
}