From eda9051a577cd8961c43f93e6c542094422714e0 Mon Sep 17 00:00:00 2001 From: uazo Date: Wed, 30 Aug 2023 07:33:07 +0000 Subject: [PATCH] AUTOMATED - git apply results --- build/patches/00Add-a-flag-to-disable-GamePad-API.patch | 4 ++-- .../00Add-setting-to-invert-tap-and-long-tap.patch | 2 +- .../patches/00Disable-speechSynthesis-getVoices-API.patch | 2 +- build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch | 2 +- build/patches/00Fonts-fingerprinting-mitigation.patch | 2 +- build/patches/00Internal-firewall.patch | 2 +- build/patches/00Keyboard-protection-flag.patch | 4 ++-- .../00Log-dangling-attributes-in-some-html-elements.patch | 2 +- .../00WIN-ADDTO-Add-AllowUserCertificates-flag.patch | 2 +- .../00WIN-ADDTO-Add-bookmark-import-export-actions.patch | 2 +- .../00WIN-ADDTO-Experimental-user-scripts-support.patch | 2 +- .../00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch | 2 +- .../00Warning-message-for-unsupported-hardware-aes.patch | 2 +- build/patches/Add-AllowUserCertificates-flag.patch | 2 +- build/patches/Add-IsCleartextPermitted-flag.patch | 2 +- build/patches/Add-an-always-incognito-mode.patch | 4 ++-- build/patches/Add-bookmark-import-export-actions.patch | 6 +++--- ...d-flag-to-configure-maximum-connections-per-host.patch | 4 ++-- build/patches/Add-flag-to-disable-IPv6-probes.patch | 4 ++-- .../Add-flag-to-disable-external-intent-requests.patch | 4 ++-- build/patches/Add-flag-to-disable-vibration.patch | 6 +++--- build/patches/Add-site-engagement-flag.patch | 6 +++--- .../patches/Allow-building-without-supervised-users.patch | 2 +- .../patches/AudioBuffer-AnalyserNode-fp-mitigations.patch | 4 ++-- build/patches/Bromite-subresource-adblocker.patch | 2 +- build/patches/Content-settings-infrastructure.patch | 4 ++-- build/patches/Disable-text-fragments-by-default.patch | 2 +- build/patches/Enable-Certificate-Transparency.patch | 6 +++--- build/patches/Enable-share-intent.patch | 6 +++--- build/patches/Experimental-user-scripts-support.patch | 6 +++--- build/patches/Modify-default-preferences.patch | 6 +++--- build/patches/Move-navigation-bar-to-bottom.patch | 2 +- ...Re-introduce-modal-dialog-flag-to-close-all-tabs.patch | 4 ++-- build/patches/Restore-Search-Ready-Omnibox-flag.patch | 6 +++--- build/patches/Restore-Simplified-NTP-launch.patch | 4 ++-- build/patches/Restore-offline-indicator-v2-flag.patch | 4 ++-- .../Revert-Delete-block-external-form-redirects.patch | 6 +++--- ...vert-flags-remove-disable-pull-to-refresh-effect.patch | 4 ++-- .../patches/Revert-flags-remove-num-raster-threads.patch | 4 ++-- build/patches/Viewport-Protection-flag.patch | 6 +++--- build/patches/eyeo-beta-114.0.5735.53-v1-base.patch | 8 ++++---- .../eyeo-beta-114.0.5735.53-v1-extension_api.patch | 2 +- .../ungoogled-chromium-no-special-hosts-domains.patch | 4 ++-- 43 files changed, 80 insertions(+), 80 deletions(-) diff --git a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch index 0c39632d9..708ab8992 100644 --- a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch @@ -13,7 +13,7 @@ Adds restrict-gamepad-access flag (default active) to disable GamePad API. diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -6837,9 +6837,9 @@ +@@ -6842,9 +6842,9 @@ "expiry_milestone": 117 }, { @@ -28,7 +28,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2981,7 +2981,7 @@ const char kReduceAcceptLanguageDescription[] = +@@ -2984,7 +2984,7 @@ const char kReduceAcceptLanguageDescription[] = const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = diff --git a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch index e43277df9..767538d71 100644 --- a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch @@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7917,6 +7917,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7921,6 +7921,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)}, diff --git a/build/patches/00Disable-speechSynthesis-getVoices-API.patch b/build/patches/00Disable-speechSynthesis-getVoices-API.patch index 5d1cb170e..26d86360c 100644 --- a/build/patches/00Disable-speechSynthesis-getVoices-API.patch +++ b/build/patches/00Disable-speechSynthesis-getVoices-API.patch @@ -23,7 +23,7 @@ Require: Timezone-customization.patch diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7460,6 +7460,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7464,6 +7464,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kFileHandlingIconsDescription, kOsDesktop, FEATURE_VALUE_TYPE(blink::features::kFileHandlingIcons)}, diff --git a/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch b/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch index 75ce63969..27c139fce 100644 --- a/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch +++ b/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch @@ -1520,7 +1520,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn import("//components/captive_portal/core/features.gni") import("//components/enterprise/buildflags/buildflags.gni") import("//components/feed/features.gni") -@@ -2544,10 +2543,6 @@ if (!is_android) { +@@ -2545,10 +2544,6 @@ if (!is_android) { sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ] } diff --git a/build/patches/00Fonts-fingerprinting-mitigation.patch b/build/patches/00Fonts-fingerprinting-mitigation.patch index 4dcec6e69..3ff6bcaf0 100644 --- a/build/patches/00Fonts-fingerprinting-mitigation.patch +++ b/build/patches/00Fonts-fingerprinting-mitigation.patch @@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -10012,6 +10012,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10016,6 +10016,11 @@ const FeatureEntry kFeatureEntries[] = { kClipboardMaximumAgeVariations, "ClipboardMaximumAge")}, diff --git a/build/patches/00Internal-firewall.patch b/build/patches/00Internal-firewall.patch index a47d6e27f..ef584397c 100644 --- a/build/patches/00Internal-firewall.patch +++ b/build/patches/00Internal-firewall.patch @@ -72,7 +72,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "services/media_session/public/cpp/features.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" -@@ -8122,6 +8123,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8126,6 +8127,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)}, #endif // !BUILDFLAG(IS_ANDROID) diff --git a/build/patches/00Keyboard-protection-flag.patch b/build/patches/00Keyboard-protection-flag.patch index ab8882ca6..84513606f 100644 --- a/build/patches/00Keyboard-protection-flag.patch +++ b/build/patches/00Keyboard-protection-flag.patch @@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3242,6 +3242,12 @@ const char kSystemKeyboardLockDescription[] = +@@ -3245,6 +3245,12 @@ const char kSystemKeyboardLockDescription[] = "keyboard shortcuts and have the events routed directly to the website " "when in fullscreen mode."; @@ -51,7 +51,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1833,6 +1833,9 @@ extern const char kSuppressToolbarCapturesDescription[]; +@@ -1836,6 +1836,9 @@ extern const char kSuppressToolbarCapturesDescription[]; extern const char kSystemKeyboardLockName[]; extern const char kSystemKeyboardLockDescription[]; diff --git a/build/patches/00Log-dangling-attributes-in-some-html-elements.patch b/build/patches/00Log-dangling-attributes-in-some-html-elements.patch index f410f7427..8524f9f1e 100644 --- a/build/patches/00Log-dangling-attributes-in-some-html-elements.patch +++ b/build/patches/00Log-dangling-attributes-in-some-html-elements.patch @@ -82,7 +82,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2564,8 +2564,26 @@ void Element::StripScriptingAttributes( +@@ -2550,8 +2550,26 @@ void Element::StripScriptingAttributes( attribute_vector.Shrink(destination); } diff --git a/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch b/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch index 04780056a..d2e180e82 100644 --- a/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch +++ b/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Add AllowUserCertificates flag diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9235,10 +9235,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9239,10 +9239,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kHttpsUpgrades)}, diff --git a/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch b/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch index cc99e8723..d7eb8ca90 100644 --- a/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch +++ b/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch @@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9462,11 +9462,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9466,11 +9466,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)}, #endif diff --git a/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch b/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch index 77525c2fe..01fcafaeb 100644 --- a/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch +++ b/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch @@ -42,7 +42,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -8158,9 +8158,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8162,9 +8162,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryLongpress)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch b/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch index 0007917d6..1033cac84 100644 --- a/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Restore Search Ready Omnibox flag diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9432,9 +9432,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9436,9 +9436,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDesksTemplatesDescription, kOsCrOS, FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)}, #endif diff --git a/build/patches/00Warning-message-for-unsupported-hardware-aes.patch b/build/patches/00Warning-message-for-unsupported-hardware-aes.patch index 6bd87268f..39b090b1e 100644 --- a/build/patches/00Warning-message-for-unsupported-hardware-aes.patch +++ b/build/patches/00Warning-message-for-unsupported-hardware-aes.patch @@ -111,7 +111,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7931,6 +7931,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7935,6 +7935,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDevicePostureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kDevicePosture)}, diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 057a625f4..6dc3e03f9 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9180,6 +9180,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9184,6 +9184,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kHttpsUpgrades)}, diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index daf13f0f5..97c2eca84 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9391,6 +9391,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9395,6 +9395,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 0cb385044..a65f2783e 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -1341,7 +1341,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4044,6 +4044,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -4047,6 +4047,12 @@ const char kOfflinePagesLivePageSharingDescription[] = "Enables to share current loaded page as offline page by saving as MHTML " "first."; @@ -1357,7 +1357,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2355,6 +2355,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[]; +@@ -2358,6 +2358,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[]; extern const char kOmahaMinSdkVersionAndroidMinSdk1Description[]; extern const char kOmahaMinSdkVersionAndroidMinSdk1000Description[]; diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index fdbd8f4d7..e6e98752c 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -834,7 +834,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9357,6 +9357,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9361,6 +9361,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -1346,7 +1346,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -7343,6 +7343,11 @@ const char kEnableAudioFocusEnforcementDescription[] = +@@ -7346,6 +7346,11 @@ const char kEnableAudioFocusEnforcementDescription[] = "any one time. Requires #enable-media-session-service to be enabled too."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1361,7 +1361,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -4243,6 +4243,9 @@ extern const char kEnableAudioFocusEnforcementName[]; +@@ -4246,6 +4246,9 @@ extern const char kEnableAudioFocusEnforcementName[]; extern const char kEnableAudioFocusEnforcementDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 34fe16946..8cc91cb1e 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2112,6 +2112,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -2115,6 +2115,10 @@ const char kUnthrottledNestedTimeoutDescription[] = "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1182,6 +1182,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -1185,6 +1185,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 1260c23ab..2631c7cbf 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -6475,6 +6475,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6479,6 +6479,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -32,7 +32,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3821,6 +3821,10 @@ const char kCCTTextFragmentLookupApiEnabledName[] = +@@ -3824,6 +3824,10 @@ const char kCCTTextFragmentLookupApiEnabledName[] = const char kCCTTextFragmentLookupApiEnabledDescription[] = "Enable CCT API to lookup text fragments"; diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 68409bc1a..10d55ca67 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4112,6 +4112,12 @@ const char kPolicyLogsPageAndroidDescription[] = +@@ -4115,6 +4115,12 @@ const char kPolicyLogsPageAndroidDescription[] = "Enable the new chrome://policy-logs page containing logs for debugging " "policy related issues on Android."; @@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2408,6 +2408,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -2411,6 +2411,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOnStartName[]; extern const char kQueryTilesOnStartDescription[]; extern const char kQueryTilesSingleTierName[]; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 0c90f812b..39516b711 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7943,6 +7943,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7947,6 +7947,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6959,6 +6959,9 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -6962,6 +6962,9 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -4227,6 +4227,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -4230,6 +4230,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 776f74ba8..fa1d9f458 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -9437,6 +9438,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9441,6 +9442,11 @@ const FeatureEntry kFeatureEntries[] = { kLargeFaviconFromGoogleVariations, "LargeFaviconFromGoogle")}, @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3691,6 +3691,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = +@@ -3694,6 +3694,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = "Skips starting the service worker and run the fetch handler if the fetch " "handler is recognized as skippable."; @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2140,6 +2140,9 @@ extern const char kReduceAcceptLanguageDescription[]; +@@ -2143,6 +2143,9 @@ extern const char kReduceAcceptLanguageDescription[]; extern const char kSkipServiceWorkerFetchHandlerName[]; extern const char kSkipServiceWorkerFetchHandlerDescription[]; diff --git a/build/patches/Allow-building-without-supervised-users.patch b/build/patches/Allow-building-without-supervised-users.patch index aa87eebaa..c5d3cc55b 100644 --- a/build/patches/Allow-building-without-supervised-users.patch +++ b/build/patches/Allow-building-without-supervised-users.patch @@ -75,7 +75,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kChromeRefresh2023Level1[] = {{"level", "1"}}; -@@ -7689,11 +7691,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7693,11 +7695,13 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index b029690a4..84a98372d 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3611,6 +3611,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = +@@ -3614,6 +3614,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = "When enabled, WebRTC will only use the Video Encode Accelerator for " "video resolutions inside those published as supported."; @@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2083,6 +2083,9 @@ extern const char kWebRtcRemoteEventLogDescription[]; +@@ -2086,6 +2086,9 @@ extern const char kWebRtcRemoteEventLogDescription[]; extern const char kWebrtcUseMinMaxVEADimensionsName[]; extern const char kWebrtcUseMinMaxVEADimensionsDescription[]; diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch index 8d62bb4f5..16003d7ce 100644 --- a/build/patches/Bromite-subresource-adblocker.patch +++ b/build/patches/Bromite-subresource-adblocker.patch @@ -438,7 +438,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -13752,6 +13752,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13770,6 +13770,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index ce029f0cf..2c0c06a39 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -542,7 +542,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b return ContentSettingsType::DEFAULT; } -@@ -508,6 +523,13 @@ base::StringPiece ContentSettingsTypeToGroupName(ContentSettingsType type) { +@@ -514,6 +529,13 @@ base::StringPiece ContentSettingsTypeToGroupName(ContentSettingsType type) { } } @@ -556,7 +556,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b NOTREACHED() << static_cast(type) << " is not a recognized content settings type."; return base::StringPiece(); -@@ -576,6 +598,13 @@ const std::vector& GetVisiblePermissionCategories() { +@@ -582,6 +604,13 @@ const std::vector& GetVisiblePermissionCategories() { base_types->push_back(ContentSettingsType::PRIVATE_NETWORK_GUARD); } diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index b329333c3..617f61d9d 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -6770,6 +6770,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6774,6 +6774,11 @@ const FeatureEntry kFeatureEntries[] = { "")}, #endif diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index 3f4bc8557..fb4785f77 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9395,6 +9395,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9399,6 +9399,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebMidiDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebMidi)}, @@ -55,7 +55,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -7360,6 +7360,10 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -7363,6 +7363,10 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) @@ -69,7 +69,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -4258,6 +4258,9 @@ extern const char kAutofillCreditCardUploadDescription[]; +@@ -4261,6 +4261,9 @@ extern const char kAutofillCreditCardUploadDescription[]; #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 60fd5a24d..fa76f141f 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -384,7 +384,7 @@ new file mode 100644 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9798,6 +9798,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9802,6 +9802,10 @@ const FeatureEntry kFeatureEntries[] = { features::kBrokerFileOperationsOnDiskCacheInNetworkService)}, #if BUILDFLAG(IS_ANDROID) @@ -398,7 +398,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3116,6 +3116,11 @@ const char kIsolateOriginsDescription[] = +@@ -3119,6 +3119,11 @@ const char kIsolateOriginsDescription[] = "Requires dedicated processes for an additional set of origins, " "specified as a comma-separated list."; @@ -413,7 +413,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1776,6 +1776,9 @@ extern const char kIsolateOriginsDescription[]; +@@ -1779,6 +1779,9 @@ extern const char kIsolateOriginsDescription[]; extern const char kIsolationByDefaultName[]; extern const char kIsolationByDefaultDescription[]; diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 0db374f3a..9778b402f 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -344,7 +344,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/version_info/version_info.h" #include "components/viz/common/features.h" #include "components/viz/common/switches.h" -@@ -8141,6 +8142,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8145,6 +8146,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryLongpress)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -358,7 +358,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -7195,6 +7195,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] = +@@ -7198,6 +7198,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] = "enabled in ash-chrome)."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -373,7 +373,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -4117,6 +4117,9 @@ extern const char kQuickCommandsDescription[]; +@@ -4120,6 +4120,9 @@ extern const char kQuickCommandsDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // defined (OS_FUCHSIA) diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index 6d15be2dc..b540d7f5c 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/browser_sync/browser_sync_switches.h" #include "components/browser_ui/site_settings/android/features.h" #include "components/browsing_data/core/features.h" -@@ -6384,6 +6385,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6388,6 +6389,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kQuickSettingsPWANotifications)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -77,7 +77,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3221,6 +3221,10 @@ const char kTabGroupsContinuationAndroidName[] = "Tab Groups Continuation"; +@@ -3224,6 +3224,10 @@ const char kTabGroupsContinuationAndroidName[] = "Tab Groups Continuation"; const char kTabGroupsContinuationAndroidDescription[] = "Allows users to access continuation features in Tab Group on phones."; @@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1826,6 +1826,9 @@ extern const char kCommerceMerchantViewerAndroidDescription[]; +@@ -1829,6 +1829,9 @@ extern const char kCommerceMerchantViewerAndroidDescription[]; extern const char kTabGroupsContinuationAndroidName[]; extern const char kTabGroupsContinuationAndroidDescription[]; diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index bf888f718..e20c1a363 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -1613,7 +1613,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7908,6 +7908,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7912,6 +7912,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)}, diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index c2d8ddf16..f677102ad 100644 --- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -131,7 +131,7 @@ diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browse diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9465,6 +9465,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9469,6 +9469,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(base::i18n::kLacrosMergeIcuDataFile)}, #endif @@ -148,7 +148,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3846,6 +3846,11 @@ const char kChimeAndroidSdkDescription[] = +@@ -3849,6 +3849,11 @@ const char kChimeAndroidSdkDescription[] = "Enable Chime SDK to receive push notification."; const char kChimeAndroidSdkName[] = "Use Chime SDK"; diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 1e62ea20c..249c261ac 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9342,6 +9342,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9346,6 +9346,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDesksTemplatesDescription, kOsCrOS, FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)}, #endif @@ -50,7 +50,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4255,6 +4255,11 @@ const char kSendTabToSelfV2Description[] = +@@ -4258,6 +4258,11 @@ const char kSendTabToSelfV2Description[] = "Enables new received tab " "UI shown next to the profile icon instead of using system notifications."; @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2476,6 +2476,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; +@@ -2479,6 +2479,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; extern const char kSendTabToSelfV2Name[]; extern const char kSendTabToSelfV2Description[]; diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index d6ac1ddb7..f1d95c8c8 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -331,7 +331,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4332,6 +4332,9 @@ const char kStartSurfaceWithAccessibilityName[] = +@@ -4335,6 +4335,9 @@ const char kStartSurfaceWithAccessibilityName[] = const char kStartSurfaceWithAccessibilityDescription[] = "Enable Start Surface with Accessibility."; @@ -344,7 +344,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2500,6 +2500,9 @@ extern const char kSlimCompositorDescription[]; +@@ -2503,6 +2503,9 @@ extern const char kSlimCompositorDescription[]; extern const char kSmartSuggestionForLargeDownloadsName[]; extern const char kSmartSuggestionForLargeDownloadsDescription[]; diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 5cd746159..028aa2cc8 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -142,7 +142,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4079,6 +4079,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] = +@@ -4082,6 +4082,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] = "flow. " "Only works with builds targeting Android T+."; @@ -156,7 +156,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2372,6 +2372,9 @@ extern const char kNetworkServiceInProcessDescription[]; +@@ -2375,6 +2375,9 @@ extern const char kNetworkServiceInProcessDescription[]; extern const char kNotificationPermissionRationaleName[]; extern const char kNotificationPermissionRationaleDescription[]; diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch index 58c6a2e03..e7fbda982 100644 --- a/build/patches/Revert-Delete-block-external-form-redirects.patch +++ b/build/patches/Revert-Delete-block-external-form-redirects.patch @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/translate/content/android/translate_message.h" #include "ui/android/ui_android_features.h" #else // BUILDFLAG(IS_ANDROID) -@@ -10018,6 +10019,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10022,6 +10023,12 @@ const FeatureEntry kFeatureEntries[] = { #endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3999,6 +3999,12 @@ const char kInstantStartName[] = "Instant start"; +@@ -4002,6 +4002,12 @@ const char kInstantStartName[] = "Instant start"; const char kInstantStartDescription[] = "Show start surface before native library is loaded."; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2324,6 +2324,9 @@ extern const char kInstanceSwitcherDescription[]; +@@ -2327,6 +2327,9 @@ extern const char kInstanceSwitcherDescription[]; extern const char kInstantStartName[]; extern const char kInstantStartDescription[]; diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 849baf2e5..c2f365a1a 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4130,6 +4130,10 @@ const char kReadLaterDescription[] = +@@ -4133,6 +4133,10 @@ const char kReadLaterDescription[] = "Allow users to save tabs for later. Enables a new button and menu for " "accessing tabs saved for later."; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2407,6 +2407,9 @@ extern const char kQueryTilesSegmentationDescription[]; +@@ -2410,6 +2410,9 @@ extern const char kQueryTilesSegmentationDescription[]; extern const char kQueryTilesSwapTrendingName[]; extern const char kQueryTilesSwapTrendingDescription[]; diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index fb1c9ff81..726e1a889 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2199,6 +2199,14 @@ const char kOmniboxActionsInSuggestDescription[] = +@@ -2202,6 +2202,14 @@ const char kOmniboxActionsInSuggestDescription[] = "Actions in Suggest permits optional Action Chips to be attached to " "Entity suggestions."; @@ -76,7 +76,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1243,6 +1243,13 @@ extern const char kOmitCorsClientCertDescription[]; +@@ -1246,6 +1246,13 @@ extern const char kOmitCorsClientCertDescription[]; extern const char kOmniboxActionsInSuggestName[]; extern const char kOmniboxActionsInSuggestDescription[]; diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch index 795b15840..84d804e99 100644 --- a/build/patches/Viewport-Protection-flag.patch +++ b/build/patches/Viewport-Protection-flag.patch @@ -34,7 +34,7 @@ The feature is controlled by a feature flag (default enabled) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -10101,6 +10101,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10105,6 +10105,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kDesktopPWAsAppHomePage)}, #endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) @@ -49,7 +49,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -7352,6 +7352,12 @@ const char kPaintPreviewDemoDescription[] = +@@ -7355,6 +7355,12 @@ const char kPaintPreviewDemoDescription[] = "previews."; #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -4249,6 +4249,9 @@ extern const char kPaintPreviewDemoName[]; +@@ -4252,6 +4252,9 @@ extern const char kPaintPreviewDemoName[]; extern const char kPaintPreviewDemoDescription[]; #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) diff --git a/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch b/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch index 7883a3407..73899e8de 100644 --- a/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch +++ b/build/patches/eyeo-beta-114.0.5735.53-v1-base.patch @@ -7595,7 +7595,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "../browser/apps/guest_view/app_view_browsertest.cc", "../browser/apps/guest_view/web_view_browsertest.cc", "../browser/apps/platform_apps/app_browsertest.cc", -@@ -2528,6 +2544,10 @@ if (!is_android) { +@@ -2529,6 +2545,10 @@ if (!is_android) { sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ] } @@ -7606,7 +7606,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn if (enable_reporting) { sources += [ "../browser/net/reporting_browsertest.cc" ] } -@@ -5606,6 +5626,7 @@ test("unit_tests") { +@@ -5607,6 +5627,7 @@ test("unit_tests") { # All unittests in browser, common, renderer and service. "../browser/about_flags_unittest.cc", "../browser/active_use_util_unittest.cc", @@ -7614,7 +7614,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "../browser/after_startup_task_utils_unittest.cc", "../browser/apps/icon_standardizer_unittest.cc", "../browser/apps/user_type_filter_unittest.cc", -@@ -6225,6 +6246,8 @@ test("unit_tests") { +@@ -6226,6 +6247,8 @@ test("unit_tests") { "//chrome/services/file_util:unit_tests", "//chrome/services/qrcode_generator/public/cpp", "//components/account_id", @@ -7623,7 +7623,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/assist_ranker/proto", "//components/autofill/content/browser:test_support", "//components/background_sync", -@@ -9580,6 +9603,7 @@ if (!is_android) { +@@ -9581,6 +9604,7 @@ if (!is_android) { public_deps = [ "//chrome/browser:test_support_ui", diff --git a/build/patches/eyeo-beta-114.0.5735.53-v1-extension_api.patch b/build/patches/eyeo-beta-114.0.5735.53-v1-extension_api.patch index 35e72dcdf..a6af43138 100644 --- a/build/patches/eyeo-beta-114.0.5735.53-v1-extension_api.patch +++ b/build/patches/eyeo-beta-114.0.5735.53-v1-extension_api.patch @@ -4260,7 +4260,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -3354,6 +3354,12 @@ if (!is_android) { +@@ -3355,6 +3355,12 @@ if (!is_android) { "//chrome/browser/extensions/api:native_messaging_test_echo_&_host", ] } diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index 862667f0b..28873f6c5 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -678,7 +678,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc -@@ -580,11 +580,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { +@@ -601,11 +601,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { // chrome-untrusted://new-tab-page for other external content and resources. // NOTE: Use caution when overriding content security policies as that cean // lead to subtle security bugs such as https://crbug.com/1251541. @@ -776,7 +776,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -6181,7 +6181,6 @@ test("unit_tests") { +@@ -6182,7 +6182,6 @@ test("unit_tests") { "//chrome/browser/favicon", "//chrome/browser/feature_guide/notifications:unit_tests", "//chrome/browser/first_party_sets",