diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 8ffae6da..e4ac5687 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -14,7 +14,7 @@ Completely remove contacts picker permission from the file dialog .../browser/TabbedModeTabDelegateFactory.java | 5 +- .../browser/bookmarks/BookmarkActionBar.java | 12 + .../browser/bookmarks/BookmarkActivity.java | 30 ++ - .../browser/bookmarks/BookmarkBridge.java | 277 +++++++++++++++++ + .../browser/bookmarks/BookmarkBridge.java | 278 +++++++++++++++++ .../browser/bookmarks/BookmarkDelegate.java | 10 + .../browser/bookmarks/BookmarkManager.java | 22 ++ .../browser/bookmarks/BookmarkPage.java | 8 +- @@ -44,7 +44,7 @@ Completely remove contacts picker permission from the file dialog ui/shell_dialogs/select_file_dialog.h | 2 + .../select_file_dialog_android.cc | 6 + ui/shell_dialogs/select_file_dialog_android.h | 2 + - 38 files changed, 890 insertions(+), 29 deletions(-) + 38 files changed, 891 insertions(+), 29 deletions(-) diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc @@ -309,10 +309,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java -@@ -4,7 +4,19 @@ +@@ -4,7 +4,20 @@ package org.chromium.chrome.browser.bookmarks; ++import android.app.Activity; +import android.content.Intent; +import android.content.Context; +import android.content.pm.PackageManager; @@ -329,7 +330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import android.text.TextUtils; import android.util.Pair; -@@ -27,8 +39,33 @@ import org.chromium.components.url_formatter.UrlFormatter; +@@ -27,8 +40,33 @@ import org.chromium.components.url_formatter.UrlFormatter; import org.chromium.content_public.browser.WebContents; import org.chromium.url.GURL; @@ -363,7 +364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Provides the communication channel for Android to fetch and manipulate the -@@ -585,6 +622,210 @@ public class BookmarkBridge { +@@ -585,6 +623,210 @@ public class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType()); } @@ -515,14 +516,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + if (mDialogModel != null) return; + + // Actually show the dialog. -+ mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate( ++ mCustomView = (DownloadLocationCustomView) LayoutInflater.from(context).inflate( + R.layout.download_location_dialog, null); -+ mCustomView.initialize( -+ DownloadLocationDialogType.DEFAULT, new File(standardBoorkmarkName), -+ /*totalBytes*/ 0, context.getString(R.string.export_bookmarks_alert_title)); ++ mCustomView.initialize(DownloadLocationDialogType.DEFAULT, /*totalBytes*/ 0); ++ mCustomView.setTitle(context.getString(R.string.export_bookmarks_alert_title)); ++ mCustomView.setFileName(standardBoorkmarkName); + mCustomView.mDontShowAgain.setVisibility(View.GONE); + -+ Resources resources = mContext.getResources(); ++ Resources resources = context.getResources(); + mDialogModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) + .with(ModalDialogProperties.CONTROLLER, this) + .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) @@ -574,7 +575,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Synchronously gets a list of bookmarks that match the specified search query. * @param query Keyword used for searching bookmarks. -@@ -1021,6 +1262,39 @@ public class BookmarkBridge { +@@ -1021,6 +1263,39 @@ public class BookmarkBridge { depthList.add(depth); } @@ -614,7 +615,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static List> createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -1088,6 +1362,9 @@ public class BookmarkBridge { +@@ -1088,6 +1363,9 @@ public class BookmarkBridge { int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, List bookmarksList); diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 85b0967e..400acff4 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -3,28 +3,28 @@ Date: Thu, 18 Feb 2021 21:22:52 +0100 Subject: Add menu item to bookmark all tabs --- - chrome/android/java/res/menu/main_menu.xml | 7 ++ - .../chrome/browser/ChromeTabbedActivity.java | 26 +++++++ - .../browser/bookmarks/BookmarkBridge.java | 71 +++++++++++++++++-- + chrome/android/java/res/menu/main_menu.xml | 7 +++ + .../chrome/browser/ChromeTabbedActivity.java | 26 ++++++++ + .../browser/bookmarks/BookmarkBridge.java | 60 +++++++++++++++++++ .../browser/bookmarks/BookmarkUtils.java | 4 ++ - .../android/bookmarks/bookmark_bridge.cc | 17 +++++ + .../android/bookmarks/bookmark_bridge.cc | 17 ++++++ .../android/bookmarks/bookmark_bridge.h | 4 ++ .../browser/bookmarks/bookmark_html_writer.cc | 8 ++- .../bookmarks/chrome_bookmark_client.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- .../strings/android_chrome_strings.grd | 3 + components/bookmark_bar_strings.grdp | 6 ++ - .../bookmarks/browser/bookmark_codec.cc | 24 +++++-- - components/bookmarks/browser/bookmark_codec.h | 7 +- + .../bookmarks/browser/bookmark_codec.cc | 24 ++++++-- + components/bookmarks/browser/bookmark_codec.h | 7 ++- .../browser/bookmark_load_details.cc | 4 ++ .../bookmarks/browser/bookmark_load_details.h | 2 + .../bookmarks/browser/bookmark_model.cc | 3 +- - components/bookmarks/browser/bookmark_model.h | 7 ++ - components/bookmarks/browser/bookmark_node.cc | 15 ++++ + components/bookmarks/browser/bookmark_model.h | 7 +++ + components/bookmarks/browser/bookmark_node.cc | 15 +++++ components/bookmarks/browser/bookmark_node.h | 5 ++ components/bookmarks/browser/model_loader.cc | 3 +- .../bookmark_specifics_conversions.cc | 1 + - 21 files changed, 208 insertions(+), 15 deletions(-) + 21 files changed, 202 insertions(+), 10 deletions(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml @@ -103,15 +103,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java -@@ -4,6 +4,7 @@ - - package org.chromium.chrome.browser.bookmarks; - -+import android.app.Activity; - import android.content.Intent; - import android.content.Context; - import android.content.pm.PackageManager; -@@ -24,6 +25,7 @@ import androidx.annotation.Nullable; +@@ -25,6 +25,7 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import org.chromium.base.ContextUtils; @@ -119,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; import org.chromium.base.annotations.CalledByNative; -@@ -32,6 +34,10 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -33,6 +34,10 @@ import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; @@ -130,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkType; import org.chromium.components.url_formatter.SchemeDisplay; -@@ -72,6 +78,7 @@ import java.io.File; +@@ -73,6 +78,7 @@ import java.io.File; * bookmark model stored in native. */ public class BookmarkBridge { @@ -138,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private final Profile mProfile; private boolean mIsDoingExtensiveChanges; private long mNativeBookmarkBridge; -@@ -553,6 +560,16 @@ public class BookmarkBridge { +@@ -554,6 +560,16 @@ public class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this); } @@ -155,27 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @return Id representing the special "other" folder from bookmark model. */ -@@ -770,14 +787,14 @@ public class BookmarkBridge { - if (mDialogModel != null) return; - - // Actually show the dialog. -- mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate( -+ mCustomView = (DownloadLocationCustomView) LayoutInflater.from(context).inflate( - R.layout.download_location_dialog, null); -- mCustomView.initialize( -- DownloadLocationDialogType.DEFAULT, new File(standardBoorkmarkName), -- /*totalBytes*/ 0, context.getString(R.string.export_bookmarks_alert_title)); -+ mCustomView.initialize(DownloadLocationDialogType.DEFAULT, /*totalBytes*/ 0); -+ mCustomView.setTitle(context.getString(R.string.export_bookmarks_alert_title)); -+ mCustomView.setFileName(standardBoorkmarkName); - mCustomView.mDontShowAgain.setVisibility(View.GONE); - -- Resources resources = mContext.getResources(); -+ Resources resources = context.getResources(); - mDialogModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) - .with(ModalDialogProperties.CONTROLLER, this) - .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) -@@ -1099,6 +1116,49 @@ public class BookmarkBridge { +@@ -1100,6 +1116,49 @@ public class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this, title, url); } @@ -225,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @param url The URL of the reading list item. * @return The reading list item with the URL, or null if no such reading list item. -@@ -1355,6 +1415,7 @@ public class BookmarkBridge { +@@ -1356,6 +1415,7 @@ public class BookmarkBridge { void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller, List folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);