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 977c2010..c0295506 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -9,6 +9,7 @@ Subject: Add menu item to bookmark all tabs .../browser/bookmarks/BookmarkUtils.java | 4 ++ .../android/bookmarks/bookmark_bridge.cc | 17 ++++++ .../android/bookmarks/bookmark_bridge.h | 4 ++ + .../browser/bookmarks/bookmark_html_writer.cc | 10 +++ .../bookmarks/chrome_bookmark_client.cc | 2 + .../strings/android_chrome_strings.grd | 3 + components/bookmark_bar_strings.grdp | 6 ++ @@ -21,7 +22,7 @@ Subject: Add menu item to bookmark all tabs components/bookmarks/browser/bookmark_node.cc | 13 ++++ components/bookmarks/browser/bookmark_node.h | 5 ++ components/bookmarks/browser/model_loader.cc | 3 +- - 18 files changed, 191 insertions(+), 7 deletions(-) + 19 files changed, 201 insertions(+), 7 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 @@ -286,6 +287,33 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser base::android::ScopedJavaLocalRef GetOtherFolderId( JNIEnv* env, const base::android::JavaParamRef& obj); +diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc +--- a/chrome/browser/bookmarks/bookmark_html_writer.cc ++++ b/chrome/browser/bookmarks/bookmark_html_writer.cc +@@ -212,6 +212,14 @@ class Writer : public base::RefCountedThreadSafe { + return; + } + ++ base::Value* tabs_collection_value = nullptr; ++ if (roots_d_value->Get(BookmarkCodec::kTabsBookmarkFolderNameKey, ++ &tabs_collection_value) && ++ tabs_collection_value->type() == base::Value::Type::DICTIONARY) { ++ WriteNode(*static_cast(tabs_collection_value), ++ BookmarkNode::TABS_COLLECTION); ++ } ++ + DecrementIndent(); + + Write(kFolderChildrenEnd); +@@ -484,6 +492,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { + BookmarkModelFactory::GetForBrowserContext(profile_)->other_node()); + ExtractUrls( + BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node()); ++ ExtractUrls( ++ BookmarkModelFactory::GetForBrowserContext(profile_)->tabs_collection_node()); + if (!bookmark_urls_.empty()) + FetchNextFavicon(); + else diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc