Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] BookmarkBridge replaced with BookmarkModel

Browse Source 
Chromium change:
https://github.com/chromium/chromium/commit/d1b2275870288ec533ec7cbf01dd51de4a31ba47

[Fixit][Bookmarks] Replacing BookmarkBridge with BookmarkModel except…
… for JNI mocks

Change-Id: I8e25d4a4b6d7e67982812fd4c623c480fae4150a
This commit is contained in:
Artem Samoilenko
2022-11-14 14:11:18 -05:00
committed by mkarolin
parent 961b4da53c
commit 0d667af5e1
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/apk_for_test.flags
+1 -1
View File
@@ -137,7 +137,7 @@
*** mActionModeController;
*** mLocationBarModel;
*** mToolbar;
*** mBookmarkBridgeSupplier;
*** mBookmarkModelSupplier;
*** mLayoutManager;
*** mOverlayPanelVisibilitySupplier;
*** mTabModelSelector;
android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
+4 -4
View File
@@ -51,7 +51,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate {
private Menu mMenu;
private AppMenuDelegate mAppMenuDelegate;
private ObservableSupplier<BookmarkModel> mBookmarkBridgeSupplier;
private ObservableSupplier<BookmarkModel> mBookmarkModelSupplier;
public BraveTabbedAppMenuPropertiesDelegate(Context context,
ActivityTabProvider activityTabProvider,
@@ -71,7 +71,7 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie
snackbarManager, incognitoReauthControllerOneshotSupplier);
mAppMenuDelegate = appMenuDelegate;
mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
mBookmarkModelSupplier = bookmarkBridgeSupplier;
}
@Override
@@ -191,7 +191,7 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie
@Override
public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
// If it's still null, just hide the whole view
if (mBookmarkBridgeSupplier.get() == null) {
if (mBookmarkModelSupplier.get() == null) {
if (view != null) {
view.setVisibility(View.GONE);
}
@@ -203,7 +203,7 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie
if (view instanceof AppMenuIconRowFooter) {
((AppMenuIconRowFooter) view)
.initialize(appMenuHandler, mBookmarkBridgeSupplier.get(),
.initialize(appMenuHandler, mBookmarkModelSupplier.get(),
mActivityTabProvider.get(), mAppMenuDelegate);
}
android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
+2 -2
View File
@@ -102,7 +102,7 @@ public class BraveToolbarManager extends ToolbarManager {
private ActionModeController mActionModeController;
private LocationBarModel mLocationBarModel;
private TopToolbarCoordinator mToolbar;
private ObservableSupplier<BookmarkModel> mBookmarkBridgeSupplier;
private ObservableSupplier<BookmarkModel> mBookmarkModelSupplier;
private LayoutManagerImpl mLayoutManager;
private ObservableSupplierImpl<Boolean> mOverlayPanelVisibilitySupplier;
private TabModelSelector mTabModelSelector;
@@ -328,7 +328,7 @@ public class BraveToolbarManager extends ToolbarManager {
protected void updateBookmarkButtonStatus() {
Tab currentTab = mLocationBarModel.getTab();
BookmarkModel bridge = mBookmarkBridgeSupplier.get();
BookmarkModel bridge = mBookmarkModelSupplier.get();
boolean isBookmarked =
currentTab != null && bridge != null && bridge.hasBookmarkIdForTab(currentTab);
boolean editingAllowed =