From 1d0657121c2354602a229cabb9a69cf02f8a87d1 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Fri, 7 Feb 2025 13:44:20 +0100 Subject: [PATCH] [REBASE] Patches for v133 (final) --- .../Add-bookmark-import-export-actions.patch | 14 +- build/patches/Add-cromite-flags-support.patch | 14 +- .../Add-flag-to-disable-IPv6-probes.patch | 2 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 32 +++- .../Add-option-to-force-tablet-UI.patch | 70 +++---- .../Add-option-to-use-home-page-as-NTP.patch | 90 ++++++--- .../Add-setting-to-clear-data-on-exit.patch | 79 +++++--- ...d-setting-to-invert-tap-and-long-tap.patch | 14 +- build/patches/Add-webRTC-site-settings.patch | 2 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 2 +- .../Content-settings-infrastructure.patch | 28 ++- ...romite-Branding--improve-settings-ui.patch | 32 +++- build/patches/Disable-GSA-by-default.patch | 48 ++++- .../patches/Disable-all-predictors-code.patch | 140 +++++++++----- .../Disable-conversion-measurement-api.patch | 172 ++++++++++++++++-- build/patches/Disable-crash-reporting.patch | 48 ++++- ...Disable-fetching-of-all-field-trials.patch | 68 ++++++- build/patches/Disable-privacy-sandbox.patch | 28 ++- build/patches/Disable-safety-check.patch | 65 ++++++- ...le-search-engine-settings-desktop-ui.patch | 63 +++++-- .../Experimental-user-scripts-support.patch | 13 +- build/patches/Eyeo-Adblock-for-Cromite.patch | 8 +- build/patches/Fix-chromium-build-bugs.patch | 22 ++- build/patches/Internal-firewall.patch | 2 +- .../Keep-Side-Panel-Companion-disabled.patch | 14 +- .../Move-navigation-bar-to-bottom.patch | 70 +++---- .../patches/Partition-HSTS-cache-by-NAK.patch | 39 ++-- ...th-header-upon-cross-origin-redirect.patch | 10 +- .../Remove-binary-blob-integrations.patch | 40 +++- .../Restore-LastTabStandingTracker.patch | 13 +- .../Restore-chrome-password-store.patch | 51 +++++- build/patches/User-agent-customization.patch | 10 +- build/patches/Welcome-screen.patch | 23 ++- build/patches/add-browser-policy.patch | 20 +- build/patches/autofill-miscellaneous.patch | 129 ++++++++++++- .../eyeo-beta-118.0.5993.48-android_api.patch | 32 ++-- .../eyeo-beta-118.0.5993.48-base.patch | 32 ++-- ...eta-118.0.5993.48-chrome_integration.patch | 70 +++---- ...ed-chromium-no-special-hosts-domains.patch | 101 ++++++++-- .../updater-disable-updater-pings.patch | 18 +- ...RTC-do-not-expose-local-IP-addresses.patch | 2 +- 41 files changed, 1297 insertions(+), 433 deletions(-) diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 0154e5bf..0413d3d9 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/java/AndroidManifest.xml | 1 - .../menu/bookmark_toolbar_menu_improved.xml | 14 + .../browser/TabbedModeTabDelegateFactory.java | 5 +- - .../app/bookmarks/BookmarkActivity.java | 30 ++ + .../app/bookmarks/BookmarkActivity.java | 32 ++ .../browser/bookmarks/BookmarkBridge.java | 285 ++++++++++++++++++ .../browser/bookmarks/BookmarkDelegate.java | 10 + .../bookmarks/BookmarkManagerCoordinator.java | 9 + @@ -53,7 +53,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 + - 42 files changed, 898 insertions(+), 30 deletions(-) + 42 files changed, 900 insertions(+), 30 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 @@ -145,14 +145,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -@@ -62,8 +68,23 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -62,8 +68,25 @@ public class BookmarkActivity extends SnackbarActivity { getOnBackPressedDispatcher(), mBookmarkManagerCoordinator, SecondaryActivity.BOOKMARK); + + final boolean listenToActivityState = true; + mIntentRequestTracker = IntentRequestTracker.createFromActivity(this); -+ mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, mIntentRequestTracker, /*InsetObserver*/ null); ++ mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, ++ mIntentRequestTracker, /*InsetObserver*/ null, ++ /* trackOcclusion= */ true); + mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState); + mBookmarkManagerCoordinator.setWindow(mWindowAndroid, + new ModalDialogManager( @@ -169,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B @Override protected void onDestroy() { super.onDestroy(); -@@ -73,6 +94,7 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -73,6 +96,7 @@ public class BookmarkActivity extends SnackbarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -177,7 +179,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) { BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString( -@@ -86,6 +108,14 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -86,6 +110,14 @@ public class BookmarkActivity extends SnackbarActivity { return new ModalDialogManager(new AppModalPresenter(this), ModalDialogType.APP); } diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch index fe6b14a6..1a87f73d 100644 --- a/build/patches/Add-cromite-flags-support.patch +++ b/build/patches/Add-cromite-flags-support.patch @@ -41,6 +41,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../placeholder.txt | 1 + chrome/browser/ui/ui_features.cc | 1 + chrome/common/chrome_features.cc | 1 + + .../browser_ui/accessibility/android/BUILD.gn | 1 + .../res/xml/accessibility_preferences.xml | 3 +- .../accessibility/AccessibilitySettings.java | 6 +- .../android/java/res/values/attrs.xml | 4 + @@ -104,7 +105,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html third_party/blink/public/common/features.h | 1 + ui/base/ui_base_features.cc | 1 + ui/base/ui_base_features.h | 1 + - 91 files changed, 802 insertions(+), 28 deletions(-) + 92 files changed, 803 insertions(+), 28 deletions(-) create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp @@ -944,6 +945,17 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc +#include "cromite_flags/chrome_common_chrome_features_cc.inc" } // namespace features +diff --git a/components/browser_ui/accessibility/android/BUILD.gn b/components/browser_ui/accessibility/android/BUILD.gn +--- a/components/browser_ui/accessibility/android/BUILD.gn ++++ b/components/browser_ui/accessibility/android/BUILD.gn +@@ -55,6 +55,7 @@ android_library("lib_java") { + ":page_zoom_utils_java", + "//base:base_java", + "//build/android:build_java", ++ "//chrome/browser/settings:java", + "//components/browser_ui/settings/android:java", + "//components/browser_ui/site_settings/android:java", + "//components/cached_flags:java", diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index aff878b4..ac0aed51 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -49,7 +49,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn "//build:chromeos_buildflags", "//components/miracle_parameter/common", "//components/network_time/time_tracker", -+ "//components/network_session_configurator/common" ++ "//components/network_session_configurator/common", "//net/http:transport_security_state_generated_files", "//third_party/simdutf:simdutf", ] 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 bf712d23..b6075cdc 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -10,7 +10,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../bookmarks/android/bookmark_bridge.cc | 44 +++++++++++- .../bookmarks/android/bookmark_bridge.h | 8 +++ .../browser/bookmarks/bookmark_html_writer.cc | 11 ++- - .../bookmark_merged_surface_service.cc | 2 + + .../bookmark_merged_surface_service.cc | 3 + + .../permanent_folder_ordering_tracker.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- .../strings/android_chrome_strings.grd | 3 + .../bookmark_ui_operations_helper.cc | 2 + @@ -28,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/bookmarks/browser/bookmark_uuids.h | 1 + components/bookmarks/browser/model_loader.cc | 8 ++- .../bookmark_specifics_conversions.cc | 1 + - 24 files changed, 245 insertions(+), 15 deletions(-) + 25 files changed, 248 insertions(+), 15 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 @@ -383,6 +384,33 @@ diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrom } NOTREACHED(); } +@@ -99,6 +101,7 @@ BookmarkParentFolder BookmarkParentFolder::FromFolderNode( + } + switch (node->type()) { + case bookmarks::BookmarkNode::URL: ++ case bookmarks::BookmarkNode::TABS_COLLECTION: + NOTREACHED(); + case bookmarks::BookmarkNode::FOLDER: + // TODO(crbug.com/381252292): Consider extending type with a value +diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc +--- a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc ++++ b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc +@@ -22,6 +22,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) { + switch (type) { + case bookmarks::BookmarkNode::URL: + case bookmarks::BookmarkNode::FOLDER: ++ case bookmarks::BookmarkNode::TABS_COLLECTION: + NOTREACHED(); + + case bookmarks::BookmarkNode::BOOKMARK_BAR: +@@ -168,6 +169,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() { + switch (tracked_type_) { + case bookmarks::BookmarkNode::URL: + case bookmarks::BookmarkNode::FOLDER: ++ case bookmarks::BookmarkNode::TABS_COLLECTION: + NOTREACHED(); + + case bookmarks::BookmarkNode::BOOKMARK_BAR: diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index f72ed320..31e5829c 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -7,37 +7,37 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../layout/custom_tabs_control_container.xml | 2 +- .../java/res/layout/recent_tabs_page.xml | 2 +- .../java/res/values-sw600dp/dimens.xml | 4 ++-- - chrome/android/java/res/values/dimens.xml | 6 ++++- + chrome/android/java/res/values/dimens.xml | 6 +++++- .../browser/ChromeBaseAppCompatActivity.java | 3 +++ - .../chrome/browser/WarmupManager.java | 5 +++- - .../ChromeAccessibilitySettingsDelegate.java | 19 +++++++++++++++ + .../chrome/browser/WarmupManager.java | 5 ++++- + .../ChromeAccessibilitySettingsDelegate.java | 19 ++++++++++++++++++ .../chrome/browser/app/ChromeActivity.java | 4 +++- - .../overlays/strip/StripLayoutHelper.java | 10 ++++++-- - .../strip/StripLayoutHelperManager.java | 6 ++++- + .../overlays/strip/StripLayoutHelper.java | 10 ++++++++-- + .../strip/StripLayoutHelperManager.java | 6 +++++- .../init/ChromeBrowserInitializer.java | 2 ++ .../tabbed_mode/TabbedRootUiCoordinator.java | 4 +++- - .../chrome/browser/ui/RootUiCoordinator.java | 6 ++++- + .../chrome/browser/ui/RootUiCoordinator.java | 6 +++++- chrome/browser/preferences/BUILD.gn | 1 + .../preferences/ChromePreferenceKeys.java | 1 + - .../preferences/ChromeSharedPreferences.java | 12 ++++++++++ + .../preferences/ChromeSharedPreferences.java | 12 +++++++++++ .../LegacyChromePreferenceKeys.java | 1 + .../AppHeaderCoordinator.java | 2 ++ .../omnibox/LocationBarCoordinator.java | 2 +- - .../strings/android_chrome_strings.grd | 7 ++++++ - .../java/res/layout/control_container.xml | 8 +++---- + .../strings/android_chrome_strings.grd | 7 +++++++ + .../java/res/layout/control_container.xml | 8 ++++---- .../java/res/layout/toolbar_tablet.xml | 2 +- - .../java/res/values-sw600dp/dimens.xml | 5 ++-- - .../toolbar/java/res/values/dimens.xml | 6 +++-- + .../java/res/values-sw600dp/dimens.xml | 5 +++-- + .../toolbar/java/res/values/dimens.xml | 6 ++++-- .../browser/toolbar/ControlContainer.java | 2 +- - .../toolbar/top/ToolbarControlContainer.java | 24 ++++++++++++++++++- - .../browser/toolbar/top/ToolbarLayout.java | 5 +++- + .../toolbar/top/ToolbarControlContainer.java | 20 ++++++++++++++++++- + .../browser/toolbar/top/ToolbarLayout.java | 5 ++++- .../tab_strip/HeightTransitionHandler.java | 2 ++ - .../TabStripTransitionCoordinator.java | 6 ++++- - .../res/xml/accessibility_preferences.xml | 5 ++++ - .../accessibility/AccessibilitySettings.java | 13 ++++++++++ - .../AccessibilitySettingsDelegate.java | 11 +++++++++ - .../chromium/ui/base/DeviceFormFactor.java | 14 +++++++++++ - 33 files changed, 176 insertions(+), 26 deletions(-) + .../TabStripTransitionCoordinator.java | 6 +++++- + .../res/xml/accessibility_preferences.xml | 5 +++++ + .../accessibility/AccessibilitySettings.java | 13 ++++++++++++ + .../AccessibilitySettingsDelegate.java | 2 ++ + .../chromium/ui/base/DeviceFormFactor.java | 14 +++++++++++++ + 33 files changed, 163 insertions(+), 26 deletions(-) diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml @@ -146,13 +146,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s + private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate { + @Override -+ public boolean isEnabled() { ++ public boolean getValue() { + return ChromeSharedPreferences.getInstance().readBoolean( + ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false); + } + + @Override -+ public void setEnabled(boolean value) { ++ public void setValue(boolean value) { + ChromeSharedPreferences.getInstance().writeBoolean( + ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, value); + } @@ -499,7 +499,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import android.graphics.Canvas; import android.graphics.PorterDuff; import android.graphics.Rect; -@@ -143,8 +144,29 @@ public class ToolbarControlContainer extends OptimizedFrameLayout +@@ -143,8 +144,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout } @Override @@ -522,10 +522,6 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow + view = findViewById(R.id.find_toolbar_stub); + if (view != null) + ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height; -+ -+ view = findViewById(R.id.target_view_stub); -+ if (view != null) -+ ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height; + } mToolbarContainer = (ToolbarViewResourceFrameLayout) findViewById(R.id.toolbar_container); @@ -637,7 +633,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c + ChromeSwitchPreference forceTabletUiPref = + (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI); + mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate(); -+ forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled()); ++ forceTabletUiPref.setChecked(mForceTabletUIDelegate.getValue()); + forceTabletUiPref.setOnPreferenceChangeListener(this); + Preference captions = findPreference(PREF_CAPTIONS); @@ -648,7 +644,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue); + } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) { -+ mForceTabletUIDelegate.setEnabled((Boolean) newValue); ++ mForceTabletUIDelegate.setValue((Boolean) newValue); + mDelegate.requestRestart(getActivity()); } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) { mDelegate.getReaderAccessibilityDelegate().setValue((Boolean) newValue); @@ -656,23 +652,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java -@@ -12,6 +12,15 @@ import org.chromium.content_public.browser.BrowserContextHandle; - * embedder-specific logic. - */ - public interface AccessibilitySettingsDelegate { -+ /** An interface to control a single boolean preference. */ -+ interface BooleanPreferenceDelegate { -+ /** @return whether the preference is enabled. */ -+ boolean isEnabled(); -+ -+ /** Called when the preference value is changed. */ -+ void setEnabled(boolean value); -+ } -+ - /** An interface to control a single integer preference. */ - interface IntegerPreferenceDelegate { - /** -@@ -39,6 +48,8 @@ public interface AccessibilitySettingsDelegate { +@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate { */ BrowserContextHandle getBrowserContextHandle(); diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 2d30aa58..f9e16051 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -6,20 +6,51 @@ And allow use about:blank as default homepage License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- + .../tab_management/TabGridDialogMediator.java | 11 ++++++++++- .../tasks/tab_management/TabGroupUiMediator.java | 8 +++++++- .../java/res/xml/homepage_preferences.xml | 5 +++++ + .../strip/TabGroupContextMenuCoordinator.java | 11 ++++++++++- .../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++ .../homepage/settings/HomepageSettings.java | 12 ++++++++++++ .../chrome/browser/metrics/LaunchMetrics.java | 1 - .../browser/tabmodel/ChromeTabCreator.java | 8 ++++++++ .../preferences/ChromePreferenceKeys.java | 1 + .../preferences/LegacyChromePreferenceKeys.java | 1 + - .../chrome/browser/tabmodel/TabGroupUtils.java | 8 ++++++++ .../android/strings/android_chrome_strings.grd | 3 +++ chrome/browser/ui/browser_ui_prefs.cc | 2 ++ chrome/common/pref_names.h | 4 ++++ - 12 files changed, 67 insertions(+), 2 deletions(-) + 13 files changed, 79 insertions(+), 4 deletions(-) +diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java +--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java ++++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java +@@ -94,6 +94,9 @@ import java.util.Map; + import java.util.Objects; + import java.util.Optional; + ++import org.chromium.chrome.browser.homepage.HomepageManager; ++import org.chromium.url.GURL; ++ + /** + * A mediator for the TabGridDialog component, responsible for communicating with the components' + * coordinator as well as managing the business logic for dialog show/hide. +@@ -914,9 +917,15 @@ public class TabGridDialogMediator + return; + } + ++ String url = UrlConstants.NTP_URL; ++ if (UrlConstants.NTP_URL.equals(url) ++ && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) { ++ GURL gurl = HomepageManager.getInstance().getHomepageGurl(); ++ url = gurl != null ? gurl.getSpec() : url; ++ } + TabGroupUtils.openUrlInGroup( + mCurrentTabGroupModelFilterSupplier.get(), +- UrlConstants.NTP_URL, ++ url, + currentTab.getId(), + TabLaunchType.FROM_TAB_GROUP_UI); + RecordUserAction.record("MobileNewTabOpened." + mComponentName); diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java @@ -63,6 +94,36 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro relatedTabs = tabGroupModelFilter.getRelatedTabList(parentId); - if (relatedTabs.isEmpty()) return; - -+ if (UrlConstants.NTP_URL.equals(url) -+ && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) { -+ GURL gurl = HomepageManager.getInstance().getHomepageGurl(); -+ url = gurl != null ? gurl.getSpec() : url; -+ } -+ - Tab lastTab = relatedTabs.get(relatedTabs.size() - 1); - TabCreator tabCreator = tabGroupModelFilter.getTabModel().getTabCreator(); - LoadUrlParams loadUrlParams = new LoadUrlParams(url); diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/build/patches/Add-setting-to-clear-data-on-exit.patch b/build/patches/Add-setting-to-clear-data-on-exit.patch index aa59a0a3..1a7c5661 100644 --- a/build/patches/Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/Add-setting-to-clear-data-on-exit.patch @@ -6,13 +6,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/android/chrome_java_sources.gni | 1 + .../chrome/browser/ChromeTabbedActivity.java | 7 +- - .../ClearBrowsingDataFragment.java | 6 ++ + .../ClearBrowsingDataFragment.java | 12 +++ .../ClearBrowsingDataFragmentAtStart.java | 74 +++++++++++++++++++ .../ClearBrowsingDataTabsFragment.java | 7 +- + .../privacy/settings/PrivacySettings.java | 2 +- chrome/app/settings_strings.grdp | 10 +++ .../browsing_data/browsing_data_bridge.cc | 2 +- .../chrome_browsing_data_lifetime_manager.cc | 22 +++++- - .../chrome_browsing_data_remover_constants.h | 3 +- .../chrome_browsing_data_remover_delegate.cc | 14 ++++ .../api/settings_private/prefs_util.cc | 17 +++++ .../browser/profiles/ProfileManagerUtils.java | 5 ++ @@ -33,7 +33,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../search_engines/template_url_service.cc | 1 + content/browser/dips/dips_service_impl.cc | 2 +- content/browser/storage_partition_impl.cc | 1 + - 29 files changed, 323 insertions(+), 23 deletions(-) + .../public/browser/browsing_data_remover.h | 7 +- + 30 files changed, 335 insertions(+), 23 deletions(-) create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni @@ -74,7 +75,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -@@ -475,6 +475,10 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme +@@ -163,6 +163,12 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme + + mParent.updateButtonState(); + mShouldAnnounceCounterResult = true; ++ ++ BrowsingDataBridge.getForProfile(mParent.getProfile()) ++ .setBrowsingDataDeletionPreference( ++ ClearBrowsingDataFragment.getDataType(mOption), ++ mParent.getClearBrowsingDataTabType(), ++ mCheckbox.isChecked()); + return true; + } + +@@ -475,6 +481,10 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme /** Returns whether is a basic or advanced Clear Browsing Data tab. */ protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType(); @@ -85,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C /** * Decides whether a given dialog option should be selected when the dialog is initialized. * -@@ -555,6 +559,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme +@@ -555,6 +565,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme * options. */ private void onClearButtonClicked() { @@ -93,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C if (shouldShowImportantSitesDialog()) { showImportantDialogThenClear(); return; -@@ -585,6 +590,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme +@@ -585,6 +596,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme Button clearButton = (Button) getView().findViewById(R.id.clear_button); boolean isEnabled = !getSelectedOptions().isEmpty(); clearButton.setEnabled(isEnabled); @@ -211,6 +225,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C default: throw new RuntimeException("invalid position: " + position); } +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 +@@ -336,7 +336,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment + thirdPartyCookies.getTitle().toString()); + } + +- if (QuickDeleteController.isQuickDeleteFollowupEnabled()) { ++ if (((false)) && QuickDeleteController.isQuickDeleteFollowupEnabled()) { + Preference clearBrowsingDataPreference = findPreference(PREF_CLEAR_BROWSING_DATA); + Preference clearBrowsingDataAdvancedPreference = + findPreference(PREF_CLEAR_BROWSING_DATA_ADVANCED); diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp @@ -282,19 +308,6 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager. bool sync_disabled = !SyncServiceFactory::IsSyncAllowed(profile_); // Condition is satisfied if sync is fully disabled by policy. if (sync_disabled) { -diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h ---- a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h -+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h -@@ -32,8 +32,7 @@ constexpr DataType DATA_TYPE_SITE_USAGE_DATA = DATA_TYPE_EMBEDDER_BEGIN << 4; - constexpr DataType DATA_TYPE_DURABLE_PERMISSION = DATA_TYPE_EMBEDDER_BEGIN << 5; - constexpr DataType DATA_TYPE_EXTERNAL_PROTOCOL_DATA = DATA_TYPE_EMBEDDER_BEGIN - << 6; --constexpr DataType DATA_TYPE_HOSTED_APP_DATA_TEST_ONLY = -- DATA_TYPE_EMBEDDER_BEGIN << 7; -+constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = DATA_TYPE_EMBEDDER_BEGIN << 7; - constexpr DataType DATA_TYPE_CONTENT_SETTINGS = DATA_TYPE_EMBEDDER_BEGIN << 8; - constexpr DataType DATA_TYPE_BOOKMARKS = DATA_TYPE_EMBEDDER_BEGIN << 9; - constexpr DataType DATA_TYPE_ISOLATED_ORIGINS = DATA_TYPE_EMBEDDER_BEGIN << 10; diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc @@ -313,7 +326,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. // Rename the method to indicate its more general usage. if (profile_->GetSSLHostStateDelegate()) { + bool skip = false; -+ if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_SKIP_SSL_HOST_STATE) { ++ if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE) { + skip = true; + } + if (!skip) @@ -745,7 +758,7 @@ diff --git a/content/browser/dips/dips_service_impl.cc b/content/browser/dips/di remover->RemoveWithFilterAndReply( base::Time::Min(), base::Time::Max(), - remove_mask | -+ remove_mask | chrome_browsing_data_remover::DATA_TYPE_SKIP_SSL_HOST_STATE | ++ remove_mask | content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE | content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS, content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB | content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB, @@ -760,4 +773,28 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage GetGeneratedCodeCacheContext()->Initialize(code_cache_path, settings.size_in_bytes()); } +diff --git a/content/public/browser/browsing_data_remover.h b/content/public/browser/browsing_data_remover.h +--- a/content/public/browser/browsing_data_remover.h ++++ b/content/public/browser/browsing_data_remover.h +@@ -151,14 +151,19 @@ class BrowsingDataRemover { + static constexpr DataType DATA_TYPE_RELATED_WEBSITE_SETS_PERMISSIONS = 1 + << 24; + ++ static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 25; ++ + // Device bound sessions + // (https://github.com/WICG/dbsc/blob/main/README.md) +- static constexpr DataType DATA_TYPE_DEVICE_BOUND_SESSIONS = 1 << 25; ++ static constexpr DataType DATA_TYPE_DEVICE_BOUND_SESSIONS = 1 << 26; + + // Embedders can add more datatypes beyond this point. + static constexpr DataType DATA_TYPE_CONTENT_END = + DATA_TYPE_DEVICE_BOUND_SESSIONS; + ++ static_assert(DATA_TYPE_CONTENT_END == DATA_TYPE_DEVICE_BOUND_SESSIONS, ++ "Please check."); ++ + // All data stored by the Attribution Reporting API. + static constexpr DataType DATA_TYPE_ATTRIBUTION_REPORTING = + DATA_TYPE_ATTRIBUTION_REPORTING_SITE_CREATED | -- diff --git a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch index 811a2493..bdd59487 100644 --- a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch @@ -76,12 +76,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s + private static class ShowAlwaysContextMenuOnLinksDelegate implements BooleanPreferenceDelegate { + @Override -+ public boolean isEnabled() { ++ public boolean getValue() { + return ChromeFeatureList.sShowAlwaysContextMenuOnLinks.isEnabled(); + } + + @Override -+ public void setEnabled(boolean value) { ++ public void setValue(boolean value) { + CromiteNativeUtils.setFlagEnabled(ChromeFeatureList.SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, + "show-always-context-menu-on-links", value); + } @@ -260,13 +260,13 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c private ChromeSwitchPreference mPageZoomIncludeOSAdjustment; private ChromeSwitchPreference mPageZoomAlwaysShowPref; @@ -136,6 +139,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment - mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.isEnabled()); + mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue()); mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this); + ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref = + (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS); + mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate(); -+ mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.isEnabled()); ++ mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.getValue()); + mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this); + Preference captions = findPreference(PREF_CAPTIONS); @@ -275,9 +275,9 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c @@ -213,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mDelegate.requestRestart(getActivity()); } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) { - mDisableToolbarSwipeUpDelegate.setEnabled((Boolean) newValue); + mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue); + } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) { -+ mShowAlwaysContextMenuOnLinksDelegate.setEnabled((Boolean) newValue); ++ mShowAlwaysContextMenuOnLinksDelegate.setValue((Boolean) newValue); + mDelegate.requestRestart(getActivity()); } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) { // TODO(mschillaci): Implement the override behavior for OS level. @@ -285,7 +285,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java -@@ -51,6 +51,8 @@ public interface AccessibilitySettingsDelegate { +@@ -42,6 +42,8 @@ public interface AccessibilitySettingsDelegate { BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate(); BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate(); diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 7bf99d5d..2edaf11e 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -201,7 +201,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d // origin. + blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient(); + if (settings && settings->AllowContentSetting(ContentSettingsType::WEBRTC, false)) { -+ policy = kDefault; ++ webrtc_ip_handling_policy = mojom::blink::WebRtcIpHandlingPolicy::kDefault; + } + switch (webrtc_ip_handling_policy) { diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 86e04b7e..17cea64c 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -61,7 +61,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third + if (NotShared array = getChannelData(i)) { + size_t len = array->length(); + if (len > 0) { -+ float* destination = array->Data(); ++ base::span destination = array->AsSpan(); + for (unsigned j = 0; j < len; ++j) { + destination[j] = BaseAudioContext::ShuffleAudioData(destination[j], j); + } diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index c46755d8..f4b6428f 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -38,6 +38,7 @@ Require: bromite-build-utils.patch .../preference_spinner_single_widget.xml | 92 ++++ .../settings/SpinnerPreference.java | 24 + .../browser_ui/site_settings/android/BUILD.gn | 18 + + .../res/xml/site_settings_preferences.xml | 7 + .../site_settings/AllSiteSettings.java | 5 +- .../BromiteCustomContentSetting.java | 155 +++++++ .../BromiteCustomContentSettingImpl.java | 412 ++++++++++++++++++ @@ -83,7 +84,7 @@ Require: bromite-build-utils.patch .../platform/web_content_settings_client.h | 13 + .../execution_context/execution_context.cc | 16 + .../execution_context/execution_context.h | 5 + - 72 files changed, 1934 insertions(+), 104 deletions(-) + 73 files changed, 1941 insertions(+), 104 deletions(-) create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java @@ -108,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C /** A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { public static final String EMBEDDED_CONTENT_HELP_CENTER_URL = -@@ -241,7 +245,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -243,7 +247,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { @Override public boolean isHelpAndFeedbackEnabled() { @@ -117,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C } @Override -@@ -398,6 +402,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -400,6 +404,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin); } @@ -150,7 +151,7 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1462,4 +1462,5 @@ +@@ -1457,4 +1457,5 @@ @@ -588,7 +589,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ { route: routes.SITE_SETTINGS_ADS, id: Id.ADS, -@@ -450,10 +450,36 @@ function getCategoryItemMap(): Map { +@@ -451,10 +451,36 @@ function getCategoryItemMap(): Map { icon: 'privacy:cookie', }, ]; @@ -625,7 +626,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ function buildItemListFromIds(orderedIdList: ContentSettingsTypes[]): CategoryListItem[] { const map = getCategoryItemMap(); -@@ -543,7 +569,7 @@ export class SettingsSiteSettingsPageElement extends +@@ -544,7 +570,7 @@ export class SettingsSiteSettingsPageElement extends Id.IMAGES, Id.POPUPS, ]), @@ -1536,6 +1537,21 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b sources = [ "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-hdpi/permission_background_sync.png", +diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml +--- a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml ++++ b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml +@@ -181,4 +181,11 @@ The order of the following items is from: http://crbug.com/610358. + android:title="@string/safety_hub_autorevocation_toggle_title" + android:summary="@string/safety_hub_autorevocation_toggle_summary" /> + ++ ++ ++ ++ + diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java diff --git a/build/patches/Cromite-Branding--improve-settings-ui.patch b/build/patches/Cromite-Branding--improve-settings-ui.patch index 517c5e14..4a2b620d 100644 --- a/build/patches/Cromite-Branding--improve-settings-ui.patch +++ b/build/patches/Cromite-Branding--improve-settings-ui.patch @@ -8,10 +8,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/android/chrome_java_resources.gni | 2 +- .../android/java/res/xml/main_preferences.xml | 4 +- - .../res/xml/privacy_preferences_cromite.xml | 189 ++++++++++++++++++ - .../privacy/settings/PrivacySettings.java | 2 +- + .../res/xml/privacy_preferences_cromite.xml | 198 ++++++++++++++++++ + .../privacy/settings/PrivacySettings.java | 4 +- .../Cromite-settings-ui.grdp | 15 ++ - 5 files changed, 208 insertions(+), 4 deletions(-) + 5 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom new file mode 100644 --- /dev/null +++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml -@@ -0,0 +1,189 @@ +@@ -0,0 +1,198 @@ + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java +@@ -152,6 +152,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { + // not great to dynamically remove the preference in this way. + case SiteSettingsCategory.Type.ADS: + return SiteSettingsCategory.adsCategoryEnabled(); ++ case SiteSettingsCategory.Type.ANTI_ABUSE: ++ return false; + case SiteSettingsCategory.Type.AUTO_DARK_WEB_CONTENT: + return ChromeFeatureList.isEnabled( + ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING); +diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc +--- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc ++++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc +@@ -119,7 +119,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default; + + void KAnonymityTrustTokenGetter::TryGetTrustTokenAndKey( + TryGetTrustTokenAndKeyCallback callback) { +- if (!identity_manager_ || ++ if (((true)) || !identity_manager_ || + !identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin)) { + std::move(callback).Run(std::nullopt); + return; +diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html +--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html ++++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html +@@ -635,11 +635,6 @@ + + + +- +