From a47ef100fe497eb7bf06b3cb738cd5ce0409130e Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Fri, 30 Jan 2026 01:14:57 +0200 Subject: [PATCH] [cr146][Android] Convert ObservableSupplierImpl usages in omnibox This is commit for changes required by ToolbarManager.mOverlayPanelVisibilitySupplier type change from ObservableSupplierImpl to SettableNonNullObservableSupplier Chromium change: https://source.chromium.org/chromium/chromium/src/+/9dc3f0d9c6752101cdbec7685dc8df9231333a73 Android: Convert ObservableSupplierImpl usages in omnibox Bug: 467389696 Change-Id: Ie664088a70e547ab0d19e518019911ee35c9c7cf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7511143 --- .../chromium/chrome/browser/toolbar/BraveToolbarManager.java | 4 ++-- .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 40389276983..844fa08a4d7 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -21,9 +21,9 @@ import org.chromium.base.ContextUtils; 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; import org.chromium.base.supplier.SettableMonotonicObservableSupplier; +import org.chromium.base.supplier.SettableNonNullObservableSupplier; import org.chromium.build.annotations.Nullable; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; @@ -128,7 +128,7 @@ public class BraveToolbarManager extends ToolbarManager private TopToolbarCoordinator mToolbar; private NullableObservableSupplier mBookmarkModelSupplier; private LayoutManagerImpl mLayoutManager; - private ObservableSupplierImpl mOverlayPanelVisibilitySupplier; + private SettableNonNullObservableSupplier mOverlayPanelVisibilitySupplier; private TabModelSelector mTabModelSelector; private IncognitoStateProvider mIncognitoStateProvider; private BottomSheetController mBottomSheetController; diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 0cd65912f28..44833847067 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -2365,7 +2365,9 @@ public class BytecodeTest { Assert.assertTrue( fieldExists( "org/chromium/chrome/browser/toolbar/ToolbarManager", - "mOverlayPanelVisibilitySupplier")); + "mOverlayPanelVisibilitySupplier", + true, + SettableNonNullObservableSupplier.class)); Assert.assertTrue( fieldExists( "org/chromium/chrome/browser/toolbar/ToolbarManager", "mTabModelSelector"));