diff --git a/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java b/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java index 7a731156ef0..85fc4bca0be 100644 --- a/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java +++ b/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java @@ -8,7 +8,7 @@ package org.chromium.chrome.browser.compositor.layouts; import android.content.Context; import android.view.ViewGroup; -import org.chromium.base.supplier.MonotonicObservableSupplier; +import org.chromium.base.supplier.NonNullObservableSupplier; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.layouts.LayoutManager; import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; @@ -29,7 +29,7 @@ public class BraveToolbarSwipeLayout extends ToolbarSwipeLayout { BrowserControlsStateProvider browserControlsStateProvider, LayoutManager layoutManager, TopUiThemeColorProvider topUiColorProvider, - MonotonicObservableSupplier bottomControlsOffsetSupplier, + NonNullObservableSupplier bottomControlsOffsetSupplier, ViewGroup contentContainer) { super( context, diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java index 0645c6cad9f..dd02241f0a6 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java @@ -16,7 +16,7 @@ import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.supplier.MonotonicObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; -import org.chromium.base.supplier.SettableMonotonicObservableSupplier; +import org.chromium.base.supplier.SettableNonNullObservableSupplier; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -79,7 +79,7 @@ public class BraveLocationBarMediator extends LocationBarMediator { MonotonicObservableSupplier tabModelSelectorSupplier, @Nullable BrowserControlsStateProvider browserControlsStateProvider, Supplier<@Nullable ModalDialogManager> modalDialogManagerSupplier, - SettableMonotonicObservableSupplier<@AutocompleteRequestType Integer> + SettableNonNullObservableSupplier<@AutocompleteRequestType Integer> autocompleteRequestTypeSupplier, @Nullable PageZoomIndicatorCoordinator pageZoomIndicatorCoordinator, FuseboxCoordinator fuseboxCoordinator, diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java index b6c363a5b40..12356cae77a 100644 --- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -15,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.Callback; import org.chromium.base.supplier.MonotonicObservableSupplier; +import org.chromium.base.supplier.NonNullObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.OneshotSupplierImpl; import org.chromium.base.supplier.SettableMonotonicObservableSupplier; @@ -123,7 +124,7 @@ public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator { @Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState, @Nullable MultiInstanceManager multiInstanceManager, - @NonNull MonotonicObservableSupplier overviewColorSupplier, + @NonNull NonNullObservableSupplier overviewColorSupplier, @NonNull MonotonicObservableSupplier manualFillingComponentSupplier, diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 7ca496d8d92..cd7c1c89d34 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -452,7 +452,7 @@ public class BraveToolbarManager extends ToolbarManager @Nullable OnClickListener bookmarkClickHandler, @Nullable OnClickListener customTabsBackClickHandler, @Nullable NonNullObservableSupplier archivedTabCountSupplier, - MonotonicObservableSupplier tabModelNotificationDotSupplier, + NonNullObservableSupplier tabModelNotificationDotSupplier, @Nullable UndoBarThrottle undoBarThrottle) { super.initializeWithNative( diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java index 0c7775900dd..84210e366c3 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java @@ -14,6 +14,7 @@ import androidx.annotation.Nullable; import org.chromium.base.Callback; import org.chromium.base.supplier.MonotonicObservableSupplier; +import org.chromium.base.supplier.NonNullObservableSupplier; import org.chromium.base.supplier.NullableObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.OneshotSupplier; @@ -77,7 +78,7 @@ public class BraveBottomControlsCoordinator extends BottomControlsCoordinator { ScrollingBottomViewResourceFrameLayout root, OneshotSupplier contentDelegateSupplier, TabObscuringHandler tabObscuringHandler, - MonotonicObservableSupplier overlayPanelVisibilitySupplier, + NonNullObservableSupplier overlayPanelVisibilitySupplier, NullableObservableSupplier<@BrowserControlsState Integer> constraintsSupplier, Supplier readAloudRestoringSupplier) { super( diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 8eec360d467..9b66945cdec 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -13,6 +13,7 @@ import androidx.annotation.ColorInt; import org.chromium.base.BraveReflectionUtil; import org.chromium.base.supplier.MonotonicObservableSupplier; +import org.chromium.base.supplier.NonNullObservableSupplier; import org.chromium.base.supplier.NullableObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.Nullable; @@ -73,13 +74,13 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { MonotonicObservableSupplier appMenuButtonHelperSupplier, @Nullable ToggleTabStackButtonCoordinator tabSwitcherButtonCoordinator, MonotonicObservableSupplier tabCountSupplier, - MonotonicObservableSupplier homepageEnabledSupplier, - MonotonicObservableSupplier homepageNonNtpSupplier, + NonNullObservableSupplier homepageEnabledSupplier, + NonNullObservableSupplier homepageNonNtpSupplier, Supplier resourceManagerSupplier, HistoryDelegate historyDelegate, boolean initializeWithIncognitoColors, NullableObservableSupplier<@BrowserControlsState Integer> constraintsSupplier, - MonotonicObservableSupplier compositorInMotionSupplier, + NonNullObservableSupplier compositorInMotionSupplier, BrowserStateBrowserControlsVisibilityDelegate browserStateBrowserControlsVisibilityDelegate, FullscreenManager fullscreenManager, @@ -90,7 +91,7 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { @Nullable OnLongClickListener onLongClickListener, ToolbarProgressBar progressBar, NullableObservableSupplier tabSupplier, - MonotonicObservableSupplier toolbarNavControlsEnabledSupplier, + NonNullObservableSupplier toolbarNavControlsEnabledSupplier, @Nullable BackButtonCoordinator backButtonCoordinator, @Nullable ForwardButtonCoordinator forwardButtonCoordinator, @Nullable HomeButtonDisplay homeButtonDisplay, diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 4e3bc831868..6f4ce4b7446 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -1478,7 +1478,7 @@ public class BytecodeTest { TabObscuringHandler.class, int.class, int.class, - MonotonicObservableSupplier.class, + NonNullObservableSupplier.class, MonotonicObservableSupplier.class, Supplier.class)); Assert.assertTrue( @@ -1571,13 +1571,13 @@ public class BytecodeTest { MonotonicObservableSupplier.class, ToggleTabStackButtonCoordinator.class, MonotonicObservableSupplier.class, - MonotonicObservableSupplier.class, - MonotonicObservableSupplier.class, + NonNullObservableSupplier.class, + NonNullObservableSupplier.class, Supplier.class, HistoryDelegate.class, boolean.class, NullableObservableSupplier.class, - MonotonicObservableSupplier.class, + NonNullObservableSupplier.class, BrowserStateBrowserControlsVisibilityDelegate.class, FullscreenManager.class, TabObscuringHandler.class, @@ -1587,7 +1587,7 @@ public class BytecodeTest { OnLongClickListener.class, ToolbarProgressBar.class, NullableObservableSupplier.class, - MonotonicObservableSupplier.class, + NonNullObservableSupplier.class, BackButtonCoordinator.class, ForwardButtonCoordinator.class, HomeButtonDisplay.class, @@ -1783,7 +1783,7 @@ public class BytecodeTest { MonotonicObservableSupplier.class, BrowserControlsStateProvider.class, Supplier.class, - SettableMonotonicObservableSupplier.class, + SettableNonNullObservableSupplier.class, PageZoomIndicatorCoordinator.class, FuseboxCoordinator.class, MultiInstanceManager.class, @@ -1898,7 +1898,7 @@ public class BytecodeTest { Bundle.class, PersistableBundle.class, MultiInstanceManager.class, - MonotonicObservableSupplier.class, + NonNullObservableSupplier.class, MonotonicObservableSupplier.class, EdgeToEdgeManager.class, MonotonicObservableSupplier.class, @@ -2085,7 +2085,7 @@ public class BytecodeTest { BrowserControlsStateProvider.class, LayoutManager.class, TopUiThemeColorProvider.class, - MonotonicObservableSupplier.class, + NonNullObservableSupplier.class, ViewGroup.class)); Assert.assertTrue( constructorsMatch( diff --git a/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java index 8819d3fdee2..0d0da774806 100644 --- a/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java +++ b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser.toolbar.bottom; import org.chromium.base.supplier.MonotonicObservableSupplier; +import org.chromium.base.supplier.NonNullObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.chrome.browser.browser_controls.BottomControlsStacker; import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; @@ -39,7 +40,7 @@ class BraveBottomControlsMediator extends BottomControlsMediator { TabObscuringHandler tabObscuringHandler, int bottomControlsHeight, int bottomControlsShadowHeight, - MonotonicObservableSupplier overlayPanelVisibilitySupplier, + NonNullObservableSupplier overlayPanelVisibilitySupplier, MonotonicObservableSupplier edgeToEdgeControllerSupplier, Supplier readAloudRestoringSupplier) { super(