From 6c21062b177537c903926efdd0eeff340cfbb118 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Fri, 7 Feb 2025 13:44:56 +0100 Subject: [PATCH] [REBASE] Patches for v133 (no changes) --- build/patches/Disable-Real-Box.patch | 4 ++-- build/patches/Disable-third-party-origin-trials.patch | 2 +- ...Restore-adaptive-button-in-top-toolbar-customization.patch | 2 +- build/patches/eyeo-beta-118.0.5993.48-android_settings.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/patches/Disable-Real-Box.patch b/build/patches/Disable-Real-Box.patch index 6280b364..f6737b86 100644 --- a/build/patches/Disable-Real-Box.patch +++ b/build/patches/Disable-Real-Box.patch @@ -54,7 +54,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc --- a/components/search/ntp_features.cc +++ b/components/search/ntp_features.cc -@@ -120,7 +120,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, +@@ -121,7 +121,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, // If enabled, logo will be shown. // This is a kill switch. Keep indefinitely. @@ -63,7 +63,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features. // If enabled, middle slot promo will be shown. // This is a kill switch. Keep indefinitely. -@@ -178,8 +178,8 @@ BASE_FEATURE(kNtpModulesLoad, +@@ -179,8 +179,8 @@ BASE_FEATURE(kNtpModulesLoad, // If enabled, OneGoogleBar will be shown. // This is a kill switch. Keep indefinitely. BASE_FEATURE(kNtpOneGoogleBar, diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index c4970835..d0ac578d 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -9186,7 +9186,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { +@@ -9187,7 +9187,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); diff --git a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch index ae382964..e66a226d 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe - }); + new AdaptiveToolbarStatePredictor(getContext(), getProfile(), null); - if (BuildInfo.getInstance().isAutomotive) { + if (((true)) || BuildInfo.getInstance().isAutomotive) { getPreferenceScreen().removePreference(findPreference(PREF_SAFETY_CHECK)); diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.cc b/chrome/browser/segmentation_platform/segmentation_platform_config.cc --- a/chrome/browser/segmentation_platform/segmentation_platform_config.cc diff --git a/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch b/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch index f100c3a5..9c9ffc9c 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch @@ -278,7 +278,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j --> +@@ -140,6 +143,11 @@ for the previous order (main_preferences_legacy). --> android:key="accessibility" android:order="24" android:title="@string/prefs_accessibility"/>