diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java index 6d15c4f5af5..0316f92620f 100644 --- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java +++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java @@ -5,7 +5,7 @@ package org.chromium.chrome.browser.bookmarks; -import android.content.Context; +import android.app.Activity; import android.view.View; import androidx.annotation.Nullable; @@ -15,10 +15,14 @@ import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; +import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; +import org.chromium.ui.base.ActivityResultTracker; import org.chromium.ui.base.ActivityWindowAndroid; +import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.edge_to_edge.EdgeToEdgePadAdjuster; import java.util.function.Function; +import java.util.function.Supplier; @NullMarked public class BraveBookmarkManagerCoordinator extends BookmarkManagerCoordinator { @@ -26,9 +30,12 @@ public class BraveBookmarkManagerCoordinator extends BookmarkManagerCoordinator private @Nullable BookmarkManagerMediator mMediator; public BraveBookmarkManagerCoordinator( - Context context, + WindowAndroid windowAndroid, + Activity activity, boolean isDialogUi, SnackbarManager snackbarManager, + Supplier bottomSheetControllerSupplier, + ActivityResultTracker activityResultTracker, Profile profile, BookmarkUiPrefs bookmarkUiPrefs, BookmarkOpener bookmarkOpener, @@ -37,9 +44,12 @@ public class BraveBookmarkManagerCoordinator extends BookmarkManagerCoordinator @Nullable Function edgeToEdgePadAdjusterGenerator, @Nullable BackPressManager backPressManager) { super( - context, + windowAndroid, + activity, isDialogUi, snackbarManager, + bottomSheetControllerSupplier, + activityResultTracker, profile, bookmarkUiPrefs, bookmarkOpener, diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java index b9702b942a8..0df302fbd0e 100644 --- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java +++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java @@ -5,28 +5,45 @@ package org.chromium.chrome.browser.bookmarks; +import android.app.Activity; import android.content.ComponentName; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - +import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.native_page.NativePageHost; +import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; +import org.chromium.ui.base.ActivityResultTracker; +import org.chromium.ui.base.WindowAndroid; + +import java.util.function.Supplier; public class BraveBookmarkPage extends BookmarkPage { // Overridden Chromium's BookmarkPage.mManager private BookmarkManagerCoordinator mBookmarkManagerCoordinator; public BraveBookmarkPage( - @NonNull SnackbarManager snackbarManager, - @NonNull Profile profile, - @NonNull NativePageHost host, + WindowAndroid windowAndroid, + Activity activity, + SnackbarManager snackbarManager, + Supplier bottomSheetControllerSupplier, + ActivityResultTracker activityResultTracker, + Profile profile, + NativePageHost host, @Nullable ComponentName componentName, BackPressManager backPressManager) { - super(snackbarManager, profile, host, componentName, backPressManager); + super( + windowAndroid, + activity, + snackbarManager, + bottomSheetControllerSupplier, + activityResultTracker, + profile, + host, + componentName, + backPressManager); if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator && BraveActivity.getChromeTabbedActivity() != null) { diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 6285db6d966..1c49bb71b1c 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -1935,9 +1935,12 @@ public class BytecodeTest { constructorsMatch( "org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator", "org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator", - Context.class, + WindowAndroid.class, + Activity.class, boolean.class, SnackbarManager.class, + Supplier.class, + ActivityResultTracker.class, Profile.class, BookmarkUiPrefs.class, BookmarkOpener.class, @@ -1989,7 +1992,11 @@ public class BytecodeTest { constructorsMatch( "org/chromium/chrome/browser/bookmarks/BookmarkPage", "org/chromium/chrome/browser/bookmarks/BraveBookmarkPage", + WindowAndroid.class, + Activity.class, SnackbarManager.class, + Supplier.class, + ActivityResultTracker.class, Profile.class, NativePageHost.class, ComponentName.class,