[cr146][Android] Make MonotonicObservableSupplier inherit Supplier<@Nullable T>
Chromium change: https://source.chromium.org/chromium/chromium/src/+/a5aa1f364aa75ce92d3d05c64c7d929303c8dc5f Android: Make MonotonicObservableSupplier inherit Supplier<@Nullable T> And fix all warnings that come with it. Bug: 467389696 Cq-Include-Trybots: luci.chrome.try:android-internal-dbg,android-internal-binary-size Change-Id: I86becbc2f3c149941e3401fd726d7062a261bd7a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7533558
This commit is contained in:
+1
-1
@@ -48,7 +48,7 @@ public abstract class BraveTabSwitcherPaneBase extends TabSwitcherPaneBase {
|
||||
@Override
|
||||
public @NonNull HubLayoutAnimatorProvider createHideHubLayoutAnimatorProvider(
|
||||
@NonNull HubContainerView hubContainerView) {
|
||||
if (getTabSwitcherPaneCoordinatorSupplier().get() == null && getCurrentTab() != null) {
|
||||
if (getTabSwitcherPaneCoordinator() == null && getCurrentTab() != null) {
|
||||
// Force call TabSwitcherPaneBase.createTabSwitcherPaneCoordinator
|
||||
// to ensure TabSwitcherPaneBase.mTabSwitcherPaneCoordinatorSupplier is set
|
||||
super.createTabSwitcherPaneCoordinator();
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.fullscreen;
|
||||
|
||||
import android.app.Activity;
|
||||
|
||||
import org.chromium.base.supplier.MonotonicObservableSupplier;
|
||||
import org.chromium.base.supplier.NonNullObservableSupplier;
|
||||
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
|
||||
|
||||
public class BraveFullscreenHtmlApiHandlerCompat extends FullscreenHtmlApiHandlerCompat {
|
||||
@@ -23,7 +23,7 @@ public class BraveFullscreenHtmlApiHandlerCompat extends FullscreenHtmlApiHandle
|
||||
*/
|
||||
public BraveFullscreenHtmlApiHandlerCompat(
|
||||
Activity activity,
|
||||
MonotonicObservableSupplier<Boolean> areControlsHidden,
|
||||
NonNullObservableSupplier<Boolean> areControlsHidden,
|
||||
boolean exitFullscreenOnStop,
|
||||
MultiWindowModeStateDispatcher multiWindowDispatcher) {
|
||||
super(activity, areControlsHidden, exitFullscreenOnStop, multiWindowDispatcher);
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.fullscreen;
|
||||
|
||||
import android.app.Activity;
|
||||
|
||||
import org.chromium.base.supplier.MonotonicObservableSupplier;
|
||||
import org.chromium.base.supplier.NonNullObservableSupplier;
|
||||
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
|
||||
|
||||
public class BraveFullscreenHtmlApiHandlerLegacy extends FullscreenHtmlApiHandlerLegacy {
|
||||
@@ -23,7 +23,7 @@ public class BraveFullscreenHtmlApiHandlerLegacy extends FullscreenHtmlApiHandle
|
||||
*/
|
||||
public BraveFullscreenHtmlApiHandlerLegacy(
|
||||
Activity activity,
|
||||
MonotonicObservableSupplier<Boolean> areControlsHidden,
|
||||
NonNullObservableSupplier<Boolean> areControlsHidden,
|
||||
boolean exitFullscreenOnStop,
|
||||
MultiWindowModeStateDispatcher multiWindowDispatcher) {
|
||||
super(activity, areControlsHidden, exitFullscreenOnStop, multiWindowDispatcher);
|
||||
|
||||
+2
-3
@@ -13,6 +13,7 @@ import androidx.fragment.app.FragmentManager;
|
||||
import org.chromium.base.supplier.MonotonicObservableSupplier;
|
||||
import org.chromium.base.supplier.OneshotSupplier;
|
||||
import org.chromium.build.annotations.NullMarked;
|
||||
import org.chromium.build.annotations.Nullable;
|
||||
import org.chromium.chrome.browser.password_entry_edit.CredentialEditUiFactory;
|
||||
import org.chromium.chrome.browser.password_entry_edit.CredentialEntryFragmentViewBase;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
@@ -21,8 +22,6 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
|
||||
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
|
||||
import org.chromium.ui.modaldialog.ModalDialogManager;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@NullMarked
|
||||
public class BraveFragmentDependencyProvider extends FragmentDependencyProvider {
|
||||
private final Profile mProfile;
|
||||
@@ -33,7 +32,7 @@ public class BraveFragmentDependencyProvider extends FragmentDependencyProvider
|
||||
OneshotSupplier<SnackbarManager> snackbarManagerSupplier,
|
||||
OneshotSupplier<BottomSheetController> bottomSheetControllerSupplier,
|
||||
MonotonicObservableSupplier<ModalDialogManager> modalDialogManagerSupplier,
|
||||
Supplier<SettingsSearchCoordinator> searchCoordinator) {
|
||||
@Nullable SettingsSearchCoordinator searchCoordinator) {
|
||||
super(
|
||||
context,
|
||||
profile,
|
||||
|
||||
+2
-1
@@ -11,6 +11,7 @@ import android.graphics.Color;
|
||||
import androidx.annotation.ColorInt;
|
||||
|
||||
import org.chromium.base.supplier.MonotonicObservableSupplier;
|
||||
import org.chromium.base.supplier.NonNullObservableSupplier;
|
||||
import org.chromium.build.annotations.NullMarked;
|
||||
import org.chromium.build.annotations.Nullable;
|
||||
import org.chromium.chrome.browser.ActivityTabProvider;
|
||||
@@ -37,7 +38,7 @@ public class BraveStatusBarColorController extends StatusBarColorController {
|
||||
TopUiThemeColorProvider topUiThemeColorProvider,
|
||||
EdgeToEdgeSystemBarColorHelper edgeToEdgeSystemBarColorHelper,
|
||||
@Nullable DesktopWindowStateManager desktopWindowStateManager,
|
||||
MonotonicObservableSupplier<Integer> overviewColorSupplier) {
|
||||
NonNullObservableSupplier<Integer> overviewColorSupplier) {
|
||||
super(
|
||||
activity,
|
||||
isTablet,
|
||||
|
||||
@@ -121,6 +121,7 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerHelper;
|
||||
import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.profiles.ProfileKeyedMap;
|
||||
import org.chromium.chrome.browser.settings.search.SettingsSearchCoordinator;
|
||||
import org.chromium.chrome.browser.share.ShareDelegate;
|
||||
import org.chromium.chrome.browser.share.ShareDelegateImpl;
|
||||
import org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesLayout;
|
||||
@@ -2038,7 +2039,7 @@ public class BytecodeTest {
|
||||
OneshotSupplier.class,
|
||||
OneshotSupplier.class,
|
||||
MonotonicObservableSupplier.class,
|
||||
Supplier.class));
|
||||
SettingsSearchCoordinator.class));
|
||||
Assert.assertTrue(
|
||||
constructorsMatch(
|
||||
"org/chromium/chrome/browser/firstrun/FreIntentCreator",
|
||||
@@ -2145,7 +2146,7 @@ public class BytecodeTest {
|
||||
TopUiThemeColorProvider.class,
|
||||
EdgeToEdgeSystemBarColorHelper.class,
|
||||
DesktopWindowStateManager.class,
|
||||
MonotonicObservableSupplier.class));
|
||||
NonNullObservableSupplier.class));
|
||||
Assert.assertTrue(
|
||||
constructorsMatch(
|
||||
"org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment", // presubmit: ignore-long-line
|
||||
@@ -2189,7 +2190,7 @@ public class BytecodeTest {
|
||||
"org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerCompat",
|
||||
"org/chromium/chrome/browser/fullscreen/BraveFullscreenHtmlApiHandlerCompat", // presubmit: ignore-long-line
|
||||
Activity.class,
|
||||
MonotonicObservableSupplier.class,
|
||||
NonNullObservableSupplier.class,
|
||||
boolean.class,
|
||||
MultiWindowModeStateDispatcher.class));
|
||||
Assert.assertTrue(
|
||||
@@ -2197,7 +2198,7 @@ public class BytecodeTest {
|
||||
"org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerLegacy",
|
||||
"org/chromium/chrome/browser/fullscreen/BraveFullscreenHtmlApiHandlerLegacy", // presubmit: ignore-long-line
|
||||
Activity.class,
|
||||
MonotonicObservableSupplier.class,
|
||||
NonNullObservableSupplier.class,
|
||||
boolean.class,
|
||||
MultiWindowModeStateDispatcher.class));
|
||||
Assert.assertTrue(
|
||||
|
||||
Reference in New Issue
Block a user