PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Add bookmark import/export actions: fix incorrect fixup

Browse Source
This commit is contained in:
Carmelo Messina
2025-04-02 10:16:54 +02:00
parent c06afe999e
commit 116fb9fc37
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Add-bookmark-import-export-actions.patch
+5 -6
View File
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../bookmarks/BookmarkManagerCoordinator.java | 9 +
.../bookmarks/BookmarkManagerMediator.java | 283 ++++++++++++++++++
.../browser/bookmarks/BookmarkPage.java | 9 +-
.../browser/bookmarks/BookmarkToolbar.java | 28 ++
.../browser/bookmarks/BookmarkToolbar.java | 27 ++
.../bookmarks/BookmarkToolbarMediator.java | 4 +
.../bookmarks/BookmarkToolbarProperties.java | 8 +-
.../bookmarks/BookmarkToolbarViewBinder.java | 6 +
@@ -52,7 +52,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
ui/shell_dialogs/select_file_dialog_linux.cc | 4 +
ui/shell_dialogs/select_file_dialog_linux.h | 2 +
ui/shell_dialogs/select_file_dialog_win.cc | 5 +
41 files changed, 901 insertions(+), 29 deletions(-)
41 files changed, 900 insertions(+), 29 deletions(-)
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -1157,7 +1157,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
void setEditButtonVisible(boolean visible) {
mEditButtonVisible = visible;
getMenu().findItem(R.id.edit_menu_id).setVisible(visible);
@@ -172,6 +183,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -172,6 +183,12 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
void setCurrentFolder(BookmarkId folder) {
mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
@@ -1167,11 +1167,10 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
+ void enableImportExportMenu() {
+ getMenu().findItem(R.id.import_menu_id).setVisible(true);
+ getMenu().findItem(R.id.export_menu_id).setVisible(true);
+ }
}
void setNavigateBackRunnable(Runnable navigateBackRunnable) {
@@ -191,6 +209,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -191,6 +208,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@Override
public boolean onMenuItemClick(MenuItem menuItem) {
hideOverflowMenu();
@@ -1185,7 +1184,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
return mMenuIdClickedFunction.apply(menuItem.getItemId());
}
@@ -206,6 +231,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -206,6 +230,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
protected void showNormalView() {
super.showNormalView();
build/patches/Bookmarks-select-all-menu-entry.patch
+2 -2
View File
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
}
void enableImportExportMenu() {
@@ -216,6 +222,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -215,6 +221,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
mExportBookmarkRunnable.run();
return true;
}
@@ -69,7 +69,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
return mMenuIdClickedFunction.apply(menuItem.getItemId());
}
@@ -233,6 +250,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -232,6 +249,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);