[cr146][Android] Changes at BookmarkPage/BookmarkManagerCoordinator.ctor
Chromium change: https://source.chromium.org/chromium/chromium/src/+/c2f221f1660fc2df9907093e4db32a6d63879a80 [Android][Signin] Migrate Bookmarks promo to the new sign-in API This change migrates the Bookmarks promo to the new sign-in flow API. To enable the new API, dependencies such as WindowAndroid, BottomSheetController, and ActivityResultTracker are now passed to BookmarkManagerCoordinator. These dependencies are threaded through BookmarkPane, BookmarkPage, and BookmarkActivity. A significant part of the change involves setting up the necessary components for the bottom sheet UI (like ScrimManager and BottomSheetController) within BookmarkActivity, which previously lacked them as it inherits from SynchronousInitializationActivity. Preview: we do have Privacy approval to NOT show the snackbar if the user navigates away from the UI. Known issue: the status bar color is not yet correct. Bug: 437039516 Change-Id: I5463875270a508ff1c9a44a60e74558c9874c989 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7414706
This commit is contained in:
+13
-3
@@ -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<BottomSheetController> bottomSheetControllerSupplier,
|
||||
ActivityResultTracker activityResultTracker,
|
||||
Profile profile,
|
||||
BookmarkUiPrefs bookmarkUiPrefs,
|
||||
BookmarkOpener bookmarkOpener,
|
||||
@@ -37,9 +44,12 @@ public class BraveBookmarkManagerCoordinator extends BookmarkManagerCoordinator
|
||||
@Nullable Function<View, EdgeToEdgePadAdjuster> edgeToEdgePadAdjusterGenerator,
|
||||
@Nullable BackPressManager backPressManager) {
|
||||
super(
|
||||
context,
|
||||
windowAndroid,
|
||||
activity,
|
||||
isDialogUi,
|
||||
snackbarManager,
|
||||
bottomSheetControllerSupplier,
|
||||
activityResultTracker,
|
||||
profile,
|
||||
bookmarkUiPrefs,
|
||||
bookmarkOpener,
|
||||
|
||||
@@ -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<BottomSheetController> 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) {
|
||||
|
||||
Reference in New Issue
Block a user