From c5ecfb9ff178e32ca213ada5d722a4b85dbebe8f Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sat, 2 Dec 2023 22:59:58 +0100 Subject: [PATCH] v120 line changes --- build/patches/00Cromite-Branding.patch | 2 +- ...able-prefers-reduced-transparency-media-query.patch | 2 +- build/patches/00Internal-firewall.patch | 2 +- build/patches/00Restore-LastTabStandingTracker.patch | 2 +- build/patches/Add-a-proxy-configuration-page.patch | 2 +- .../Add-custom-tab-intents-privacy-option.patch | 8 ++++---- build/patches/Add-menu-item-to-bookmark-all-tabs.patch | 10 +++++----- build/patches/Remove-help-menu-item.patch | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/patches/00Cromite-Branding.patch b/build/patches/00Cromite-Branding.patch index b0d4b1a23..7087b9a01 100644 --- a/build/patches/00Cromite-Branding.patch +++ b/build/patches/00Cromite-Branding.patch @@ -13147,7 +13147,7 @@ e)fqMZZ`3a)Ds&5H", "", servicesLink)); } @@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -261,6 +267,14 @@ public class PrivacySettings +@@ -262,6 +268,14 @@ public class PrivacySettings } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(getProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -155,7 +155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -285,6 +299,16 @@ public class PrivacySettings +@@ -286,6 +300,16 @@ public class PrivacySettings UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } 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 713b7792b..9fca2496a 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -122,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.BookmarkItem; import org.chromium.components.bookmarks.BookmarkType; -@@ -84,6 +89,8 @@ import java.io.File; +@@ -85,6 +90,8 @@ import java.io.File; class BookmarkBridge { private final ObserverList mObservers = new ObserverList<>(); @@ -131,7 +131,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private long mNativeBookmarkBridge; private boolean mIsDestroyed; private boolean mIsDoingExtensiveChanges; -@@ -389,6 +396,16 @@ class BookmarkBridge { +@@ -390,6 +397,16 @@ class BookmarkBridge { return mMobileFolderId; } @@ -148,7 +148,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @return Id representing the special "other" folder from bookmark model. */ -@@ -1033,6 +1050,50 @@ class BookmarkBridge { +@@ -1034,6 +1051,50 @@ class BookmarkBridge { return BookmarkBridgeJni.get().addToReadingList(mNativeBookmarkBridge, title, url); } @@ -199,7 +199,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. -@@ -1272,6 +1333,9 @@ class BookmarkBridge { +@@ -1273,6 +1334,9 @@ class BookmarkBridge { BookmarkId getBookmarkIdForWebContents( long nativeBookmarkBridge, WebContents webContents, boolean onlyEditable); @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type); void getTopLevelFolderIds(long nativeBookmarkBridge, List bookmarksList); -@@ -1283,6 +1347,8 @@ class BookmarkBridge { +@@ -1284,6 +1348,8 @@ class BookmarkBridge { BookmarkId getRootFolderId(long nativeBookmarkBridge); diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index 0a94b5ea0..ff32c40d2 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -162,7 +162,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -370,6 +370,7 @@ public class PrivacySettings +@@ -371,6 +371,7 @@ public class PrivacySettings menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme()));