From 699f7d1938968ea99b44c1d864182c674698acb6 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 2 Dec 2022 16:32:32 +0000 Subject: [PATCH 001/146] Update from Chromium 109.0.5414.25 to Chromium 110.0.5449.0. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 795693afc452..194ad174db58 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "109.0.5414.119", + "tag": "110.0.5449.0", "repository": { "url": "https://github.com/chromium/chromium" } From d5476278ab11ddcd7bffe5e62a8d1ebda12a9b9c Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:52:35 +0000 Subject: [PATCH 002/146] Conflict-resolved patches from Chromium 109.0.5414.25 to Chromium 110.0.5449.0. --- ...ase-trace_event-builtin_categories.h.patch | 6 ++--- patches/chrome-VERSION.patch | 8 +++---- patches/chrome-android-BUILD.gn.patch | 24 +++++++++---------- ...ync-settings-ManageSyncSettings.java.patch | 10 ++++---- ...e_picker-profile_picker_main_view.ts.patch | 8 +++---- ...de_detector-upgrade_detector_impl.cc.patch | 6 ++--- ...e_settings-SiteSettingsCategory.java.patch | 22 ++++++++--------- ...nts-infobars-core-infobar_delegate.h.patch | 6 ++--- ...x-browser-autocomplete_controller.cc.patch | 6 ++--- ...g-core-common-safe_browsing_prefs.cc.patch | 4 ++-- ...protocol-device_info_specifics.proto.patch | 10 ++++---- .../services-network-cookie_settings.cc.patch | 6 ++--- ...er-bindings-generated_in_modules.gni.patch | 8 +++---- ...renderer-bindings-idl_in_modules.gni.patch | 6 ++--- 14 files changed, 64 insertions(+), 66 deletions(-) diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index 371c936331ad..c41ecb227021 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,10 +1,10 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index a96b2338f39adb7f765d7c7a67eff8dbbdb991a5..977dbb4d1ce931bfba77b4170992ca2729c0969f 100644 +index 1c33c3345fd7dcc106576b239946be79eee45cb1..858072517301d569a2c5330498a158d68b0e0235 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -183,6 +183,7 @@ - X("WebCore") \ +@@ -184,6 +184,7 @@ X("webrtc") \ + X("webrtc_stats") \ X("xr") \ + BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES(X) /*see chromium_src*/ \ X(TRACE_DISABLED_BY_DEFAULT("android_view_hierarchy")) \ diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 6f2e4a7f8993..1cdd96c3ba1e 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index b7517548a6596e35de99564a190dbb877e981894..68614189bc31693c55d1d0a25d76284a2cfa8210 100644 +index bc5b8f16ab4321355e543cddbfa6b572e5856776..7cfcbf46922060cef150f27729ce4e32f9a73087 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=109 + MAJOR=110 -MINOR=0 --BUILD=5414 --PATCH=119 +-BUILD=5449 +-PATCH=0 +MINOR=1 +BUILD=49 +PATCH=59 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index fd50a2f830c5..2d8974c71a8c 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d238f968261 100644 +index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2fa8d7f01 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -243,6 +243,7 @@ if (current_toolchain == default_toolchain) { +@@ -239,6 +239,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -10,7 +10,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 } android_resources("chrome_app_java_resources") { -@@ -318,6 +319,7 @@ if (current_toolchain == default_toolchain) { +@@ -315,6 +316,7 @@ if (current_toolchain == default_toolchain) { "//third_party/androidx:androidx_gridlayout_gridlayout_java", "//third_party/androidx:androidx_preference_preference_java", ] @@ -18,15 +18,15 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 } if (enable_vr) { -@@ -718,6 +720,7 @@ if (current_toolchain == default_toolchain) { +@@ -716,6 +718,7 @@ if (current_toolchain == default_toolchain) { ] deps += feed_deps + deps += brave_chrome_java_deps srcjar_deps = [ - ":autofill_verification_status_generated_enum", -@@ -744,6 +747,7 @@ if (current_toolchain == default_toolchain) { + ":chrome_android_java_enums_srcjar", +@@ -740,6 +743,7 @@ if (current_toolchain == default_toolchain) { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -34,7 +34,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -885,6 +889,7 @@ if (current_toolchain == default_toolchain) { +@@ -881,6 +885,7 @@ if (current_toolchain == default_toolchain) { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -42,7 +42,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2102,6 +2107,7 @@ if (current_toolchain == default_toolchain) { +@@ -2099,6 +2104,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -2350,6 +2356,7 @@ if (current_toolchain == default_toolchain) { +@@ -2347,6 +2353,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2563,6 +2570,7 @@ if (current_toolchain == default_toolchain) { +@@ -2559,6 +2566,7 @@ if (current_toolchain == default_toolchain) { load_library_from_apk = chromium_linker_supported version_name = chrome_version_name @@ -66,7 +66,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 } } -@@ -2706,6 +2714,7 @@ if (current_toolchain == default_toolchain) { +@@ -2702,6 +2710,7 @@ if (current_toolchain == default_toolchain) { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -74,7 +74,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -2891,6 +2900,7 @@ if (current_toolchain == default_toolchain) { +@@ -2885,6 +2894,7 @@ if (current_toolchain == default_toolchain) { deps += [ "//weblayer/browser/java:upstream_java" ] } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 620f25f8ffe6..9b0b242b8d36 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 655fee00cfb3560e64b76a66757c1b131c3d8dd1..370dab9dcfd9135b045fc4d43b2654be02812a73 100644 +index 95c4dd94fadbbb56304bb0536e91eefbd14bae86..181dd93eea8696b366f13df9c5b11a30f71655c9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -24,7 +24,7 @@ import androidx.appcompat.app.AppCompatActivity; @@ -11,12 +11,12 @@ index 655fee00cfb3560e64b76a66757c1b131c3d8dd1..370dab9dcfd9135b045fc4d43b2654be import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -365,7 +365,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat - IdentityServicesProvider.get() +@@ -360,7 +360,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); + // May happen if account is removed from the device while this screen is shown. - if (signedInAccountName == null) { + if (false) { - // May happen if account is removed from the device while this screen is shown. - getActivity().finish(); + if (getActivity() != null) getActivity().finish(); return; + } diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch index f3448f7d762b..450df5141664 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -index 562e410db22fc0e1d9dc4edec11be1298e32f2f8..3fb00ff2df4b050dde9cf450ed7c426f6d1e4ee9 100644 +index 98373d10063d5eab1e0bc4dc177e4880548a515a..d0bc355902113afb740db81e2ec44a95be34c169 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -@@ -95,6 +95,7 @@ export class ProfilePickerMainViewElement extends +@@ -96,6 +96,7 @@ export class ProfilePickerMainViewElement extends if (!isProfileCreationAllowed()) { this.$.addProfile.style.display = 'none'; } + this.$.addProfile.style.borderRadius = '8px'; - } - override connectedCallback() { + this.addEventListener('view-enter-finish', this.onViewEnterFinish_); + } diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch index d608d79f6881..0f0b9862cd68 100644 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch @@ -4,10 +4,8 @@ index 3e6b2000510aea83c4844e7f6dfb13bebd345902..0c3c591fdcbc7ae1d64169a934d9fd9f +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc @@ -476,7 +476,7 @@ void UpgradeDetectorImpl::Init() { - // On Windows, only enable upgrade notifications for Google Chrome builds. - // Chromium does not use an auto-updater. --#if !BUILDFLAG(IS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) -+#if !BUILDFLAG(IS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OFFICIAL_BUILD) +-#if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS) ++#if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS) || defined(OFFICIAL_BUILD) // On macOS, only enable upgrade notifications if the updater (Keystone) is // present. diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch index 1ba16063c77d..e0a765becf07 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch @@ -1,26 +1,26 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -index f08c07401bf2e82bb9b38deff45f179ee39c8875..40fa5eab2ce0d2ad7c8269cb174247dae3e2454a 100644 +index da8164afe9fac05c7742b50d7d2fe8ae35da646c..8105834589d104b98609114d12068605e070a6bc 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -43,7 +43,7 @@ public class SiteSettingsCategory { - Type.JAVASCRIPT, Type.MICROPHONE, Type.NFC, Type.NOTIFICATIONS, Type.POPUPS, +@@ -48,7 +48,7 @@ public class SiteSettingsCategory { Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY, Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE, -- Type.FEDERATED_IDENTITY_API}) -+ Type.FEDERATED_IDENTITY_API, Type.AUTOPLAY}) + Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA, +- Type.NUM_ENTRIES}) ++ Type.NUM_ENTRIES, Type.AUTOPLAY}) @Retention(RetentionPolicy.SOURCE) public @interface Type { // All updates here must also be reflected in {@link #preferenceKey(int) -@@ -74,10 +74,11 @@ public class SiteSettingsCategory { - int AUTO_DARK_WEB_CONTENT = 23; - int REQUEST_DESKTOP_SITE = 24; +@@ -81,10 +81,11 @@ public class SiteSettingsCategory { int FEDERATED_IDENTITY_API = 25; -+ int AUTOPLAY = 26; + int THIRD_PARTY_COOKIES = 26; + int SITE_DATA = 27; ++ int AUTOPLAY = 28; /** * Number of handled categories used for calculating array sizes. */ -- int NUM_ENTRIES = 26; -+ int NUM_ENTRIES = 27; +- int NUM_ENTRIES = 28; ++ int NUM_ENTRIES = 29; } private final BrowserContextHandle mBrowserContextHandle; diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch index 57b30836fc06..0b8633b37901 100644 --- a/patches/components-infobars-core-infobar_delegate.h.patch +++ b/patches/components-infobars-core-infobar_delegate.h.patch @@ -1,11 +1,11 @@ diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h -index 9c26957e515756df49bf61486c92b2f97330d464..323ee720d5b46e752aa2d85774fa58b23e92e6a5 100644 +index 871bf785bf863ade7cdaa279a8c85626deb209a7..b689d147d12d8a745fb5667e9f33e78bce24323d 100644 --- a/components/infobars/core/infobar_delegate.h +++ b/components/infobars/core/infobar_delegate.h -@@ -180,6 +180,7 @@ class InfoBarDelegate { - SUPPORTED_LINKS_INFOBAR_DELEGATE_CHROMEOS = 109, +@@ -181,6 +181,7 @@ class InfoBarDelegate { AUTOFILL_VIRTUAL_CARD_ENROLLMENT_INFOBAR_DELEGATE_MOBILE = 110, TAILORED_SECURITY_SERVICE_INFOBAR_DELEGATE = 111, + CHROME_FOR_TESTING_INFOBAR_DELEGATE = 112, + BRAVE_INFOBAR_DELEGATE_IDENTIFIERS }; diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 6994a231def2..b4721cfa55d9 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index b8d4c7b5e588d43296acdcfcbd919c376d1976cc..8b413a805302380eb3b0863d0876324f040bfa9c 100644 +index 30dcfc8c8a045207171d5b6887bf82a55f5b8763..5f858eed720ba95057bb9f42cc2ea0df07a0723f 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -347,6 +347,7 @@ AutocompleteController::AutocompleteController( @@ -10,11 +10,11 @@ index b8d4c7b5e588d43296acdcfcbd919c376d1976cc..8b413a805302380eb3b0863d0876324f } // Providers run in the order they're added. Add `HistoryURLProvider` after // `SearchProvider` because: -@@ -993,6 +994,7 @@ void AutocompleteController::UpdateResult( +@@ -953,6 +954,7 @@ void AutocompleteController::UpdateResult( #if DCHECK_IS_ON() result_.Validate(); #endif // DCHECK_IS_ON() + BRAVE_AUTOCOMPLETE_CONTROLLER_UPDATE_RESULT // Below are all annotations after the match list is ready. - + if (!input_.IsZeroSuggest()) { diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index ecd25ac5a83b..2f67020af6d5 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc -index 12d10cc3059df7946a436561fc8b7b08bfe4af1a..f6b195d894ff3646c521455ada712e40b509ed4c 100644 +index 2c44c3d9c4622167aa861bd9efae678b49140d31..227b2020b4c54cbdcf3a608f108a5b2936788978 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc @@ -150,6 +150,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { @@ -9,4 +9,4 @@ index 12d10cc3059df7946a436561fc8b7b08bfe4af1a..f6b195d894ff3646c521455ada712e40 + BRAVE_IS_ENHANCED_PROTECTION_ENABLED // SafeBrowsingEnabled is checked too due to devices being out // of sync or not on a version that includes SafeBrowsingEnhanced pref. - return base::FeatureList::IsEnabled(kEnhancedProtection) && + return prefs.GetBoolean(prefs::kSafeBrowsingEnhanced) && diff --git a/patches/components-sync-protocol-device_info_specifics.proto.patch b/patches/components-sync-protocol-device_info_specifics.proto.patch index aa80fafbb76e..45cd64552eca 100644 --- a/patches/components-sync-protocol-device_info_specifics.proto.patch +++ b/patches/components-sync-protocol-device_info_specifics.proto.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/device_info_specifics.proto b/components/sync/protocol/device_info_specifics.proto -index bbced6284dd0f7611de6661c6be6322fca3d0705..b9614d3b9d8dac6cc959f4899c18421ae779408c 100644 +index 99fb9895edd4830129068f3f0d47714942d0be67..a989d86d2a2f2b589032eefc9b42b00e96a19c36 100644 --- a/components/sync/protocol/device_info_specifics.proto +++ b/components/sync/protocol/device_info_specifics.proto @@ -17,6 +17,7 @@ option optimize_for = LITE_RUNTIME; @@ -10,10 +10,10 @@ index bbced6284dd0f7611de6661c6be6322fca3d0705..b9614d3b9d8dac6cc959f4899c18421a // Information about a device that is running a sync-enabled Chrome browser. We // are mapping the per-client cache guid to more specific information about the -@@ -90,6 +91,7 @@ message DeviceInfoSpecifics { - ChromeVersionInfo chrome_version_info = 17; - GooglePlayServicesVersionInfo google_play_services_version_info = 18; - } +@@ -96,6 +97,7 @@ message DeviceInfoSpecifics { + + // The form factor of the device. + optional SyncEnums.DeviceFormFactor device_form_factor = 20; + optional BraveSpecificFields brave_fields = 1000; } diff --git a/patches/services-network-cookie_settings.cc.patch b/patches/services-network-cookie_settings.cc.patch index 396762d4212c..43cb43f9a938 100644 --- a/patches/services-network-cookie_settings.cc.patch +++ b/patches/services-network-cookie_settings.cc.patch @@ -1,12 +1,12 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_settings.cc -index 8aa5f5eb69f4eb0a2f5e2b67f3030ce7696b379f..33bbfccc611ebf1397dea7f0e1934e14facccb14 100644 +index 33169c2d85a48528ad105b2892a0fa0742f9a207..c4fe5e6b9e37ceb79921a4681d74e9a2091c6d09 100644 --- a/services/network/cookie_settings.cc +++ b/services/network/cookie_settings.cc -@@ -256,6 +256,7 @@ CookieSettings::GetCookieSettingWithMetadata(const GURL& url, +@@ -228,6 +228,7 @@ CookieSettings::GetCookieSettingWithMetadata( match) { cookie_setting = match->GetContentSetting(); found_explicit_setting = IsExplicitSetting(*match); + BRAVE_COOKIE_SETTINGS_GET_COOKIE_SETTINGS_INTERNAL } - if (cookie_setting != CONTENT_SETTING_BLOCK && !found_explicit_setting) { + bool allowed_by_storage_access_grant = false; diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index fc2be876e8e1..c8205aaf6554 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,10 +1,10 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index db72e5edb2f0ae5df1553acae5b6bfb16b30dcfd..6d6301548235252380998f0b70528c6156874b72 100644 +index 08c058b88ac7c23992979fdd400a8657b645b290..1589f01b63a4d7fadd0623a5d24408a950ee2646 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2600,6 +2600,7 @@ generated_interface_sources_in_modules = [ - "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", - "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h", +@@ -2616,6 +2616,7 @@ generated_interface_sources_in_modules = [ + "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc", + "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.h", ] +generated_interface_sources_in_modules += brave_generated_interface_sources_in_modules diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 578a8d1edf4c..f240a09ed098 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,9 +1,9 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index fec4479cbc6398a2e1c348f22b98339ae38a31be..894e500220b141fd77b88d2f7eb63c4d3e1e08ce 100644 +index bc608ab9820fd21c1010432ce25a2a63517e1d9f..6ece31bc8f8fcc733e29b8929a4c8748f3eadd7c 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1173,6 +1173,7 @@ static_idl_files_in_modules = get_path_info( - "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", +@@ -1175,6 +1175,7 @@ static_idl_files_in_modules = get_path_info( + "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ], "abspath") +static_idl_files_in_modules += get_path_info(brave_static_idl_files_in_modules, "abspath") From d89268533889a6559a082cc6b47b80ad283cd30e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:53:01 +0000 Subject: [PATCH 003/146] Update patches from Chromium 109.0.5414.25 to Chromium 110.0.5449.0. --- patches/base-BUILD.gn.patch | 4 ++-- .../base-test-launcher-test_results_tracker.cc.patch | 2 +- patches/base-threading-thread_restrictions.h.patch | 4 ++-- .../build-android-gyp-util-resource_utils.py.patch | 2 +- patches/build-config-BUILDCONFIG.gn.patch | 2 +- patches/build-config-android-BUILD.gn.patch | 2 +- .../build-config-android-internal_rules.gni.patch | 4 ++-- patches/build-config-android-rules.gni.patch | 6 +++--- patches/build-config-chrome_build.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 6 +++--- patches/chrome-android-chrome_java_sources.gni.patch | 4 ++-- .../chrome-android-chrome_public_apk_tmpl.gni.patch | 4 ++-- .../chrome-android-java-AndroidManifest.xml.patch | 10 +++++----- ...e-browser-TabbedModeTabDelegateFactory.java.patch | 4 ++-- ...owser-privacy-settings-PrivacySettings.java.patch | 6 +++--- patches/chrome-app-BUILD.gn.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 2 +- patches/chrome-browser-about_flags.cc.patch | 4 ++-- ...rome-browser-download-download_item_model.h.patch | 4 ++-- patches/chrome-browser-extensions-BUILD.gn.patch | 4 ++-- ...veloper_private-extension_info_generator.cc.patch | 4 ++-- ...-browser-extensions-extension_management.cc.patch | 4 ++-- ...hrome-browser-first_run-upgrade_util_win.cc.patch | 2 +- patches/chrome-browser-flags-BUILD.gn.patch | 4 ++-- patches/chrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- patches/chrome-browser-profiles-profile.cc.patch | 6 +++--- ...er_context_menu-render_view_context_menu.cc.patch | 4 ++-- ...browser-resources-history-history_item.html.patch | 2 +- .../chrome-browser-resources-settings-BUILD.gn.patch | 4 ++-- ...urces-settings-people_page-sync_controls.ts.patch | 2 +- ...ngs-privacy_page-personalization_options.ts.patch | 6 +++--- ...ces-settings-privacy_page-privacy_page.html.patch | 6 +++--- ...urces-settings-privacy_page-privacy_page.ts.patch | 2 +- .../chrome-browser-resources-settings-route.ts.patch | 4 ++-- ...rome-browser-resources-settings-settings.ts.patch | 2 +- ...owser-resources-settings-settings_routes.ts.patch | 4 ++-- ...llchecker-spellcheck_hunspell_dictionary.cc.patch | 4 ++-- ...chrome-browser-sync-sync_service_factory.cc.patch | 4 ++-- patches/chrome-browser-ui-BUILD.gn.patch | 6 +++--- ...hrome-browser-toolbar-top-ToolbarPhone.java.patch | 8 ++++---- ...rome-browser-toolbar-top-ToolbarTablet.java.patch | 2 +- patches/chrome-browser-ui-browser.cc.patch | 6 +++--- patches/chrome-browser-ui-browser_navigator.cc.patch | 6 +++--- ...owser-ui-dialogs-outdated_upgrade_bubble.cc.patch | 6 +++--- ...-ui-startup-startup_browser_creator_impl.cc.patch | 4 ++-- patches/chrome-browser-ui-tab_helpers.cc.patch | 2 +- .../chrome-browser-ui-tabs-tab_strip_model.h.patch | 4 ++-- ...er-ui-toolbar-recent_tabs_sub_menu_model.cc.patch | 2 +- ...ser-ui-toolbar-recent_tabs_sub_menu_model.h.patch | 2 +- ...ser-ui-views-bookmarks-bookmark_bar_view.cc.patch | 4 ++-- ...-ui-views-bookmarks-bookmark_bubble_view.cc.patch | 4 ++-- ...wser-ui-views-download-download_item_view.h.patch | 4 ++-- ...-ui-views-location_bar-location_bar_view.cc.patch | 4 ++-- ...r-ui-views-location_bar-location_bar_view.h.patch | 8 ++++---- ...iews-omnibox-omnibox_popup_contents_view.cc.patch | 4 ++-- ...r-ui-views-page_info-page_info_main_view.cc.patch | 4 ++-- ...-views-side_panel-side_panel_coordinator.cc.patch | 6 +++--- .../chrome-browser-ui-views-tabs-tab_strip.cc.patch | 2 +- patches/chrome-browser-ui-webui-BUILD.gn.patch | 4 ++-- ...-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch | 4 ++-- ...i-webui-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...rowser-ui-webui-extensions-extensions_ui.cc.patch | 4 ++-- ...ings-settings_localized_strings_provider.cc.patch | 4 ++-- ...ions-os_integration-web_app_shortcut_mac.mm.patch | 4 ++-- patches/chrome-common-BUILD.gn.patch | 6 +++--- patches/chrome-installer-mac-BUILD.gn.patch | 2 +- patches/chrome-installer-util-BUILD.gn.patch | 2 +- ...util-prebuild-create_installer_string_rc.py.patch | 4 ++-- patches/chrome-renderer-BUILD.gn.patch | 4 ++-- ...-renderer-chrome_content_renderer_client.cc.patch | 6 +++--- patches/chrome-test-BUILD.gn.patch | 4 ++-- .../chrome-test-data-webui-settings-BUILD.gn.patch | 4 ++-- ...mponents-bookmarks-browser-bookmark_model.h.patch | 4 ++-- ...i-site_settings-SingleCategorySettings.java.patch | 4 ++-- ...s-browser-page_specific_content_settings.cc.patch | 6 +++--- ...ents-content_settings-core-browser-BUILD.gn.patch | 4 ++-- ...rowser-content_settings_default_provider.cc.patch | 2 +- ...tings-core-browser-content_settings_pref.cc.patch | 2 +- ...s-core-browser-content_settings_registry.cc.patch | 4 ++-- ...nt_settings-core-browser-cookie_settings.cc.patch | 4 ++-- ...settings-core-common-cookie_settings_base.h.patch | 4 ++-- ...ngs-renderer-content_settings_agent_impl.cc.patch | 4 ++-- ...nload-internal-common-download_item_impl.cc.patch | 4 ++-- ...onents-embedder_support-user_agent_utils.cc.patch | 4 ++-- ...onents-history-core-browser-history_types.h.patch | 2 +- ...ent-browser_context_keyed_service_factory.h.patch | 4 ++-- patches/components-metrics-BUILD.gn.patch | 2 +- patches/components-omnibox-browser-BUILD.gn.patch | 4 ++-- ...nents-omnibox-browser-omnibox_edit_model.cc.patch | 2 +- ...word_manager-core-browser-login_database.cc.patch | 4 ++-- ...nents-permissions-permission_context_base.h.patch | 2 +- ...mponents-permissions-permission_uma_util.cc.patch | 2 +- ...ents-policy-tools-generate_policy_source.py.patch | 2 +- ...ts-search_engines-default_search_manager.cc.patch | 4 ++-- ...ts-search_engines-prepopulated_engines.json.patch | 4 ++-- .../components-sync-driver-sync_service_impl.h.patch | 2 +- ...mponents-sync-engine-sync_scheduler_impl.cc.patch | 4 ++-- .../components-sync-protocol-proto_visitors.h.patch | 6 +++--- ...mponents-sync-protocol-protocol_sources.gni.patch | 4 ++-- patches/components-sync_device_info-BUILD.gn.patch | 4 ++-- ...sync_device_info-device_info_sync_bridge.cc.patch | 12 ++++++------ ...ntent-renderer-per_frame_translate_agent.cc.patch | 2 +- patches/components-update_client-BUILD.gn.patch | 4 ++-- ...ponents-variations-variations_seed_store.cc.patch | 2 +- ...renderer_host-navigation_controller_impl.cc.patch | 4 ++-- ...browser-renderer_host-navigation_request.cc.patch | 6 +++--- ...owser-zygote_host-zygote_host_impl_linux.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- ...ent-public-browser-content_browser_client.h.patch | 4 ++-- patches/content-renderer-render_frame_impl.cc.patch | 4 ++-- patches/content-renderer-render_thread_impl.cc.patch | 4 ++-- ...-browser-api-web_request-web_request_api.cc.patch | 4 ++-- .../extensions-browser-sandboxed_unpacker.cc.patch | 4 ++-- .../extensions-common-api-_api_features.json.patch | 4 ++-- patches/net-BUILD.gn.patch | 4 ++-- patches/net-base-proxy_server.cc.patch | 2 +- ...tion-configured_proxy_resolution_service.cc.patch | 4 ++-- patches/sandbox-policy-win-sandbox_win.cc.patch | 4 ++-- .../services-network-cors-cors_url_loader.cc.patch | 4 ++-- patches/services-network-public-cpp-BUILD.gn.patch | 4 ++-- patches/third_party-blink-renderer-BUILD.gn.patch | 2 +- .../third_party-blink-renderer-core-BUILD.gn.patch | 4 ++-- ...nk-renderer-core-dom-events-event_target.cc.patch | 6 +++--- ...re-html-canvas-canvas_async_blob_creator.cc.patch | 4 ++-- ...rer-core-html-canvas-html_canvas_element.cc.patch | 4 ++-- ...ns_policy-permissions_policy_features.json5.patch | 4 ++-- ...blink-renderer-core-script-script_loader.cc.patch | 4 ++-- ...third_party-blink-renderer-modules-BUILD.gn.patch | 4 ++-- ...anvas-canvas2d-base_rendering_context_2d.cc.patch | 6 +++--- ...as-canvas2d-canvas_rendering_context_2d.idl.patch | 2 +- ...d-offscreen_canvas_rendering_context_2d.idl.patch | 2 +- ...les-csspaint-paint_rendering_context_2d.idl.patch | 2 +- ...nderer-modules-mediastream-media_devices.cc.patch | 4 ++-- ...k-renderer-modules-webaudio-audio_buffer.cc.patch | 10 +++++----- patches/tools-clang-pylib-clang-compile_db.py.patch | 4 ++-- patches/tools-gritsettings-resource_ids.spec.patch | 8 ++++---- ...ograms-metadata-histogram_suffixes_list.xml.patch | 4 ++-- patches/tools-perf-core-results_dashboard.py.patch | 4 ++-- patches/tools-perf-process_perf_results.py.patch | 2 +- ...sibility-platform-ax_platform_node_cocoa.mm.patch | 4 ++-- patches/ui-native_theme-native_theme_win.cc.patch | 4 ++-- patches/ui-webui-resources-BUILD.gn.patch | 4 ++-- ...webui-resources-cr_elements-cr_elements.gni.patch | 4 ++-- ...esources-cr_elements-cr_lottie-cr_lottie.ts.patch | 4 ++-- patches/v8/BUILD.gn.patch | 6 +++--- patches/v8/src-codegen-compiler.cc.patch | 4 ++-- 146 files changed, 290 insertions(+), 290 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index c45fb5d44112..a3ff52e29c01 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 7662d4fc550b95f1009596e05d5d4dc62db4991d..ba9869fb47f9b8b6267cc0bc2212716283656f2a 100644 +index d72367da30bbbfb7b024c0a90c9a257d10326e63..7070d5d4f82ed8700a77d80ff10258cc06b70f2c 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4371,6 +4371,7 @@ if (is_android) { +@@ -4300,6 +4300,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/base-test-launcher-test_results_tracker.cc.patch b/patches/base-test-launcher-test_results_tracker.cc.patch index 63042ea28da7..af9da1f4e233 100644 --- a/patches/base-test-launcher-test_results_tracker.cc.patch +++ b/patches/base-test-launcher-test_results_tracker.cc.patch @@ -1,5 +1,5 @@ diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc -index 9801c8db7fbac68b8539f783bc4e800156b9c203..71fd989e19c4f51fdbbe41540ac4dd3aaa050224 100644 +index ea2aa1ee0fe12c2d4ca8abd035eac9ba51a72830..aa9eb0aec39c1d9390d248707bdb3066b1d849cc 100644 --- a/base/test/launcher/test_results_tracker.cc +++ b/base/test/launcher/test_results_tracker.cc @@ -151,6 +151,7 @@ TestResultsTracker::~TestResultsTracker() { diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index 3ee2e86280f4..860f6a98deb5 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 24498ec63616e61b6bb208135454c36b2bbf0073..ee31d3cfae422b176cf5e8cda3c95efa6c5a4ab8 100644 +index e1b4f49733268390eec0c19de31d77906183f5c9..1a6a9aa672d40bc76b8eeed5d16718b8db72dc19 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -670,6 +670,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -671,6 +671,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/build-android-gyp-util-resource_utils.py.patch b/patches/build-android-gyp-util-resource_utils.py.patch index 6eaf7a6ae314..a8299dcea094 100644 --- a/patches/build-android-gyp-util-resource_utils.py.patch +++ b/patches/build-android-gyp-util-resource_utils.py.patch @@ -1,5 +1,5 @@ diff --git a/build/android/gyp/util/resource_utils.py b/build/android/gyp/util/resource_utils.py -index 84187dd8e3f0275e0a75c8c9cc595c837dd5d164..1497df8c917102d8debced055d53d46c3992e7bd 100644 +index 36d890417d5665de7b4ca48a4402fd6ff699a0c0..4cf64c6145f363f475aae61973b56249c4af1de7 100644 --- a/build/android/gyp/util/resource_utils.py +++ b/build/android/gyp/util/resource_utils.py @@ -256,6 +256,7 @@ class ResourceInfoFile: diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index af945b81ef57..d11f0c03f54a 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index a373e55a330f7c8f330be9f430c7e1f41ead42f7..6cb069af5e1d9596d45113dd762ea7cce5e0a7bb 100644 +index efba84719e620954fd093dcac4ce2c60b6b97def..6de9b34d81eeffa41b3c8643c5322a52436207d1 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -329,6 +329,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch index 144ba48b8b76..eda245d494a8 100644 --- a/patches/build-config-android-BUILD.gn.patch +++ b/patches/build-config-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn -index f8d2e95c0d4b98dc7cc943085e221a2f227a4f9d..b8e44c6dd9df93da5344469c28cec5ddd99af721 100644 +index efdd3826ea47055912cb8c2fd6c20f8d26ba993d..8b06b8a63a4bb4e66da52ddf6d6b007150f0ffee 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -39,6 +39,7 @@ config("compiler") { diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 0a1ed1df7084..7ef52f667560 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 656d711f0caf011bdf090e688f560aaf06f3fe7d..e76084a0b25c22f404789acb5d46f97f4b146671 100644 +index e0f8adc1b28e1dff12d1089ffaabd67250a297c2..85255e95334170d5c79f8faa84c21fdd7b97ae35 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -3924,6 +3924,7 @@ if (enable_java_templates) { +@@ -3898,6 +3898,7 @@ if (enable_java_templates) { } else { not_needed(invoker, [ "missing_classes_allowlist" ]) } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 11c9423073b9..cb269f090ff0 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 4ce915ee29a14a2f27419544db7d623edbeafa40..17937569a5628bacdad7072e8e122a20d8fe75b6 100644 +index 8a8aac68cead19e8e441ac88dc5980fd12b9da1b..ee7b22200e197443ef962a8866319373fe39becd 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -567,6 +567,7 @@ if (enable_java_templates && is_android) { +@@ -574,6 +574,7 @@ if (enable_java_templates && is_android) { # ] # } template("java_cpp_enum") { @@ -10,7 +10,7 @@ index 4ce915ee29a14a2f27419544db7d623edbeafa40..17937569a5628bacdad7072e8e122a20 action_with_pydeps(target_name) { forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ]) -@@ -742,6 +743,7 @@ if (enable_java_templates && is_android) { +@@ -749,6 +750,7 @@ if (enable_java_templates && is_android) { # output = "$target_gen_dir/AndroidManifest.xml" # } template("jinja_template") { diff --git a/patches/build-config-chrome_build.gni.patch b/patches/build-config-chrome_build.gni.patch index a63aad5771c5..6f17e1c56ba0 100644 --- a/patches/build-config-chrome_build.gni.patch +++ b/patches/build-config-chrome_build.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni -index 2207912e73af6a792abefd7ade4b5c36199387d8..e339972df8b6a2e9d4daf67a32be9daa237b5cda 100644 +index 0e755fb7ec097ebe3b81632fba509e2abc853173..c12127ba37549e16efb4d54f9b5a7420a4aff8c6 100644 --- a/build/config/chrome_build.gni +++ b/build/config/chrome_build.gni @@ -1,6 +1,7 @@ diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index dbc86d7e80f5..a69807195d4e 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index d5049a4e98a4c6969dab65edfeb97d26a594de47..c8662cacfffcad6a9031662426f1f8fa511c5c72 100644 +index 352c255cf67127a90b63ef654c3f033afb30de02..aef535566844700ac4c17b4258939180fc67faa1 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -179,6 +179,7 @@ if (!is_android && !is_mac) { @@ -93,7 +93,7 @@ index d5049a4e98a4c6969dab65edfeb97d26a594de47..c8662cacfffcad6a9031662426f1f8fa "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1448,7 +1458,7 @@ group("dependencies") { +@@ -1447,7 +1456,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -102,7 +102,7 @@ index d5049a4e98a4c6969dab65edfeb97d26a594de47..c8662cacfffcad6a9031662426f1f8fa output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1502,6 +1512,7 @@ group("resources") { +@@ -1501,6 +1510,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index e64c9fb03700..13f152456f37 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 7bccbeb001b623dfdbc38a968a91c2f8208a7139..5b7e32bced523b1626f0b863296afdd6dd025b07 100644 +index cb9d82225b5aa6cefe74aaaef3aaeea41651c9ef..fdcc92fcada3951abf6ba5739bef7e5db2e7809f 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1225,3 +1225,4 @@ chrome_java_sources = [ +@@ -1215,3 +1215,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 2100088a1380..619cf0dd32de 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 541d1cde3bfef9d3c6881c2d4260200d9be2eff0..afe36becb33eb579841a59f7a07d0b6dd7c834a4 100644 +index 29dd4a43f814facd5a562682822bba0144535b57..43d8220f14f4207748d1e53fb9cd607c61c49eb4 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -102,6 +102,7 @@ template("chrome_public_common_apk_or_module_tmpl") { @@ -10,7 +10,7 @@ index 541d1cde3bfef9d3c6881c2d4260200d9be2eff0..afe36becb33eb579841a59f7a07d0b6d # Note most of these, with the exception of resource_exclusion_exceptions, # are currently duplicated in system_webview_apk_tmpl.gni. -@@ -212,6 +213,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -202,6 +203,7 @@ template("chrome_public_common_apk_or_module_tmpl") { proguard_configs = [] } proguard_configs += [ "//chrome/android/proguard/main.flags" ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index b817482f5dfa..a3eafd2e8e01 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 1fc712f4ad2450200c4ef4f25b8e4fca9cd489c5..a174abbc26959f62492c460db5a4b682add68ec2 100644 +index f315d8b6d12bafeb27fb8e405d768d5ee4e0237e..13699795712560fb4bec1fcbd6cb3bcdfb3b679d 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -79,7 +79,7 @@ index 1fc712f4ad2450200c4ef4f25b8e4fca9cd489c5..a174abbc26959f62492c460db5a4b682 -@@ -896,6 +911,7 @@ by a child template that "extends" this file. +@@ -888,6 +903,7 @@ by a child template that "extends" this file. -@@ -908,6 +924,7 @@ by a child template that "extends" this file. +@@ -900,6 +916,7 @@ by a child template that "extends" this file. -@@ -1193,6 +1210,7 @@ by a child template that "extends" this file. +@@ -1185,6 +1202,7 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > @@ -103,7 +103,7 @@ index 1fc712f4ad2450200c4ef4f25b8e4fca9cd489c5..a174abbc26959f62492c460db5a4b682 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1271,6 +1289,7 @@ by a child template that "extends" this file. +@@ -1263,6 +1281,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch index 988ec331a3f9..9574a21dee72 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java -index 0cafc204be2965ddf9a98c31822c78e2205b9f00..8cd2c88704588d6d8ebf7834f016fcf08c2dd99f 100644 +index f0d594f3fe971aa6e16eb354f819c61976c7804a..2860a82ca42f29eb00273e704f164ca79e07576a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java -@@ -128,7 +128,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { +@@ -129,7 +129,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { @Override public ExternalNavigationHandler createExternalNavigationHandler(Tab tab) { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index bb1fc8546f50..53689cd0fc95 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,5 +1,5 @@ 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 -index ba173aab4353337bfcae1cb7f673d9c2bb4bb672..c71881cb2d36e9d2418a9efea378a3b87fe6e20d 100644 +index b5bcd0611dab95babc13ddba8527dc5d5968fae0..ff0821ac2663bb3065fa4163fa29890548c7582c 100644 --- 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 @@ -49,7 +49,7 @@ import org.chromium.ui.text.SpanApplier; @@ -11,7 +11,7 @@ index ba173aab4353337bfcae1cb7f673d9c2bb4bb672..c71881cb2d36e9d2418a9efea378a3b8 private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -255,6 +255,7 @@ public class PrivacySettings +@@ -264,6 +264,7 @@ public class PrivacySettings @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index ba173aab4353337bfcae1cb7f673d9c2bb4bb672..c71881cb2d36e9d2418a9efea378a3b8 MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(VectorDrawableCompat.create( -@@ -269,6 +270,6 @@ public class PrivacySettings +@@ -278,6 +279,6 @@ public class PrivacySettings null); return true; } diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 635cdaac76b8..59a476df482d 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index c5a087dd579741f563a51e07376cb0fc90ca3ac9..60de04a8f648a67283cc987fd3fc3e434d3501bf 100644 +index 2b3ce76e61bd910b72371657c0064cb218cb2343..7be8b937b55cad401745b68e118679eed7a94444 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -110,6 +110,8 @@ grit("generated_resources") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index fee51d509365..862021a16119 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index b0c78b2c69ee847c62aeb20d10b12cbe6e25499d..87cf75d5bbed90a1d399414225b24573fa3b4ee3 100644 +index e7757349a76a067c0010ffafdbc806aa5733cf56..a619156723c3034bafba4fd25bdb50ea7e15545d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2536,6 +2536,7 @@ static_library("browser") { diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 3feb1d72d229..90c7c1c79ab8 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 154b6d5c19cff77bec7da71af72e3eeb5bce8df5..1b0f87ff09fc1371de7a03bfa0c14c44ef76b01e 100644 +index d0336793772e2b4f35ee695406d3babe2e29bf17..9ac5a802c8257d4834c952d74ef771d96f0f673a 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3656,6 +3656,7 @@ const FeatureEntry::FeatureVariation kFastCheckoutVariations[] = { +@@ -3338,6 +3338,7 @@ const FeatureEntry::FeatureVariation // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch index 0db8aa43142a..458472a3759c 100644 --- a/patches/chrome-browser-download-download_item_model.h.patch +++ b/patches/chrome-browser-download-download_item_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h -index 8fb5ecf3c625314b63e05c04317ae8271a3e78b3..4701f9f4ece35c6ca88613310b582a2c96e8e93f 100644 +index c6facc5e19d3b04be0d03ba46a0936bececed558..21fab3dbe59bf0a922b8794b994d7ec7229268da 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h -@@ -140,6 +140,7 @@ class DownloadItemModel : public DownloadUIModel, +@@ -139,6 +139,7 @@ class DownloadItemModel : public DownloadUIModel, void OnDownloadDestroyed(download::DownloadItem* download) override; private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index ecfdc854fd6a..be81a32ba634 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 49ce3d94f576e468a8f6dff6d3b2decd8a24bea5..82397e878d6adc870cab3492b2ff13a91fb85a35 100644 +index edaeeb3bd0839805fa0634e1bcba86ca207ead0b..524b94a6728627e498049c8be1057c3370c69ba0 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1370,6 +1370,7 @@ static_library("extensions") { +@@ -1366,6 +1366,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch index bef770a004c4..7eb59204ac53 100644 --- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch +++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -index 9d2564b0106b6d892ec6e0955a80ced259295e0c..12a8d16ff2cb53d990e032ea1753ea7070c013f8 100644 +index a320a55a9e5ebe4b45a6b51426122417ba554528..2da94e0e18bd1b3b9dc8a1a2b185e8edf84cc08e 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -623,6 +623,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( +@@ -621,6 +621,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension); info->incognito_access.is_active = util::IsIncognitoEnabled(extension.id(), browser_context_); diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index f9133aa664c3..79b04493993a 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index e63c44e8f724a7f46e8754d489647236ed12d9fb..95f3ba7ea7efcbab5229c322bce69a141116e5f5 100644 +index 50c8b56325b3f417647550a14376dd1af39d1c9a..7920ab44e3c089c1381d77662e5e51b41115dc21 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -828,6 +828,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -864,6 +864,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch index 37f784954b2e..f4970fd86945 100644 --- a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch +++ b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc -index 3dc61391aad6f12e1ed61ae043c31cdde186fb1e..4075bd8a7db9a113fd8e0a0266a9a264eaf7d2c6 100644 +index ffafc6a291910b9d58856a41a7988d92db73d97b..58cf0f43a7b376a897cf6f3d8022a4ec5f30d7dc 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc @@ -44,7 +44,7 @@ diff --git a/patches/chrome-browser-flags-BUILD.gn.patch b/patches/chrome-browser-flags-BUILD.gn.patch index cb2d2650429f..5c02a1e15ed4 100644 --- a/patches/chrome-browser-flags-BUILD.gn.patch +++ b/patches/chrome-browser-flags-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn -index 998075fc2dd120acbcbd160283910d7e286d35a3..cc6292a28ad59610438bceb1876cefbfa321c74c 100644 +index a2ac4f30cd3167eb4123f95b48dd4c3d15c4bd95..6f611ec7cddb416317ae5b284f0b69df5f679b30 100644 --- a/chrome/browser/flags/BUILD.gn +++ b/chrome/browser/flags/BUILD.gn -@@ -34,6 +34,7 @@ android_library("java") { +@@ -33,6 +33,7 @@ android_library("java") { "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java", ] diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 5b6f7ef3a1b1..1ef3185a39c0 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index b0fd561c06612be55aa5910c69311ede168230ac..b08f04aeeed7d2da4747538cef026f313c133cf3 100644 +index f82adfafb10ec8f3dca919330faf609b84d861be..b36b3888ba75da2e35e5de7d50f60be0dbe2b5fd 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1269,6 +1269,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1275,6 +1275,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -11,7 +11,7 @@ index b0fd561c06612be55aa5910c69311ede168230ac..b08f04aeeed7d2da4747538cef026f31 #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) screen_ai::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -@@ -1645,6 +1647,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1656,6 +1658,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif registry->RegisterTimePref(prefs::kDIPSTimerLastUpdate, base::Time()); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 307f9e758704..3947cf346a4c 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index a82af67cd3afb6584b84d7355d463460e1af6636..57eef07bc0ec9a819677c42a3f4e5ff001dd04a2 100644 +index c5939574f25149b9c8c5992a5be7ba1ae1978b08..a6d45aeb092951045212870414185687e55c30a6 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -103,6 +103,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { +@@ -104,6 +104,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { // DevTools::BrowserContext, MediaRouter::Presentation, and // CaptivePortal::Signin are exceptions to this ban. if (*this == PrimaryID() || @@ -10,7 +10,7 @@ index a82af67cd3afb6584b84d7355d463460e1af6636..57eef07bc0ec9a819677c42a3f4e5ff0 base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix, base::CompareCase::SENSITIVE) || base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix, -@@ -302,7 +303,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -303,7 +304,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 657fcde1d563..748efa12c372 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 3718ed86606d6ee7388491c6ba9213c079fe512b..b051e414fff846e44b839882c79bc5e4197ac167 100644 +index b853d43a90d133d241215521ab5a740803aa51cc..713fe1626215a9dafe071c32e3cdb14219aca09f 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1938,6 +1938,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1939,6 +1939,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-resources-history-history_item.html.patch b/patches/chrome-browser-resources-history-history_item.html.patch index 84082adac912..96255cdb9a60 100644 --- a/patches/chrome-browser-resources-history-history_item.html.patch +++ b/patches/chrome-browser-resources-history-history_item.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_item.html b/chrome/browser/resources/history/history_item.html -index 3254453e4b20486fd7ce1bfb5622d1ca6b688eaa..67135e6dde3f6c899e937f58729b90e9d684d8ad 100644 +index dcc88249b65e1346a3c08faa67b277d33e023979..2682a30cb6ef43276aed2432cb8609c0d55b9a87 100644 --- a/chrome/browser/resources/history/history_item.html +++ b/chrome/browser/resources/history/history_item.html @@ -1,4 +1,4 @@ diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 5bdc19320d33..c34cf7a04dfe 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 3b79a77b102bc67b9cfb751db2a19eff08502dad..899778629dfc0f528e19b1fbf3636289350c0c49 100644 +index 176339319efca6b412f28178ad383f002f44df2b..f558b2a01e465fb90e04b760366b237b68805de5 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -489,4 +489,5 @@ build_webui("build") { +@@ -490,4 +490,5 @@ build_webui("build") { "lazy_load.rollup.js|lazy_load.js", ] } diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch index 2a4b45b9cef4..f48c17b1ef3a 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts -index ce20540fa73c662cd375b0c54dd206852f32021d..35467cb443138bbd0113b56aa205120b80997102 100644 +index 844af33fb424c61ebae7dca47a47fe378faf6c70..8b0abd622ecc1fcf708f968a4c538f24d6e5f220 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts @@ -100,7 +100,7 @@ export class SettingsSyncControlsElement extends diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch index 6dbcf7346020..e8d74e469f82 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -index d6b00eff7e54916680ba062b67491ec0728e3ecc..60c8fcff449dd746cd47b2a49f7f47cfcc661c3e 100644 +index 1df73c6137852f3b0a88f0caf89c2308c7dfed15..d8ce10c0682a42fa27bc7476703ccf86046b9ff1 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts @@ -76,7 +76,7 @@ export class SettingsPersonalizationOptionsElement extends @@ -20,7 +20,7 @@ index d6b00eff7e54916680ba062b67491ec0728e3ecc..60c8fcff449dd746cd47b2a49f7f47cf private metricsReportingPref_: chrome.settingsPrivate.PrefObject; private showRestart_: boolean; // -@@ -176,7 +176,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -173,7 +173,7 @@ export class SettingsPersonalizationOptionsElement extends override ready() { super.ready(); @@ -29,7 +29,7 @@ index d6b00eff7e54916680ba062b67491ec0728e3ecc..60c8fcff449dd746cd47b2a49f7f47cf const setMetricsReportingPref = (metricsReporting: MetricsReporting) => this.setMetricsReportingPref_(metricsReporting); this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref); -@@ -210,7 +210,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -207,7 +207,7 @@ export class SettingsPersonalizationOptionsElement extends } // diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index cfe5300acf93..7a6167843bed 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 6b67b92c57910fd9278fab8e9c5b981b13c48910..a6477de928b8f1cc5d3b8cf0f39054e1e14705db 100644 +index ce286a2faf3513c87deb87e1700185765af3d99a..8eaca562c4f83974cc65430fb871e49796739558 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -40,6 +40,7 @@ @@ -10,7 +10,7 @@ index 6b67b92c57910fd9278fab8e9c5b981b13c48910..a6477de928b8f1cc5d3b8cf0f39054e1 @@ -18,7 +18,7 @@ index 6b67b92c57910fd9278fab8e9c5b981b13c48910..a6477de928b8f1cc5d3b8cf0f39054e1 diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index 9bf861e93269..a8c704c044fb 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index 190c02848350e441232fe27f276ce7e8c0c91536..4b3a00dcbb53423a34dc4386e0fc592580814c23 100644 +index 949e389b315b8ec376760566a58bf00be074ecce..070859055d3b68692b2b13bbc56e72e6c177ed30 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index 5015a9bc58e9..a193fb353295 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index ad75a39061a033b398018af1a23740202574e1fc..7fe39f2b3df0315098c574c974b6e9fc29436cf9 100644 +index ca294b85461294b60284d6fbd31045e161299bb2..4222298d7accbfd49a9a049a04a94e3f1d516cae 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; @@ -10,7 +10,7 @@ index ad75a39061a033b398018af1a23740202574e1fc..7fe39f2b3df0315098c574c974b6e9fc /** * Add all of the child routes that originate from the privacy route, * regardless of whether the privacy section under basic or advanced. -@@ -242,6 +243,7 @@ function createBrowserSettingsRoutes(): Partial { +@@ -252,6 +253,7 @@ function createBrowserSettingsRoutes(): Partial { loadTimeData.getString('performancePageTitle')); } } diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 867cfef68f0a..845f0651487e 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index acd9c8edbbc9baac21323a677c40a98f886b80d4..b9a2c0aaa26ec281c8e13dd198db4dfef9227f60 100644 +index db3501869457f3a66c32f4cbae4352f371fe1e5b..9287ed50e50327fcea4e8e98d92b7525001b47b2 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_routes.ts.patch b/patches/chrome-browser-resources-settings-settings_routes.ts.patch index c35274310684..f8b7e6ac164d 100644 --- a/patches/chrome-browser-resources-settings-settings_routes.ts.patch +++ b/patches/chrome-browser-resources-settings-settings_routes.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts -index 2bace34bfad3d4b592a15514f6a0075bd611ac72..72ed64ed0385be5c7141516e3cbbcc4ab76b9882 100644 +index fc0ce321326d92d8268510f743c0812f981dc303..9330a79ad067b74e447dbccbf43ba1e870f594df 100644 --- a/chrome/browser/resources/settings/settings_routes.ts +++ b/chrome/browser/resources/settings/settings_routes.ts -@@ -89,4 +89,5 @@ export interface SettingsRoutes { +@@ -93,4 +93,5 @@ export interface SettingsRoutes { SYNC_ADVANCED: Route; SYSTEM: Route; TRIGGERED_RESET_DIALOG: Route; diff --git a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch index 855bb2c6bce1..9c64007029e7 100644 --- a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch +++ b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -index 6bb7c9948ea58a7579f1b4d82edba889163df938..d5ef12ec154ad99e9049a8ef1738582405682db5 100644 +index c331a7935eb07152c706c7e2bfc20cd29a33dfd2..ac96cd2f13420e73da455728a3f21e9f875dafa2 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -@@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() { +@@ -277,7 +277,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() { DCHECK(!bdict_file.empty()); static const char kDownloadServerUrl[] = diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index 970cecf7ec97..0a139ca59dcf 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index 1598ab3cbf4500710e79cf8edc9dd2d32cee027c..c6f41b76189f3e1cb57eb5085538688032fefd88 100644 +index 6aedbbd29d15a14576acf68f6844399704aa2a32..255eff287f14355a598ee7e731f96ccb352ff644 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -166,7 +166,7 @@ std::unique_ptr BuildSyncService( +@@ -172,7 +172,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 8831a0c9ff9b..3cc89775ea83 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 57133a0b9c92a6080bce58578918ad07ed94b6fb..693766377cb9927425d42b2879f924addde0d849 100644 +index 011506ee4df759f9ca3ef8971a9f43cf778e608f..6ce0f9bf3092d0848e83864a7e05f84229017928 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -668,6 +668,7 @@ static_library("ui") { +@@ -671,6 +671,7 @@ static_library("ui") { "//ui/webui", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 57133a0b9c92a6080bce58578918ad07ed94b6fb..693766377cb9927425d42b2879f924ad # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -4001,10 +4002,13 @@ static_library("ui") { +@@ -4007,10 +4008,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index d257cd1ea76c..940b27b2fe19 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index bca927c701800b57ed12de030b231610ded7a658..ef1d0f76fb9812bcb6c0386f352a87bbbeda80c0 100644 +index 621c04cfe2e0522a0db4681e189afb5f5a48a520..1e05efcae031d5e28426e439c3a756625ba047b4 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java @@ -395,6 +395,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC @@ -18,7 +18,7 @@ index bca927c701800b57ed12de030b231610ded7a658..ef1d0f76fb9812bcb6c0386f352a87bb } @Override -@@ -1015,6 +1017,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -1016,6 +1018,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC * New Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -26,7 +26,7 @@ index bca927c701800b57ed12de030b231610ded7a658..ef1d0f76fb9812bcb6c0386f352a87bb TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (mOptimizationsEnabled && isInTabSwitcherMode()) return; -@@ -1325,6 +1328,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -1326,6 +1329,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC canvas.restore(); } @@ -34,7 +34,7 @@ index bca927c701800b57ed12de030b231610ded7a658..ef1d0f76fb9812bcb6c0386f352a87bb // Draw the tab stack button and associated text if necessary. if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null && mUrlExpansionFraction != 1f) { -@@ -2055,6 +2059,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2057,6 +2061,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index fbc30ee68bbb..c70da5652708 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index dcf9b9f88b88cb14ed0797b43e6719452d2180b3..502b3b8a191f7256b1a0ca8aaf031d6d6fd0910a 100644 +index 19b92b406c56d6909386b8eed4ea2624f4c8544a..eb22a7e29a02ace9622ce515a6b7d44b32b7d97a 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java @@ -353,10 +353,12 @@ public class ToolbarTablet diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 508577293b36..8d9ce01a4046 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index f0789647f62c8cfa8bef0eff8dd1a8a25cdf3af3..a7539749c37abd8bb2b0ac4f3fd8a26ddc793446 100644 +index 924ab1bc6dd5fd26e18e7b713d69a100c1693fed..e86c712d37a6878b052fd720c1191d049cc5d371 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -449,6 +449,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -448,6 +448,7 @@ Browser* Browser::Create(const CreateParams& params) { // not possible, e.g. using the wrong profile or during shutdown. The caller // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index f0789647f62c8cfa8bef0eff8dd1a8a25cdf3af3..a7539749c37abd8bb2b0ac4f3fd8a26d return new Browser(params); } -@@ -459,7 +460,7 @@ Browser::Browser(const CreateParams& params) +@@ -458,7 +459,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 05923d7d8b76..b935ad83583e 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index 6048fa087031e5769066234aa222f4a6affb1469..8989a1ba142496cba40401ef78985b3f5ca3c2a9 100644 +index 87d213f687b980c487afac97e56f202890bc955a..dbd1b15b447e9432833b283739aee77f41467c84 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc -@@ -592,6 +592,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -594,6 +594,7 @@ base::WeakPtr Navigate(NavigateParams* params) { // Block any navigation requests in locked fullscreen mode. return nullptr; } @@ -10,7 +10,7 @@ index 6048fa087031e5769066234aa222f4a6affb1469..8989a1ba142496cba40401ef78985b3f // Open System Apps in their standalone window if necessary. // TODO(crbug.com/1096345): Remove this code after we integrate with intent -@@ -885,6 +886,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -889,6 +890,7 @@ base::WeakPtr Navigate(NavigateParams* params) { bool IsHostAllowedInIncognito(const GURL& url) { std::string scheme = url.scheme(); base::StringPiece host = url.host_piece(); diff --git a/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch b/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch index 1d4fcb85a687..8b31643acbea 100644 --- a/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch +++ b/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -index c28befcb3b7bedb824f11c7637c6404c7ce8aa7c..0a89e05f28cb1e35f5934f154e31b4f3a65b6edf 100644 +index 598436e3f4d41c67845d1249e01b1b958461d6eb..8eaa09f925d55f2797a5d57ea6dc50ba5d358afb 100644 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -@@ -42,6 +42,8 @@ constexpr int kNumIgnoredBuckets = 5; +@@ -35,6 +35,8 @@ namespace { // we redirect to the safetyCheck page that interacts with these. On other // platforms it may be possible to download an updated browser via a site. const char* kUpdateBrowserRedirectUrl = @@ -11,7 +11,7 @@ index c28befcb3b7bedb824f11c7637c6404c7ce8aa7c..0a89e05f28cb1e35f5934f154e31b4f3 #if BUILDFLAG(IS_CHROMEOS_LACROS) // The URL to be used to update Lacros-Chrome when auto-update failed // for too long. -@@ -51,6 +53,7 @@ const char* kUpdateBrowserRedirectUrl = +@@ -44,6 +46,7 @@ const char* kUpdateBrowserRedirectUrl = // too long. "https://www.google.com/chrome"; #endif diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 73762dd30b4b..01a4e08ff611 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 8cae23dbdf22fd75e675df444eef31012276b19d..1d9f1e35f2e346c1e35a70fba0ae493e15e9e4b2 100644 +index 6d143c95ad464e6d6817c710b90b48683dc7d038..37d89380ddb1ba977e8152ab0acf5f355edcbf14 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -398,6 +398,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -400,6 +400,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #elif !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 2dc9094a5d15..d5fced0bdd24 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 4b567389677bf4317392f4fbafacd7a6ef0aa618..237f8240308b9599e032a6955ce88435185c7d93 100644 +index 76d68bdd8cab6ea7eaa935a888246ecf9b221bcd..7d76a05196101ec2569ddd8bfb211398042c75b9 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -669,4 +669,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index 65accff23eaf..9be09d5825cf 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index 6788ae30d7dad86807f3312f27fb4e70317b0e3b..024702c8c15faffd8325fa073e5136d40bfa7958 100644 +index 7a302f36af0aa848f8d9beeca47d38a97390b45b..3a21cb79a88ba0f0613a8e4047ccc584833562da 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -576,6 +576,7 @@ class TabStripModel : public TabGroupController { +@@ -577,6 +577,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 51a18011edd6..e343ac8d8d0f 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index eb31c740b7ab8f40479a6bd67c49a18f1b239004..2566152d4eedcd0e5d5a237fdbe261ae0a554ee5 100644 +index 432868354db241d36ee41e9e5ca191edfb504670..3ecc839ad67d3f7f2845476a39fc9080a5c5a0c9 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -465,6 +465,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch index 8ceed7bdbfd6..d8857e21a273 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h -index e37f57270399ed2def9c4615f1a00e1495159bf8..cfa0ddbd789f07b7b8f02849dd2bc1cfea506229 100644 +index 4067c3d35ae1f7078216ef5c7e3959119eaf1b10..f47abf151b042e6f35c25bb1164303b583b78e38 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h @@ -85,6 +85,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 2ea067318a7e..001a3dc9b9fd 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 224bd1a4d300a7116ecf1e319235b5bf25882edd..d06b87a4531880d6736072d3e603f96e54d20aae 100644 +index 7e90858799459b817c4a7b333ccbe09b08d70b50..1091a3915ac3fe116950fe75396928572dd250e3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -856,6 +856,7 @@ void BookmarkBarView::Layout() { +@@ -855,6 +855,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index 4f4376f3a2f3..31ea70dc0b6b 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -index 8b3bb9ad459b7e61b1f05de0ef2c2afae900bd49..44f5eb8364646f227b0a96e9fc780e2c2caba5ba 100644 +index 9e653a8596eb4d143ac67ebe6982f979eaa48a97..c313db66032b4221ed369949feb387776595956e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -@@ -260,6 +260,7 @@ void BookmarkBubbleView::ShowBubble( +@@ -263,6 +263,7 @@ void BookmarkBubbleView::ShowBubble( dialog_model_builder.Build(), anchor_view, views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch index c88490e63c13..b7821bf1c833 100644 --- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch +++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h -index a9fd8f718b6e30d7643a355cf37ff04ccb9ea0d1..0d172a0ac525e03ed02fdec6ad5dac6868867756 100644 +index 7095b01c2a59595fd1d09bc164059a02e864e9e6..8dc69aeb6585066d36c1fd6db66cd55fa8947324 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h -@@ -118,6 +118,7 @@ class DownloadItemView : public views::View, +@@ -113,6 +113,7 @@ class DownloadItemView : public views::View, void OnPaintBackground(gfx::Canvas* canvas) override; void OnPaint(gfx::Canvas* canvas) override; void OnThemeChanged() override; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 16d4f601f0b8..c9ef1ce47497 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index d30583033d7bfc6297531641591cd2b334b1ffdc..972037299c2df541d71df0de4c5a25ff07dcd445 100644 +index b7499d1bd46f38f64ee7c92d95dfef7b1133a000..0a5cd14c092ae77ae028f3615df241471dd747f4 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -677,6 +677,7 @@ void LocationBarView::Layout() { +@@ -674,6 +674,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index 42dc530d1801..6500077d2f41 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index 91e4dd5077ddd94cece44bb544a3b5d991ce2644..da0acd7f1c261521d54f3b4887984c25823fb5a7 100644 +index 9abf4d8bd0c48c7f37874820efd267fd2f1c30a8..7445899639666d8cd50ee8a1f714446e9bdb4ccf 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h -@@ -112,6 +112,7 @@ class LocationBarView : public LocationBar, +@@ -114,6 +114,7 @@ class LocationBarView : public LocationBar, int GetBorderRadius() const; // Initializes the LocationBarView. @@ -10,7 +10,7 @@ index 91e4dd5077ddd94cece44bb544a3b5d991ce2644..da0acd7f1c261521d54f3b4887984c25 void Init(); // True if this instance has been initialized by calling Init, which can only -@@ -164,6 +165,7 @@ class LocationBarView : public LocationBar, +@@ -166,6 +167,7 @@ class LocationBarView : public LocationBar, // Updates the controller, and, if |contents| is non-null, restores saved // state that the tab holds. @@ -18,7 +18,7 @@ index 91e4dd5077ddd94cece44bb544a3b5d991ce2644..da0acd7f1c261521d54f3b4887984c25 void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -248,6 +250,7 @@ class LocationBarView : public LocationBar, +@@ -252,6 +254,7 @@ class LocationBarView : public LocationBar, std::vector& GetContentSettingViewsForTest() { return content_setting_views_; } diff --git a/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch b/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch index e8bc769f5c76..800a89a9babe 100644 --- a/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch +++ b/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc -index a2f392fb2f873386178c42dfc5857ca87c119c3e..0937e53b187428e4a88571ee80fc87af1b274b3e 100644 +index 93949fd1aa1dcc712f29788fd0392daf1c0532b0..1cc0dc99eaa48fb4ff004c68e9fd80a1a14229db 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc -@@ -348,7 +348,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() { +@@ -345,7 +345,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() { if (children().size() == i) { AddChildView(std::make_unique( i, edit_model_, diff --git a/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch index b7f8a1d95cf7..6c8d25bbe019 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc -index 9bf773fc5b447938986a53c5f22f3bc7bbd9f83c..a326b5c50332996ce42060b2d252497ff4ea26f4 100644 +index d70c6353eb971864719757a41a8d3c17bd4c210a..7760981a5fd0c6211e54ca96129939405bf958f1 100644 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc -@@ -526,6 +526,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const { +@@ -535,6 +535,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const { if (site_settings_view_) { width = std::max(width, site_settings_view_->GetPreferredSize().width()); width = std::max(width, permissions_view_->GetPreferredSize().width()); diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch index 1b03c0507415..cf603a4fb54a 100644 --- a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch +++ b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc -index bc3d6fa03f045a76967782b6f408c685c87d195c..6f57b34927df50a82094be3054398fe576151b30 100644 +index 8de644670c5f587375cde2320b718427480f210b..e79698cce5bec175db064d79ba18097edb0f3a18 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc -@@ -182,6 +182,7 @@ SidePanelCoordinator::~SidePanelCoordinator() { +@@ -184,6 +184,7 @@ SidePanelCoordinator::~SidePanelCoordinator() { void SidePanelCoordinator::Show( absl::optional entry_id, absl::optional open_trigger) { @@ -10,7 +10,7 @@ index bc3d6fa03f045a76967782b6f408c685c87d195c..6f57b34927df50a82094be3054398fe5 if (entry_id.has_value()) { Show(SidePanelEntry::Key(entry_id.value()), open_trigger); } else { -@@ -554,6 +555,7 @@ std::unique_ptr SidePanelCoordinator::CreateHeader() { +@@ -558,6 +559,7 @@ std::unique_ptr SidePanelCoordinator::CreateHeader() { ChromeDistanceMetric::DISTANCE_SIDE_PANEL_HEADER_VECTOR_ICON_SIZE))); header_close_button->SetFocusBehavior(views::View::FocusBehavior::ALWAYS); diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index 7e33ed3a9a20..ef9e93ec51b4 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index 6421ed000b94945ca624054d8cf0da6224e6b9f3..ab61b95c23260a3b29a197bd6a10bf5c030a1a34 100644 +index f4a7d92d80170c09fc5f4c716458469314f230d8..eef3f6d7f340d1f4023d23278813f853a9002b0a 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -493,6 +493,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, diff --git a/patches/chrome-browser-ui-webui-BUILD.gn.patch b/patches/chrome-browser-ui-webui-BUILD.gn.patch index 9049e3159b69..b44e10f6d24e 100644 --- a/patches/chrome-browser-ui-webui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-webui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn -index 44228b02c933822705d0076edd73ebf9e7984813..929a84f603344c8cd1de24abd29f90ad2f6dba2b 100644 +index 71d034edb5b657b20bd0128d7a3360db973009d0..d5e89aafc6c1d8a928b09c7d59bdb4fb75e83a3f 100644 --- a/chrome/browser/ui/webui/BUILD.gn +++ b/chrome/browser/ui/webui/BUILD.gn -@@ -69,4 +69,5 @@ source_set("configs") { +@@ -70,4 +70,5 @@ source_set("configs") { deps += [ "//ash/webui/sample_system_web_app_ui" ] } } diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch index 27419e8086ac..93199e1218b7 100644 --- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -index 4babca918a75c21e99b3c6e7ba4262ac65f743f1..14b794591e3c8ee4a14283a4f0cdb62e9f26c570 100644 +index 6bd71ecf31afe27120fb5122f6960ae2c9c95f50..5de2012e91ceb4efde5573f04f02746282d8e243 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -@@ -128,6 +128,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { +@@ -129,6 +129,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { for (const auto& str : kStrings) AddLocalizedString(source, str.name, str.id); diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index ba412602fe9b..9f8816d45fcc 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index 2cf9f47ce495c6737366585b11087861c20563b2..028b24185ea3e42584aa3e75c495856b98996c47 100644 +index 357c462ca109d22b7cf73be686badc7d142ca79e..823ced2b2630a5ccad31616617d39b694eb3d489 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1334,6 +1334,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1318,6 +1318,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index 9264d559b032..ce251181e40d 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 2d0961a58426023d8c0b0bfc6db1fd64a6a9d65a..8f69502625653cc58518974e76d61567caf4c2d9 100644 +index fda9e4d94e25a523f5ac1eb502d8efff6fb889bc..56db004302835a0767da4a64f353cc40d16c5bdd 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -392,6 +392,7 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, +@@ -396,6 +396,7 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, "showAccessRequestsInToolbarLearnMoreLink", chrome_extension_constants::kShowAccessRequestsInToolbarHelpURL); diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index d856b61c3be3..63f3a898aab9 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index c7e9d096a2bf8fefc5cc4a59208838a76a84812b..dbed07be38a069cfac1d44c1cf1e2033a9b242d5 100644 +index e73519d67c813507c1f0990472b9637cf2ad0f9b..129a5b06914470e8c819bfcdfc2ec1503e551e4b 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3221,6 +3221,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3223,6 +3223,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch index f56a6bf38d35..7ef51f327eef 100644 --- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -index f0cdba3ae3464cef07c0dce25f2c34410f1e2753..54065109e334257ddd7705326cfeb0906001fae5 100644 +index 7035c70e698bf1a53c8d143d515ff09a886e22d7..7df7ad0b53fc1acfc1b213ab627f748bee29fcf1 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -@@ -749,6 +749,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -797,6 +797,7 @@ base::FilePath GetChromeAppsFolder() { if (path.empty()) return path; diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index f2aa8c7842c1..e87e646c422b 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index be4a273060d49468867dde5bb91b63f50e694e02..5ba4eaa2ec370c3dbdccab2713ae194a6df0f1a4 100644 +index 1e8255db4253de945b7ae0f6028e069bb1cd2ce5..7ea042d577df3b584cfa85c1c966613bdd600f36 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -89,6 +89,7 @@ source_set("channel_info") { +@@ -90,6 +90,7 @@ source_set("channel_info") { } else if (is_fuchsia) { sources += [ "channel_info_fuchsia.cc" ] } @@ -10,7 +10,7 @@ index be4a273060d49468867dde5bb91b63f50e694e02..5ba4eaa2ec370c3dbdccab2713ae194a } source_set("ini_parser") { -@@ -533,6 +534,7 @@ static_library("non_code_constants") { +@@ -536,6 +537,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch index 892baf1cab25..00d092a2fa75 100644 --- a/patches/chrome-installer-mac-BUILD.gn.patch +++ b/patches/chrome-installer-mac-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn -index f3717e93f0fc0eca494732dc573d26667b2f6897..2dbb73d6ba3639269067eb7761d16df99e85bdaf 100644 +index 753c397993eb34241b2ad628c8b559e720c8850e..718c2e61ae855781c080070dec4b39adca08d15a 100644 --- a/chrome/installer/mac/BUILD.gn +++ b/chrome/installer/mac/BUILD.gn @@ -18,7 +18,8 @@ group("mac") { diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch index 52e0fbd9ccf3..e82082fecc67 100644 --- a/patches/chrome-installer-util-BUILD.gn.patch +++ b/patches/chrome-installer-util-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn -index df0d6423cefb97fad5d1018c9b2a28a79010a5bd..9fdd353e815c7eb2ccff173ef9db28cabd60e703 100644 +index f03fa4fe5c71c882bdc8da0e3777f15e4b1d5ed2..28502a23d195188342f809402de666395e73a7ec 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn @@ -206,6 +206,7 @@ static_library("with_no_strings") { diff --git a/patches/chrome-installer-util-prebuild-create_installer_string_rc.py.patch b/patches/chrome-installer-util-prebuild-create_installer_string_rc.py.patch index 274116d70953..b0ecd6da0f77 100644 --- a/patches/chrome-installer-util-prebuild-create_installer_string_rc.py.patch +++ b/patches/chrome-installer-util-prebuild-create_installer_string_rc.py.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/util/prebuild/create_installer_string_rc.py b/chrome/installer/util/prebuild/create_installer_string_rc.py -index 7c642731c440ce864ac88e251e84e772f6aaace3..bc0cc97fa347f9bc2904396f4b71218a2de556f3 100755 +index 9b174616ccee685ce6e672084795a25b8f067426..509876a90b75a18cb9155abecbc5990940725488 100755 --- a/chrome/installer/util/prebuild/create_installer_string_rc.py +++ b/chrome/installer/util/prebuild/create_installer_string_rc.py -@@ -92,3 +92,5 @@ MODE_SPECIFIC_STRINGS = { +@@ -104,3 +104,5 @@ MODE_SPECIFIC_STRINGS = { ], }, } diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 960875580481..965969b19347 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 893347b565a89cd5907059b6e455e591ca64c7da..81fa2dc4b2d062ee4536bedc3fca1d4a0be603a4 100644 +index c38896d7abb27399a31ae8c3527f86df2a5b13cb..e2539e4306bd4386bca6ae67aa2c216333302ff5 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -216,6 +216,7 @@ static_library("renderer") { +@@ -215,6 +215,7 @@ static_library("renderer") { "//v8", ] diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 9e2b0d5a5756..d3b5f9910467 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 3c3286f049ebc0ebab340e4ea799f2977584d4ea..066d7f32cdf65f733158c5c6e061f790d2ac20b6 100644 +index abbcd33bbf7dfc29f2563508e368233efda86b24..31d94145a510b478b1e938671473753ff415a33c 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -571,7 +571,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -575,7 +575,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = @@ -11,7 +11,7 @@ index 3c3286f049ebc0ebab340e4ea799f2977584d4ea..066d7f32cdf65f733158c5c6e061f790 render_frame, should_allow_for_content_settings, std::move(content_settings_delegate)); if (chrome_observer_.get()) { -@@ -761,6 +761,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -760,6 +760,7 @@ void ChromeContentRendererClient::RenderFrameCreated( render_frame)); } #endif diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 5c0581e42c66..e04b874a7fb9 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index bb616ff91809a598227ea451455c8116fc74ab65..d783f8411d43116d591d6f2a255a5b27d97587fd 100644 +index 9d802f1a7ae118de7b1c81daf6dfe4e7338f2077..30add02724a6afd9939debe68fbb9635ee207299 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { @@ -10,7 +10,7 @@ index bb616ff91809a598227ea451455c8116fc74ab65..d783f8411d43116d591d6f2a255a5b27 data_deps = [] if (enable_pdf) { -@@ -5232,7 +5233,7 @@ config("disable_thinlto_cache_flags") { +@@ -5255,7 +5256,7 @@ config("disable_thinlto_cache_flags") { } config("pdb_larger_than_4gb") { diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index c9de0a574dc7..96231770973b 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index b02a47bc39c3f0497ba9e2b7b2febb4a0e02b0bd..699e903ce76e6d454641ffecd646e44cda5542c1 100644 +index 8910f6e7fae85dfd27d9955918f18030a23fb716..7bfe7677f0241d45554d44d3b5fe9a2f293839cd 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -234,6 +234,7 @@ ts_library("build_ts") { +@@ -236,6 +236,7 @@ ts_library("build_ts") { definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/components-bookmarks-browser-bookmark_model.h.patch b/patches/components-bookmarks-browser-bookmark_model.h.patch index a95fe2f933c4..89b906cbfbbb 100644 --- a/patches/components-bookmarks-browser-bookmark_model.h.patch +++ b/patches/components-bookmarks-browser-bookmark_model.h.patch @@ -1,8 +1,8 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h -index 9c633d9eaed5064bd4f9c2679b6b6cb540fc83b6..749ebd0e9e2c17662411d79cc93e7c1ffcced839 100644 +index 30f63894ef5a55316cfc65b6c3d1ee69952b66de..704f8b377f1604d2b97e4dd927a05509ff0476d5 100644 --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h -@@ -349,6 +349,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -351,6 +351,7 @@ class BookmarkModel : public BookmarkUndoProvider, return weak_factory_.GetWeakPtr(); } diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index faedf5a706cf..45f3301fd06f 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index c2b381a725b570c8d3b68733fbfc88a32e38f7b0..b9c2f22f90d7fd61d4c51e3364866bc60559a20c 100644 +index 07ce3aed95669dc1ad4797046218dc9ed794ddad..389c3c648eb61596d7aa137bf6e750dfc5f43b0f 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -441,7 +441,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -464,7 +464,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index 9180f08ef6f5..96532ae564e8 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 506fb1a47a596e8fde601f711d7834a7bd492dc5..9ecea77e9ae3c84d2fa8543421f9cbc76da442b5 100644 +index 483ffe22371d1c96c49f611c24a84868bc71f2fc..103ed4b820547db6eaf66e5b37438051807ecb60 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -561,6 +561,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -565,6 +565,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 506fb1a47a596e8fde601f711d7834a7bd492dc5..9ecea77e9ae3c84d2fa8543421f9cbc7 content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION) { const auto& it = content_settings_status_.find(content_type); -@@ -583,6 +584,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -587,6 +588,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::MEDIASTREAM_CAMERA && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch index 13dc874d9fea..b242c62beb8f 100644 --- a/patches/components-content_settings-core-browser-BUILD.gn.patch +++ b/patches/components-content_settings-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index 5ee472064ea565a22d521d813f0394ffafa43f80..4a34f46757007b279b9f33cb8cb0fb03d8aa7e9a 100644 +index 815fabf60d2c219027bf1e12f79e3c2418493ff8..2e24c1f2a3c48683585fa9add3d13fdba5e1cc71 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn -@@ -81,6 +81,7 @@ static_library("browser") { +@@ -77,6 +77,7 @@ static_library("browser") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch b/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch index af0d3714ff37..cec74f88c2e9 100644 --- a/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc -index 783839c7116b06128df8b2daf98dbe99d3b60dbb..12d28156ced83b2d5bf84a36e9f3cda7146226e0 100644 +index 41e8cd4287823d83fdd09917580a6c276a156dd8..031475e41c1e8b878e9fccbe7039e3e9787fe147 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc @@ -365,6 +365,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() { diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch index b35f4f22311a..5634aadc6d1e 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index bcb3e1f917e2c69f64bcdc5b52fb405b3f421e0c..bca21d9cbd8a9367d25c858dea847fea92f90488 100644 +index 386695753f709d5ea4ab68b06db0336a1981ffe9..376680d8c18ed0b5e5409e5f300ab84825311946 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -157,6 +157,7 @@ void ContentSettingsPref::SetWebsiteSetting( diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index 56a595c2a918..fdd34ece736d 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 9333aca18738b362cc7cd54e3b9685a5dbe4a586..9480195d5ff05a27c9fc9a9e144ed43b9986932c 100644 +index f3a629dca7074c1a638ca8100eae45dc45e0d90c..da48fb4f9f451f8773ec601dfd6bed899ca0a59d 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -618,6 +618,7 @@ void ContentSettingsRegistry::Init() { +@@ -598,6 +598,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); diff --git a/patches/components-content_settings-core-browser-cookie_settings.cc.patch b/patches/components-content_settings-core-browser-cookie_settings.cc.patch index 13da4c73b6be..d71e285eb461 100644 --- a/patches/components-content_settings-core-browser-cookie_settings.cc.patch +++ b/patches/components-content_settings-core-browser-cookie_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc -index 10cf2824bdb0cc21e0f727c2ed1fd13cbf7b51b4..9a4332a876b56741e27e88a21dc1ba5db863d21c 100644 +index dcdf811fb261904d11827b4bbb3c2a28be6f2810..7b778898c018a94e9980a882128cca22c8189565 100644 --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -194,6 +194,7 @@ ContentSetting CookieSettings::GetCookieSettingInternal( +@@ -197,6 +197,7 @@ ContentSetting CookieSettings::GetCookieSettingInternal( DCHECK(value.is_int()); ContentSetting setting = ValueToContentSetting(value); bool block = block_third && is_third_party_request; diff --git a/patches/components-content_settings-core-common-cookie_settings_base.h.patch b/patches/components-content_settings-core-common-cookie_settings_base.h.patch index 509e434bafab..9136b8b00ddf 100644 --- a/patches/components-content_settings-core-common-cookie_settings_base.h.patch +++ b/patches/components-content_settings-core-common-cookie_settings_base.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.h b/components/content_settings/core/common/cookie_settings_base.h -index 56ce04cf7489560a4a9750c9e3e0adb4f00ae681..2fca787ee1420fb733868cdb11d4435d624c1014 100644 +index 0ee293b2c4972ba1babc232762d7b9d778182dcb..58c01489cb87f4f78578653c05729d331a842e8f 100644 --- a/components/content_settings/core/common/cookie_settings_base.h +++ b/components/content_settings/core/common/cookie_settings_base.h -@@ -71,7 +71,7 @@ class CookieSettingsBase { +@@ -73,7 +73,7 @@ class CookieSettingsBase { CookieSettingsBase(const CookieSettingsBase&) = delete; CookieSettingsBase& operator=(const CookieSettingsBase&) = delete; diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch index f34745820c87..78a262699edc 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc -index 41947c7d3ff0cf6fef4046036ed1abacea792b93..d4ac4eb147d9a58006ad70d13e46ffca33331b2a 100644 +index 7847420167a30bb66747ad5d541fa0dfbfa60664..52626865781deaf549aa247cb6a056bd5d753447 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -439,6 +439,7 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { +@@ -431,6 +431,7 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { const WebDocument& document = render_frame()->GetWebFrame()->GetDocument(); WebSecurityOrigin origin = document.GetSecurityOrigin(); WebURL document_url = document.Url(); diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index 035f12cb603f..de170a433425 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 667eb32bf22c836cee31d0c3ab34b99f04013c2a..1240f1becc295b62c15737d496de48bbf7953fcf 100644 +index a843fd46ab7e7ad0aa2ef047a6858d79fafb4ed8..389135634913978ff6f1af64bc67e1f45220be67 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -1934,8 +1934,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -1933,8 +1933,8 @@ void DownloadItemImpl::OnDownloadCompleting() { base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(), diff --git a/patches/components-embedder_support-user_agent_utils.cc.patch b/patches/components-embedder_support-user_agent_utils.cc.patch index 72db7d6362de..8d62b3d4ce9f 100644 --- a/patches/components-embedder_support-user_agent_utils.cc.patch +++ b/patches/components-embedder_support-user_agent_utils.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc -index 2c5b4b4a85536e68ef5a1323e974729f818e9f5b..ba5161ec02353664664d6a9c09f87b42f8bdd625 100644 +index 40148eeaef7d16e06ff7f7af32cb7ec82f61142f..52fc9a5baa9017d9cec58922ae03fc157ee63293 100644 --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -268,6 +268,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -280,6 +280,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( #if !BUILDFLAG(CHROMIUM_BRANDING) brand = version_info::GetProductName(); #endif diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 46f243378826..98091e909b3c 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 65849ab66754fba5e449f8e6b20f0688b9c73f37..df3fd0bbab1273a482294fc3ba7f4572b4617f66 100644 +index 649b6124e5397fe5790f631d0261ed346321497a..a072f04b0f6be78879852f461b18a2ca0871126f 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -52,6 +52,8 @@ enum VisitSource { diff --git a/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch b/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch index c7572f367b68..e06a4940a7e9 100644 --- a/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch +++ b/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch @@ -1,8 +1,8 @@ diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h -index 2d15bc4016deb2425a1e3f0554478c185db7435b..2a87693b509b6b5976cbce17ca06eb64fe2861e0 100644 +index f546244b9f7ba685798640e315670527bb04276a..30ec4627b9570f1d8320c0d8b68262b11211c71f 100644 --- a/components/keyed_service/content/browser_context_keyed_service_factory.h +++ b/components/keyed_service/content/browser_context_keyed_service_factory.h -@@ -161,6 +161,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory +@@ -157,6 +157,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory // and the default implementation removes it from |mapping_| and deletes // the pointer. virtual void BrowserContextShutdown(content::BrowserContext* context); diff --git a/patches/components-metrics-BUILD.gn.patch b/patches/components-metrics-BUILD.gn.patch index f9e882de7ac3..1c6cb8413b7e 100644 --- a/patches/components-metrics-BUILD.gn.patch +++ b/patches/components-metrics-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn -index 74b6a7a9ee39f35090e4b7bc2107554b7f156220..09defb74bf37256e5bbe6843faa4bb441337a7a1 100644 +index 05bf0885eee2059498c029a527a1ace929eb6921..370aa5e488b33e8e1b0709b1304428b2e9624650 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn @@ -253,6 +253,7 @@ static_library("metrics") { diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index b3254c459b2a..b9500751a256 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 114217b5c033baf565f7fe63068ffd770be125f7..f84016696a613ed626fcbb023e6572b67fd9e71a 100644 +index de0b00b12370c2b777d657f3c9e1bf9782f4a216..79681c1e4b820fe3709fdf4bf51441a790ef17bb 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -299,6 +299,7 @@ static_library("browser") { +@@ -301,6 +301,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 874227c518b1..4b78d1d630d5 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 6823f3902ed7527c22586f715256b93e5c32cc98..e84cfc88fdbbb880c1145b6d66b86203bd10eaf0 100644 +index c7ad9a2241451056b20c20efbf9ecce7fc8393b9..0cf20374b6d083f8afb85df4de48a4abb839c88c 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -455,6 +455,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index 0cc9f87749d9..f3175d813cc7 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index effe0b67e02a1a4f0071d1b415f4dc5c5784b7a4..a8f688dfb1cdb7d9f04e391125f2e7115e6f0f0a 100644 +index 01018303382b087221e1899feab76db2e51b1ef5..d54a0e58b26d67064718df2778a590984e59440a 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1878,6 +1878,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1866,6 +1866,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-permissions-permission_context_base.h.patch b/patches/components-permissions-permission_context_base.h.patch index 38dcd96de0fd..17d9fc968e8d 100644 --- a/patches/components-permissions-permission_context_base.h.patch +++ b/patches/components-permissions-permission_context_base.h.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h -index 7292fa44f446314d29dec4f5b164bf4a518cb299..923094ead992cf027adc0a7c20104a34ed0585bc 100644 +index 3a03e83b11491f46fe0f65eb85ceb97b19da8fc5..5e756f4d7dd7d2dc045426aa866a1e8cf0e14ddc 100644 --- a/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h @@ -122,6 +122,7 @@ class PermissionContextBase : public content_settings::Observer { diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 4cdced291670..759b48f8d8d9 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index b7e9488342e551347c61e256d43287aca9ea69bf..d7be0de3903892ff4536e8d8ad95d2c97ff0bb23 100644 +index cf4ef6f8f179d1311525bd5c9fb37d98aed32ff1..698dac086f1c3b90599bd63d36311c5266d8e8f4 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -109,6 +109,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 2350fc4de0dc..61acaf1985f2 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index feb36d536f184b8d9f8e7284a26ba68d8b2205ea..1aa486b4811f4cd5a5e10f785f72a563297acd49 100755 +index 1e92a36bcf85de6b525487f7f036a5719230a8f7..5aa1b7a624d03f8e5975690ee749a937698164e9 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -55,6 +55,7 @@ PLATFORM_STRINGS = { diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index c327e968b879..19c54f124c95 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index 49c73ced1be1605bf78d70a907ecb26d4e97b24f..6a9fcf73023742805967bd67d9c0132a60dbdac5 100644 +index 31639aee98932c155c263369e692501abee7db9e..00eb63c5531a454c32b32454bdfc15a4a44b99c4 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc -@@ -314,6 +314,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { +@@ -315,6 +315,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { // Check if default search preference is overriden by extension. if (pref->IsExtensionControlled()) { extension_default_search_ = std::move(turl_data); diff --git a/patches/components-search_engines-prepopulated_engines.json.patch b/patches/components-search_engines-prepopulated_engines.json.patch index 42e61b5f79ea..290864b97081 100644 --- a/patches/components-search_engines-prepopulated_engines.json.patch +++ b/patches/components-search_engines-prepopulated_engines.json.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index 5a0bf4d6b071d34beeead55cf4f462c5c35de007..c2e914d6f7b770931cb8b4cd2fbea0b8ae9d26ff 100644 +index b5e448c2654df6d40fbf4c2546a55415aba96787..d30725a2edac18eeed572c92a7573f0ad325be4e 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -91,17 +91,6 @@ @@ -20,7 +20,7 @@ index 5a0bf4d6b071d34beeead55cf4f462c5c35de007..c2e914d6f7b770931cb8b4cd2fbea0b8 "ecosia": { "name": "Ecosia", "keyword": "ecosia.org", -@@ -171,16 +160,6 @@ +@@ -172,16 +161,6 @@ "id": 102 }, diff --git a/patches/components-sync-driver-sync_service_impl.h.patch b/patches/components-sync-driver-sync_service_impl.h.patch index c0013f34f834..d94db130bdce 100644 --- a/patches/components-sync-driver-sync_service_impl.h.patch +++ b/patches/components-sync-driver-sync_service_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h -index 7e05b0d2006d163d4052454e2c5ad71b0b350770..abb6957fd3589bf0b937d63af0e92d68b8f92b4e 100644 +index 494748039d4198773ec1464e9882af1d56d3d555..21a42bda9baac298bdf89b477991f7ae00de0d64 100644 --- a/components/sync/driver/sync_service_impl.h +++ b/components/sync/driver/sync_service_impl.h @@ -238,6 +238,7 @@ class SyncServiceImpl : public SyncService, diff --git a/patches/components-sync-engine-sync_scheduler_impl.cc.patch b/patches/components-sync-engine-sync_scheduler_impl.cc.patch index cbbc8daba908..9c6b2dfe711d 100644 --- a/patches/components-sync-engine-sync_scheduler_impl.cc.patch +++ b/patches/components-sync-engine-sync_scheduler_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/sync_scheduler_impl.cc b/components/sync/engine/sync_scheduler_impl.cc -index b8ee801ec971de6c6e3b3e52c19cc32ef0a424cd..d953711147171cdff00821ffede806984a0b355f 100644 +index 139e285399f9965e88c1181e19e93d9840bbcf89..f9ae55e7dfc72f2a088154a1af24ffab4d726657 100644 --- a/components/sync/engine/sync_scheduler_impl.cc +++ b/components/sync/engine/sync_scheduler_impl.cc -@@ -508,6 +508,7 @@ void SyncSchedulerImpl::HandleFailure( +@@ -507,6 +507,7 @@ void SyncSchedulerImpl::HandleFailure( SDVLOG(2) << "Sync cycle failed. Will back off for " << wait_interval_->length.InMilliseconds() << "ms."; } diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 2a625e1fb7f5..74a6300860f1 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 09c680f25e8e557e16d1ec16f820242c5495feee..b0da9f3496f5e4f197d88edecc9e356e2e28041c 100644 +index 7c3b96cac30acffdcb04fe256e34749a393a3a2b..d4365139e40f851852440d57aa69614783861f22 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -471,6 +471,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -473,6 +473,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 09c680f25e8e557e16d1ec16f820242c5495feee..b0da9f3496f5e4f197d88edecc9e356e VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -483,6 +484,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -487,6 +488,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index b76f511cc2b4..ef99cc0eed7b 100644 --- a/patches/components-sync-protocol-protocol_sources.gni.patch +++ b/patches/components-sync-protocol-protocol_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni -index ef6cd86fb434d851889f91522af944b8704d38f4..9fba8a4b4089126ea262ef3c92c4cbb05bf58a50 100644 +index 83bd7faf4b58d3ad5897b6ae5cec86cceeab9ebf..eba0dcb725a068a0a371933c8b2d28b28afa36dd 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -76,3 +76,4 @@ sync_protocol_sources = [ +@@ -78,3 +78,4 @@ sync_protocol_sources = [ "wifi_configuration_specifics.proto", "workspace_desk_specifics.proto", ] diff --git a/patches/components-sync_device_info-BUILD.gn.patch b/patches/components-sync_device_info-BUILD.gn.patch index 467999c1b052..9db3956d786b 100644 --- a/patches/components-sync_device_info-BUILD.gn.patch +++ b/patches/components-sync_device_info-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/BUILD.gn b/components/sync_device_info/BUILD.gn -index 5e685e37202c28b9393b19ce163c37f2f486e362..f03e73c4aa2f749afc8dd92a0d38c2b1f1907106 100644 +index 4cb48f7f878fb5f46e37643d86c126113ac84fd7..c2e59c8facc774e105b88cb1970a4004fbab5496 100644 --- a/components/sync_device_info/BUILD.gn +++ b/components/sync_device_info/BUILD.gn -@@ -92,6 +92,7 @@ static_library("sync_device_info") { +@@ -94,6 +94,7 @@ static_library("sync_device_info") { "//chromeos/system", ] } diff --git a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch index cf6ecd771f6f..541f06bad06e 100644 --- a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch +++ b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index 320aafa9a9be7aa3c2ea3acb9f1d96cece1895dc..eaa2096692173966b1eef982acbf4ea53468cac3 100644 +index 3f960a94c1cc1f093958b9216dc87577abb2a421..6dcf4404add63aa1c4463b1591f168f68d952df3 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc -@@ -296,6 +296,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( +@@ -256,6 +256,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( GetSpecificsFieldNumberFromModelType(data_type)); } @@ -10,7 +10,7 @@ index 320aafa9a9be7aa3c2ea3acb9f1d96cece1895dc..eaa2096692173966b1eef982acbf4ea5 return specifics; } -@@ -465,6 +466,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( +@@ -425,6 +426,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( for (const std::unique_ptr& change : entity_changes) { const std::string guid = change->storage_key(); @@ -18,7 +18,7 @@ index 320aafa9a9be7aa3c2ea3acb9f1d96cece1895dc..eaa2096692173966b1eef982acbf4ea5 // Reupload local device if it was deleted from the server. if (local_cache_guid_ == guid && change->type() == EntityChange::ACTION_DELETE) { -@@ -475,7 +477,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( +@@ -435,7 +437,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( // Ignore any remote changes that have a cache guid that is or was this // local device. if (device_info_prefs_->IsRecentLocalCacheGuid(guid)) { @@ -27,7 +27,7 @@ index 320aafa9a9be7aa3c2ea3acb9f1d96cece1895dc..eaa2096692173966b1eef982acbf4ea5 } if (change->type() == EntityChange::ACTION_DELETE) { -@@ -742,6 +744,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( +@@ -702,6 +704,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( return; } @@ -35,7 +35,7 @@ index 320aafa9a9be7aa3c2ea3acb9f1d96cece1895dc..eaa2096692173966b1eef982acbf4ea5 // In the regular case for sync being disabled, wait for MergeSyncData() // before initializing the LocalDeviceInfoProvider. if (!metadata_batch->GetModelTypeState().initial_sync_done() && -@@ -950,6 +953,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const { +@@ -910,6 +913,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const { } void DeviceInfoSyncBridge::ExpireOldEntries() { diff --git a/patches/components-translate-content-renderer-per_frame_translate_agent.cc.patch b/patches/components-translate-content-renderer-per_frame_translate_agent.cc.patch index 4279c9808ac3..1b8f0e2bbc79 100644 --- a/patches/components-translate-content-renderer-per_frame_translate_agent.cc.patch +++ b/patches/components-translate-content-renderer-per_frame_translate_agent.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/translate/content/renderer/per_frame_translate_agent.cc b/components/translate/content/renderer/per_frame_translate_agent.cc -index 51b3fdb189b9225524873a5c56bc4f1a696c03e9..246ff15d33b24fcd25068d074369f64a268dbc60 100644 +index 179c198c9b4009fe7dd6379e136ab36a74ebcda8..dcde2286046ea438b5caed4ee3bdb8115a3ec628 100644 --- a/components/translate/content/renderer/per_frame_translate_agent.cc +++ b/components/translate/content/renderer/per_frame_translate_agent.cc @@ -50,7 +50,7 @@ const int kTranslateInitCheckDelayMs = 150; diff --git a/patches/components-update_client-BUILD.gn.patch b/patches/components-update_client-BUILD.gn.patch index dd5dc59bad3a..3fb3f5942a39 100644 --- a/patches/components-update_client-BUILD.gn.patch +++ b/patches/components-update_client-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn -index a904b265e18001ca82b516e147930cceb6cd88a7..607ce02e5e5e960342337d939998fe5f25c86420 100644 +index b4e9a189acc36c611ae5f34aefc982f6f3741462..41aecfde29c0c17534d0b9ac0d9d78a53e77a32a 100644 --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn -@@ -193,6 +193,8 @@ static_library("update_client") { +@@ -194,6 +194,8 @@ static_library("update_client") { "puffin_patcher.h", ] } diff --git a/patches/components-variations-variations_seed_store.cc.patch b/patches/components-variations-variations_seed_store.cc.patch index 4ff6d278c6ac..8ca919651ae8 100644 --- a/patches/components-variations-variations_seed_store.cc.patch +++ b/patches/components-variations-variations_seed_store.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc -index d05b808c0cb19605ebb2b257f2cfb13509702ac5..4a64302f250fbfab34e81d2227a26acfd73d8fec 100644 +index 69edd741d2e6ad90d8bed70f4d7966d029464dd4..286f4d9c989597e2676c88b254ca3d399f713023 100644 --- a/components/variations/variations_seed_store.cc +++ b/components/variations/variations_seed_store.cc @@ -49,6 +49,7 @@ const base::FeatureParam kVariationsAsyncProcessing{ diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 9db59934da0a..089307408988 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 7bbb66fee4f8e14a5f27825406ebeee9ca4bf8e6..8689250625fdb800ab5fe1d5cb88cfe403e0c73e 100644 +index 51e339b95811e54ce29a4fa9a312e6d7a6551096..e4d289705742c3d6f8b5ec3b1003f3edd6c6dc80 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3545,16 +3545,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3438,16 +3438,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 5802837fb448..c5926876da3f 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 636b3e88c5b409e27af025993796e3f94b625c52..91b3f6bc7ee0f65e381e538b9dd6b8c80a0c61c6 100644 +index 64bd2ff85a1ca4b130c49558cd496f9867d2d9e0..f0d73d788c62a94a56e71a3beba6d36d89f6adc8 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2930,6 +2930,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2900,6 +2900,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 636b3e88c5b409e27af025993796e3f94b625c52..91b3f6bc7ee0f65e381e538b9dd6b8c8 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4416,6 +4417,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4386,6 +4387,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-zygote_host-zygote_host_impl_linux.cc.patch b/patches/content-browser-zygote_host-zygote_host_impl_linux.cc.patch index e6bc9ea174c0..7ec548f522b0 100644 --- a/patches/content-browser-zygote_host-zygote_host_impl_linux.cc.patch +++ b/patches/content-browser-zygote_host-zygote_host_impl_linux.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index 2de8b35aa18a11e6d5bf44954e5ae4b3bcd9d4ea..38db2c1e4f59daa4c21129ca6194a990b9681c9d 100644 +index 7bc5e4acf632d7a643e5eb3099e893963703426c..fdf38432c9a5cb3cec52577c544adde091631888 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc @@ -125,6 +125,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& command_line) { diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index bc51c4e67a43..341f3ae2c0ad 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 32594910ef32e64dbd5d9fda1fe00b5da912a279..389379166cd767a3cf0afd6daf87012cc5f420f3 100644 +index ff6b2e9248d7a03923ac57e44e31b5fb8320e456..a9bac0b34fefa4d15b63e7b2a66e47fcd7fd9991 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -71,6 +71,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index b03b7eb2e64b..56a8fe9dac42 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index bdb4632c5653457a1a8e024a6a9c9f5c4d823610..ff56a42709010b7b78a9be744098323f3ba6dfa5 100644 +index 39eadbcc3fe914c154f5b655a09675427a24d0ed..de278c26f5d98563f2dc4a095562bd8d3a5879d8 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -2051,6 +2051,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2047,6 +2047,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index effc0fab2879..7c9c7c3d1c5d 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index bdaf710b1413db96e6049c027e7ead78d30514cd..5efeb925cd35f946402354e45437506cec98644f 100644 +index c42c1fa3c62b3f18450aaf83e80f8a623141c2d9..7f836da60ab9f5098ac45b738d56c9ca348e177f 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4423,6 +4423,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4448,6 +4448,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 00aa8ae4f051..52cee2b84b99 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 15b082726ad01563ad0a9dec9ac7af900c28e8a2..69ab3fed1bbb6b0175c6dee30bfbaff84dc2ecd6 100644 +index 411d6304f557a3af83ac8f43e8f92d0c9cea0aca..26189b2631c1cb90b6b3647c0d694011342cbc76 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -936,6 +936,7 @@ void RenderThreadImpl::InitializeRenderer( +@@ -933,6 +933,7 @@ void RenderThreadImpl::InitializeRenderer( } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index 9a7e572aca01..41f3c9d75b25 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index 93b751e31d4ba23932adaa9f04a660929cd3eda9..64772149d2a9791df188ac589ace96cca1230a74 100644 +index de92cfbe70a20c350d164bd614c8b24297e67972..9b1dc98fc4382d50f55c6b42bc3dff22ab6ab87e 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1395,6 +1395,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1385,6 +1385,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index b8818b32963f..06b8b10f65ee 100644 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index e444e64fdf3c694f807821c4c281c961ad4f4e68..130555d249dd9b90e312dfa120d8201d8cb61cff 100644 +index 3c0c30858dde7341e22129d7a993b95368b1162b..93534619d9da0549857f3da3279efd83ea8de4fe 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc -@@ -1050,6 +1050,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( +@@ -1049,6 +1049,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( DCHECK(!public_key_.empty()); base::Value final_manifest = manifest.Clone(); final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_); diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index 8bcb0be74420..20e493ac5339 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index ffe3b2bf7520c76e817f43a370178d1cc81344c5..b9f51eb07c92898c05181d19df0b70e47bf6a7a3 100644 +index 9567b153348b9e0647e70ec87fb8254f178578cc..6a254cdb500741a2feeca2af6dd7655c4e662fdc 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -593,6 +593,7 @@ +@@ -619,6 +619,7 @@ "matches": [ "chrome://password-change/*", "chrome://file-manager/*" diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index d164a0b317f9..6c10dfbd51d9 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 40f143dd9ba73d4fa17f6fa512f2af7a7d6b5d1d..7f7a09d4b0dedb130390396c8337a836697a263e 100644 +index 99e6e76b29fb10672f9f373dab9c4522e3c8cdd0..6d9d629aee4ce84dcf1fdf9fb903ab253ad13284 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1131,6 +1131,7 @@ component("net") { +@@ -1134,6 +1134,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-base-proxy_server.cc.patch b/patches/net-base-proxy_server.cc.patch index 9da49ab284a1..e7409a4ad06b 100644 --- a/patches/net-base-proxy_server.cc.patch +++ b/patches/net-base-proxy_server.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/base/proxy_server.cc b/net/base/proxy_server.cc -index c2a3e48f409585ee555d0860031abffb3dc12718..b07d5c5ac6f699bd0a47c09cf76fae90755f6324 100644 +index 16756fa513563a823fe36d9dbddd68de56d17c59..46bf636b688e59cf14757e5f59f549b75274b6e9 100644 --- a/net/base/proxy_server.cc +++ b/net/base/proxy_server.cc @@ -60,6 +60,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch index 7c29bc8d9eef..bce356932383 100644 --- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch +++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc -index 45a5e755fe1d6472ed5114180e684e4763460512..8c8917ee7b9203a46eac208eaa2d028ec03ab441 100644 +index 09f8244729f235260b07946168bc19ae71b44bf1..f98f8fe4fc55e9cc8a86e7e9e7228e43187234d7 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -976,6 +976,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously( +@@ -975,6 +975,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously( config_->value().proxy_rules().Apply(url, result); result->set_traffic_annotation( MutableNetworkTrafficAnnotationTag(config_->traffic_annotation())); diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 3bf67e26d25f..54d7ecb257fd 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index a885e8cbc626c565bc15a778e88171a740415d1d..3b982c85feb24d826aa18765854905df03a75311 100644 +index f20c7697746d13d67057f2be8f72d9a494234061..deac6ee352af1a781258e4b89643dd9d5b03cc2d 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -857,6 +857,7 @@ ResultCode LaunchWithoutSandbox( +@@ -815,6 +815,7 @@ ResultCode LaunchWithoutSandbox( base::Process* process) { base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index 2c532fed8da5..1acbc18cb4e4 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index c98341c33a59823cfcc18bdbd0344b13f48d1c93..6b119a04ca01e54e9aec6e3b8f273b132b7550c4 100644 +index 285652276863d40ad9f76bd596c54e98aa9cf7d7..a4abfb36766d5d3ee2520f4514abf67b81904f73 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -732,6 +732,7 @@ void CorsURLLoader::StartRequest() { +@@ -727,6 +727,7 @@ void CorsURLLoader::StartRequest() { (fetch_cors_flag_ || (request_.method != net::HttpRequestHeaders::kGetMethod && request_.method != net::HttpRequestHeaders::kHeadMethod))) { diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 05d6ad368c1b..5f53b68ea8dd 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index 01e0d03b544247097d9bccdc619287f7d13bd9dd..adbbdf32e5e9b5a024c361cee3e39bdfaa99af53 100644 +index abedbe96fc7e0b27d57a9edc7bc758cfd1b8ab93..025871ca420e392eae858d78c55503a064bd8b9b 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -178,6 +178,7 @@ component("cpp") { +@@ -180,6 +180,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/third_party-blink-renderer-BUILD.gn.patch b/patches/third_party-blink-renderer-BUILD.gn.patch index af4fe8a1257f..e8b57f4f423a 100644 --- a/patches/third_party-blink-renderer-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/BUILD.gn b/third_party/blink/renderer/BUILD.gn -index 6d140b8974be973fc3a33d3441a8db266d800ed9..952a8270b4dcf2290ecc83b2e8bade2d9e139a25 100644 +index 28ad2d010b06022e96363beb8b0819038fb4b7d0..b4ec384b037d31d40c280e747cbc91d1080cd842 100644 --- a/third_party/blink/renderer/BUILD.gn +++ b/third_party/blink/renderer/BUILD.gn @@ -9,6 +9,7 @@ if (is_clang) { diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 8b3d648bd2dc..f663cc3b6251 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index d600ced2a7c798a5f7bca7e854d1a6b3f92e68d5..dc9babf1b489d3b0a42ca7043e247625163c52cb 100644 +index c6835288532363c247104673157647b11666a152..a6c987d8cfecb612c02b10be3cdaefa63613b402 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -371,6 +371,7 @@ component("core") { +@@ -370,6 +370,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch index 6ce96c778c69..f5c750276061 100644 --- a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc -index 9b77d717ba42129db61a28f2bf0942a027047e0c..423027c28ac0fe067ed691bdc456334c55e4eef2 100644 +index fff958596321ed5b96935c07a78b5b6fdfd1e40c..e1cda0a4a87fd115d711b831723678226fb8db5d 100644 --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc -@@ -477,6 +477,7 @@ bool EventTarget::AddEventListenerInternal( +@@ -479,6 +479,7 @@ bool EventTarget::AddEventListenerInternal( bool added = EnsureEventTargetData().event_listener_map.Add( event_type, listener, options, ®istered_listener); if (added) { @@ -10,7 +10,7 @@ index 9b77d717ba42129db61a28f2bf0942a027047e0c..423027c28ac0fe067ed691bdc456334c if (options->hasSignal()) { // Instead of passing the entire |options| here, which could create a // circular reference due to |options| holding a Member, just -@@ -610,6 +611,7 @@ bool EventTarget::RemoveEventListenerInternal( +@@ -612,6 +613,7 @@ bool EventTarget::RemoveEventListenerInternal( &index_of_removed_listener, ®istered_listener)) return false; diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index a7a2fe929df7..00b71f318f2c 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index fc6b95e45f3343753978c0f8500212a9a21ecffe..9a0916e5b87b5695edfc2ceac606d0e950c3b0ac 100644 +index 59d6e4ba0c0dc95e785c20bc341dbbbb115badd2..eb23e704c145110769278821a57380e3af213883 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -262,6 +262,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( +@@ -208,6 +208,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( std::min(info.height(), max_dimension)); src_data_.reset(info, src_data_.addr(), src_data_.rowBytes()); } diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 4586936dc609..2eba1b1ca99d 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 7f95eb174be19aa13f8191b881cc8c9176e5197c..d0c5833e523dea756bfb6f60049d3c3a43f6dbba 100644 +index 5bc1a3a0c0496e3c5ce3b9f037178e4d7b7fc90d..39bfe1ef910856f00a94c3b47434d8bdf6efc788 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -1068,6 +1068,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1069,6 +1069,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch index 2e47528d17b9..ec24544c8eaa 100644 --- a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch +++ b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -index b5648eb75cfef2ecd2a58f088d4e571d2dd8d70f..dca1aa3ce2054a6b81e0a8619d98e6bb540f0329 100644 +index afa13c20e94797da3c130b78a94d67f36eb2968a..69f83c713c04543f007c2ba3373a4ac7f0b9ad9b 100644 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -@@ -409,5 +409,13 @@ +@@ -404,5 +404,13 @@ name: "WindowPlacement", permissions_policy_name: "window-placement", }, diff --git a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch index 83a251c43caa..ebc28c608820 100644 --- a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch +++ b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/script/script_loader.cc b/third_party/blink/renderer/core/script/script_loader.cc -index 68f54b7aba1befeb7e2a8370024c54d1bd6e2119..faddc32fb93310ad74853a1e8fa48f2eeaaa8c5f 100644 +index 50c1e710ca3c3fc46fb93f9d5545d22df134adba..27db9693ad5ea2730813e1f0ee8e9f553467b824 100644 --- a/third_party/blink/renderer/core/script/script_loader.cc +++ b/third_party/blink/renderer/core/script/script_loader.cc -@@ -713,6 +713,7 @@ PendingScript* ScriptLoader::PrepareScript( +@@ -714,6 +714,7 @@ PendingScript* ScriptLoader::PrepareScript( parser_state, credentials_mode, referrer_policy, fetch_priority_hint, render_blocking_behavior, RejectCoepUnsafeNone(false)); diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 71510af704e8..51a413d12301 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index e37a216ee6c2eecc4cb2cd3c0587fb4d697f07f6..4e56e34efaa8d278afc318e82d5ad39e5daf21af 100644 +index 644647327f01803088dae660c1601a79aa982ba5..35c74462aedc29fb82c9979075ac0bd0ad100580 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -15,6 +15,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index e37a216ee6c2eecc4cb2cd3c0587fb4d697f07f6..4e56e34efaa8d278afc318e82d5ad39e config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -171,6 +172,7 @@ component("modules") { +@@ -170,6 +171,7 @@ component("modules") { # generating the snapshot for android, blink is compiled with # current_os="linux" and target_os="android". Using target_os is necessary as # we need to compile in the same way as would happen when current_os="android". diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index cb89688f3d15..cd035cfc58c6 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 533207adc4060f8e5633a789966d2307e0994453..7f63eeeca1b1395f7571f402ce1674fa05cc96ad 100644 +index e1f80d5f609fa5758c7887a147baf196ae976dfb..d9a51e7ffa85b81ca9e87882e805efe7c18965bd 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -1943,6 +1943,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1918,6 +1918,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 533207adc4060f8e5633a789966d2307e0994453..7f63eeeca1b1395f7571f402ce1674fa int sx, int sy, int sw, -@@ -2080,6 +2081,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2058,6 +2059,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index 786f4f09cccc..e79e73e6537d 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index 7927a51d3cb281dff1dc68cb817f827985f5c244..5a0b6e0852337b09b7ec645309455b173a7ca783 100644 +index 992c2277131bf7b18eeaf0a2a7ad77ce936c1c51..40449b118f7f4942ac3e878ffd2b88397f05699c 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -112,10 +112,10 @@ interface CanvasRenderingContext2D { diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index 50a3e20424b3..bf613445461f 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index 3e00bd93b6b6733fd97a1a70f381815ad476a584..92f7ab361c11d90957b532479b0213ff89ab65d7 100644 +index cc241d0663298dbf7d09c940c8d069c8c6a0b5a0..b01703bfe748af46da2177b78260558c740c7b7b 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl @@ -68,10 +68,10 @@ diff --git a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch index 8307c27a8f6e..3c0ac1b41474 100644 --- a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -index 49bfd50aed8893853c7e475b9634472637ea5b54..ad9ec7732dc39413ebc72bc56712afc6527528de 100644 +index 4cbf97ad00e4a2927615688793ddea4fa77fdcdd..ca9ca86ebfb0939de70febcfbeae27118bc2d15a 100644 --- a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl @@ -63,10 +63,10 @@ diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 32b9aa98d0d2..5036e2db0bc8 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 1eac9ca82003e8f0bb15d0a20e3857fa6bdcfb40..9c8c6093051766d57c2e3304eb7b6ef8f1f912c0 100644 +index 7270dc91ca43b646b9b630228703af24689ba078..89f12890ee3f7d0925653b53edec9935bf2ee3d6 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -859,6 +859,7 @@ void MediaDevices::DevicesEnumerated( +@@ -856,6 +856,7 @@ void MediaDevices::DevicesEnumerated( } } diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch index 687f01b79f6d..0bd39cd2cafc 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -index 1d323417ea4c7c04b07f12922208f03f84d0b946..4393324122ff96d7ca0fac6b3e02d36b2b7c50cd 100644 +index 5933e326354d0f08aa0c32fdadbbff6b04144b70..812402d4fee6f4e39709d8ffd6f3748b17b3e908 100644 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -@@ -197,6 +197,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) +@@ -198,6 +198,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) } NotShared AudioBuffer::getChannelData( @@ -10,7 +10,7 @@ index 1d323417ea4c7c04b07f12922208f03f84d0b946..4393324122ff96d7ca0fac6b3e02d36b unsigned channel_index, ExceptionState& exception_state) { if (channel_index >= channels_.size()) { -@@ -208,6 +209,7 @@ NotShared AudioBuffer::getChannelData( +@@ -209,6 +210,7 @@ NotShared AudioBuffer::getChannelData( return NotShared(nullptr); } @@ -18,7 +18,7 @@ index 1d323417ea4c7c04b07f12922208f03f84d0b946..4393324122ff96d7ca0fac6b3e02d36b return getChannelData(channel_index); } -@@ -219,13 +221,15 @@ NotShared AudioBuffer::getChannelData(unsigned channel_index) { +@@ -220,13 +222,15 @@ NotShared AudioBuffer::getChannelData(unsigned channel_index) { return NotShared(channels_[channel_index].Get()); } @@ -37,7 +37,7 @@ index 1d323417ea4c7c04b07f12922208f03f84d0b946..4393324122ff96d7ca0fac6b3e02d36b int32_t channel_number, size_t buffer_offset, ExceptionState& exception_state) { -@@ -266,6 +270,7 @@ void AudioBuffer::copyFromChannel(NotShared destination, +@@ -267,6 +271,7 @@ void AudioBuffer::copyFromChannel(NotShared destination, DCHECK_LE(buffer_offset + count, data_length); memmove(dst, src + buffer_offset, count * sizeof(*src)); diff --git a/patches/tools-clang-pylib-clang-compile_db.py.patch b/patches/tools-clang-pylib-clang-compile_db.py.patch index 2e28b49fb71f..71d8e6b21bf9 100644 --- a/patches/tools-clang-pylib-clang-compile_db.py.patch +++ b/patches/tools-clang-pylib-clang-compile_db.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/clang/pylib/clang/compile_db.py b/tools/clang/pylib/clang/compile_db.py -index ff6ff9d3d4ae9cb25330ca88f2747fdac66eb939..607bd896ca625520b93282d6f284ee65bf06822b 100755 +index ca06d706bbf6afb6aaa40b98f1c505bfe820e388..ea49762cbe4dea3672539de2e412233007896847 100755 --- a/tools/clang/pylib/clang/compile_db.py +++ b/tools/clang/pylib/clang/compile_db.py -@@ -212,3 +212,4 @@ def Read(path): +@@ -211,3 +211,4 @@ def Read(path): """ with open(os.path.join(path, 'compile_commands.json'), 'rb') as db: return json.load(db) diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 921afcf91780..e1ef4dd2d6e4 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 070b499be40e6540145fd24593779b15b6aa5d36..d4f6843ac86a5e6e6fbcdefe472cb40b8611305a 100644 +index 55c1ee2590576aded7cde2625297e9b47713c29f..66b4fb2be1ef5202f868a2b5e4c0b47901333685 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -41,6 +41,9 @@ @@ -12,7 +12,7 @@ index 070b499be40e6540145fd24593779b15b6aa5d36..d4f6843ac86a5e6e6fbcdefe472cb40b "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -205,7 +208,7 @@ +@@ -209,7 +212,7 @@ "includes": [1600], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/resources.grd": { @@ -21,7 +21,7 @@ index 070b499be40e6540145fd24593779b15b6aa5d36..d4f6843ac86a5e6e6fbcdefe472cb40b "includes": [1620], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/identity_internals/resources.grd": { -@@ -292,7 +295,7 @@ +@@ -296,7 +299,7 @@ "includes": [1940], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/resources.grd": { @@ -30,7 +30,7 @@ index 070b499be40e6540145fd24593779b15b6aa5d36..d4f6843ac86a5e6e6fbcdefe472cb40b "includes": [1960], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/signin/profile_picker/resources.grd": { -@@ -725,6 +728,9 @@ +@@ -729,6 +732,9 @@ "components/components_chromium_strings.grd": { "messages": [3520], }, diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index 63a9be10f80d..e7f75a26971a 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index a99ccc4f55b2925a0318bc1baf4f81bca1185d33..26da4027de2cb856fc85cc42a0b3f6cd42e9f0b0 100644 +index 67b097cd7a23d8bc074dfc2552b716770448c9df..95dfaf7b27cefa83489849c58f2edd151bf8952f 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -7206,6 +7206,7 @@ chromium-metrics-reviews@google.com. +@@ -4226,6 +4226,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/tools-perf-core-results_dashboard.py.patch b/patches/tools-perf-core-results_dashboard.py.patch index 3600aee371a5..153be6379af3 100644 --- a/patches/tools-perf-core-results_dashboard.py.patch +++ b/patches/tools-perf-core-results_dashboard.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/perf/core/results_dashboard.py b/tools/perf/core/results_dashboard.py -index 2c7224383387d23bcf478c34ec909f1762d7a8e2..33bdc97a62331acd7c830dcde7df361786066f9e 100755 +index 81c7a4ceb51d01c0c932cbdca6f45442ca098ac7..72927c76867178e07b8afb6203a91d2bf1f4f3cf 100755 --- a/tools/perf/core/results_dashboard.py +++ b/tools/perf/core/results_dashboard.py -@@ -502,3 +502,4 @@ def _SendHistogramJson(url, histogramset_json, token_generator_callback): +@@ -527,3 +527,4 @@ def _SendHistogramJson(url, logging.info('Upload completion token created. Token id: %s' % token) except Exception as e: # pylint: disable=broad-except logging.warning('Error fetching upload completion token: %s' % e) diff --git a/patches/tools-perf-process_perf_results.py.patch b/patches/tools-perf-process_perf_results.py.patch index 5df747ec5f1c..9f1142f4ed94 100644 --- a/patches/tools-perf-process_perf_results.py.patch +++ b/patches/tools-perf-process_perf_results.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/perf/process_perf_results.py b/tools/perf/process_perf_results.py -index deecd19f5384ab594296a6817b4b9b9e52d1ab4e..a7a1f0d734407cb0557ac33aa13fd7b53beb262e 100755 +index 671e3d3474178e69199341b2ba83f295dc0a4b3f..a2a2f3183ebdd23c49b447332f955d122a2a76e9 100755 --- a/tools/perf/process_perf_results.py +++ b/tools/perf/process_perf_results.py @@ -41,7 +41,7 @@ except ImportError: diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 2a896e29c997..3f8959620da2 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index 491e45ea6ca181f640144387cd94cdeedc7a2321..534910e7092cc3ae056cd22b8e8f914f4dd0aad0 100644 +index 11bbc9e2917aea17c3bd456c57f1c57088cc39ce..24eb18260eb4ae2e26be1fe5993c300b728fc1ff 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -2213,6 +2213,7 @@ bool IsAXSetter(SEL selector) { +@@ -2258,6 +2258,7 @@ void CollectAncestorRoles( if (!_node) return nil; diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index 49b23b74c5f2..87af17afa1cb 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index 6230688b9ed1dcb239482cfa1dab7daeaf0501c2..ef2c2e143762980bd860f179369725fb70b8bbe5 100644 +index c2f3c20cbe92e877acc30111314a0ee2bce539a1..e2bd868eddbcbf837049cd7fd71c817706027e58 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc -@@ -1585,6 +1585,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { +@@ -1586,6 +1586,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { &apps_use_light_theme); dark_mode_enabled = (apps_use_light_theme == 0); } diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index 19b4bd218ef4..a3ef2585123b 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index 138269201bf8305f329b4c5a2bb88e1922d6f26c..6c59c34d2f577f610cb45aaecdb32cde7835537c 100644 +index 8e93492d361cec271051c7d4ccbc8a1bce3dbcff..ab199eefd31e7ce9ffba08b20051c21dc222c811 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn @@ -105,6 +105,7 @@ generate_grd("build_grd") { @@ -10,7 +10,7 @@ index 138269201bf8305f329b4c5a2bb88e1922d6f26c..6c59c34d2f577f610cb45aaecdb32cde } if (is_chromeos_ash) { -@@ -234,6 +235,7 @@ ts_library("library") { +@@ -238,6 +239,7 @@ ts_library("library") { ":generate_definitions", ":preprocess", ] diff --git a/patches/ui-webui-resources-cr_elements-cr_elements.gni.patch b/patches/ui-webui-resources-cr_elements-cr_elements.gni.patch index bb3a6ba682a7..ee80daefb955 100644 --- a/patches/ui-webui-resources-cr_elements-cr_elements.gni.patch +++ b/patches/ui-webui-resources-cr_elements-cr_elements.gni.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/cr_elements.gni b/ui/webui/resources/cr_elements/cr_elements.gni -index 8e2a53ad7dd6e4ac821536f473f13d0fdf3c9678..b8b03ef5b83d77c6da899a2491e412d4232f20aa 100644 +index 5cbbb4151fbc8ad29c72e0f8c7fc30d558ae9db2..bf36744730cf898ec5cc9ead53ac513c015ac10b 100644 --- a/ui/webui/resources/cr_elements/cr_elements.gni +++ b/ui/webui/resources/cr_elements/cr_elements.gni -@@ -66,6 +66,7 @@ if (include_polymer) { +@@ -67,6 +67,7 @@ if (include_polymer) { web_component_files_polymer_ts += [ "cr_searchable_drop_down/cr_searchable_drop_down.ts" ] } diff --git a/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch b/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch index 836f4fcdfc82..cd07bcbb66cf 100644 --- a/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch +++ b/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts b/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts -index 941508638cbc43dac79176766a0384824b502fba..75bc6070e80a514310ea5f93c42d4ad1e5f98468 100644 +index 8a4039e6732523a72c939e9d8860398996f78747..178b169623574666bebf2700906c8d926a4bc5b2 100644 --- a/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts +++ b/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts -@@ -345,6 +345,7 @@ export class CrLottieElement extends PolymerElement { +@@ -361,6 +361,7 @@ export class CrLottieElement extends PolymerElement { this.fire_('cr-lottie-paused'); } else if (event.data.name === 'stopped') { this.fire_('cr-lottie-stopped'); diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 976f9e7281be..41297ede5979 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index 78fd8cd2d387902406c2663f5217e6b8717a5c30..984560838e305098a76f022f2da755dc6c1893a1 100644 +index ce16c70d8ac78869401572035c8297c0c246d96e..4df4d80a4fe103a768d1d6412f616e5a6616b56f 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -621,6 +621,7 @@ config("internal_config_base") { +@@ -616,6 +616,7 @@ config("internal_config_base") { "$target_gen_dir", "$target_gen_dir/include", ] @@ -10,7 +10,7 @@ index 78fd8cd2d387902406c2663f5217e6b8717a5c30..984560838e305098a76f022f2da755dc } config("internal_config") { -@@ -2635,6 +2636,7 @@ v8_header_set("v8_headers") { +@@ -2633,6 +2634,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] diff --git a/patches/v8/src-codegen-compiler.cc.patch b/patches/v8/src-codegen-compiler.cc.patch index a5c2250bdd57..a5a747c0f6b7 100644 --- a/patches/v8/src-codegen-compiler.cc.patch +++ b/patches/v8/src-codegen-compiler.cc.patch @@ -1,8 +1,8 @@ diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc -index 9e7d2394fba06483f9fad30d440daf0abce876aa..c427b6d6b32dccc7ecfe7c054c426ea7ae657359 100644 +index c87b78ae19af1ea7fa7b9e4908722670dfa70860..46edf27515b1a8e218373c655c3685cf0289e0a7 100644 --- a/src/codegen/compiler.cc +++ b/src/codegen/compiler.cc -@@ -2887,6 +2887,7 @@ MaybeHandle Compiler::GetFunctionFromEval( +@@ -2870,6 +2870,7 @@ MaybeHandle Compiler::GetFunctionFromEval( } } DCHECK(is_compiled_scope.is_compiled()); From 6772cac8128416a7ac897c4938aef1d9d7dd89e3 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:55:42 +0000 Subject: [PATCH 004/146] Updated strings for Chromium 110.0.5449.0. --- app/extensions_strings.grdp | 12 +- app/generated_resources.grd | 235 ++++++++++-- app/generated_resources_override.grd | 3 - app/os_settings_search_tag_strings.grdp | 5 +- app/os_settings_strings.grdp | 91 +++-- app/password_manager_ui_strings.grdp | 5 + app/settings_strings.grdp | 59 ++- app/settings_strings_override.grdp | 12 +- .../strings/android_chrome_strings.grd | 337 ++++++++++++++++-- .../android_chrome_strings_override.grd | 16 +- components/autofill_strings.grdp | 2 +- components/permissions_strings.grdp | 3 - components/policy_strings.grdp | 39 ++ components/print_media_strings.grdp | 4 +- 14 files changed, 707 insertions(+), 116 deletions(-) diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index 9989501e6eae..ff7968b3b18c 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -124,6 +124,9 @@ This extension can read and change your data on sites. You can control which sites the extension can access. + + Learn more about extension permissions + Edit @@ -452,14 +455,17 @@ Site URL - - Edit shortcut + + Shortcut $1 for $2 + + + Edit shortcut $1 for $2 Not set - Scope + Scope of $1 for $2 Global diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 50f9798d0ca0..3ee516868596 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -4763,18 +4763,6 @@ are declared in tools/grit/grit_rule.gni. Click to allow on $1google.com: - - Always allow "$1Gmail Checker" to run on $2google.com? - - - Always allow these extensions to run on $1google.com? - - - Always allow - - - No thanks - Allowed to read & change @@ -6358,6 +6346,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Don't show shortcuts on this page + + Show shortcuts + My shortcuts @@ -6780,12 +6771,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Got extensions? <a href="chrome://extensions">Manage your extensions</a> in one easy place. - - - Top sites - - - @@ -6902,9 +6887,6 @@ Keep your key file in a safe place. You will need it to create new versions of y - - $1All Bookmarks ($2Newest) - Sort by $1Newest @@ -6926,8 +6908,26 @@ Keep your key file in a safe place. You will need it to create new versions of y Z to A + + Visual view + + + Compact view + - Sort Options + View List Options + + + Create New Folder + + + Edit Bookmark List + + + You'll find your bookmarks here + + + Bookmark things you want to come back to later @@ -7449,6 +7449,9 @@ Keep your key file in a safe place. You will need it to create new versions of y + + Nicely Done! + Right-click on a tab and select "Add Tab To New Group" @@ -7485,6 +7488,23 @@ Keep your key file in a safe place. You will need it to create new versions of y Try using tab groups to organize tasks, for online shopping, and more + + + Click the side panel icon to open it + + + Now add the current tab to your list + + + Select “Mark as read” to move the page to the bottom of your list + + + Click the drop down to choose another panel + + + Try using the side panel for bookmarks, journeys, and more + + @@ -9823,11 +9843,11 @@ Check your passwords anytime in $1Brave P Autofill - - History + + Extensions - - Extensions and more + + History and more You can always choose what to sync in settings. Brave may personalize Search and other services based on your history. @@ -12286,6 +12306,18 @@ Please help our engineers fix this problem. Tell us what happened right before y Brave is being controlled by automated test software. + + + Brave for Testing v + $1109.0.5369.0 + is only for automated testing. For regular browsing, use a standard version of Brave that updates automatically. + + + + + Download Brave + + @@ -13607,6 +13639,157 @@ Please help our engineers fix this problem. Tell us what happened right before y Settings + + + Lorem ipsum Consent + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pretium pulvinar metus non mollis. Quisque placerat eget nisl sit amet facilisis. + + + Nulla in tortor a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. Integer et libero id metus egestas consequat non a ipsum. + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu, elementum ut venenatis ornare, consequat ac turpis. + + + Vestibulum orci risus, consectetur + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu, elementum ut venenatis ornare, consequat ac turpis. + + + Consectetur + + + Quisque + + + Lorem + + + Esed purus vestibulum velit convalli + + + <b>Nulla in tortor: </b> a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. + + + <b>Consectetur adipiscing elit:</b> Duis pretium pulvinar metus non mollis + + + <b>Sed purus vestibulum:</b> velit convallis suscipit. Aenean aliquam ut velit eget dapibus. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Esed purus vestibulum velit convalli + + + Sed ullamcorper, ligula ac tempus venenatis + + + + Lorem ipsum Notice EEA + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pretium pulvinar metus non mollis. Quisque placerat eget nisl sit amet facilisis. + + + Nulla in tortor: a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. + + + Sed purus vestibulum: velit convallis suscipit. Aenean aliquam ut velit eget dapibus. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Vestibulum orci risus, consectetur + + + Consectetur adipiscing elit duis pretium pulvinar metus non mollis + + + Sed + + + Cras id + + + Esed purus vestibulum velit convalli + + + Nulla in tortor a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. Integer et libero id metus egestas consequat non a ipsum. + + + Proin sed purus vestibulum velit velit eget dapibus. + + + <b>Nulla in tortor:</b> a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. + + + <b>Consectetur adipiscing elit:</b> Duis pretium pulvinar metus non mollis + + + <b>Sed purus vestibulum:</b> velit convallis suscipit. Aenean aliquam ut velit eget dapibus. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + + Lorem ipsum Notice ROW + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pretium pulvinar metus non mollis. + + + Nulla in tortor a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. Integer et libero id metus egestas consequat non a ipsum. Quisque placerat eget nisl sit amet facilisis. + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu, elementum ut venenatis ornare, consequat ac turpis. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Proin sed purus vestibulum velit convallis suscipit eget dapibus. + + + Sed + + + Cras id + + + Vestibulum orci risus consectetur + + + Esed purus vestibulum velit convalli + + + Etiam dictum sem et neque molestie lobortis. Morbi quam tellus, tincidunt eget dapibus ac, lobortis et lacus. Integer nec egestas elit. Nulla venenatis facilisis dui eget suscipit. + + + Class aptent taciti sociosqu ad + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu. + + + Sed elementum tellus condimentum quam vestibulum lacinia. Ut eu lobortis massa, venenatis sodales lacus. Nulla elementum magna et tortor efficitur, at volutpat metus varius. + + + Duis tempor nulla nisi, ac bibendum lorem tempus sit amet. Proin non blandit risus. Maecenas facilisis enim nec tristique tristique. Eelementum ut venenatis ornare, consequat ac turpis. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Etiam hendrerit turpis nibh, ac maximus lectus placerat at. Vivamus ligula quam, posuere luctus felis eu, dictum egestas arcu. per conubia nostra, per inceptos himenaeos. Cras ut metus vel est molestie finibus nec ut orci. + + + Aliquam euismod scelerisque metus, in aliquet est vehicula ut. Curabitur sit amet ligula quis ante maximus gravida non id magna. Pellentesque interdum venenatis leo, at ultrices felis mollis nec. Integer vulputate velit eget mauris lacinia, ut ullamcorper mauris vehicula. + + + Orci varius natoque penatibus et + + + Suspendisse at dui pulvinar, rhoncus orci at, porttitor nibh. Curabitur lacinia nulla sem, eu euismod dolor vulputate quis. Duis mattis eros et arcu elementum tempor. Duis pharetra eleifend sagittis. + + + Cras sed lacus suscipit, efficitur erat nec, semper sapien. Fusce at nunc molestie, elementum augue at, auctor nunc. Sed dui nisi, consectetur sit amet urna vitae, facilisis scelerisque justo. + + + Ut venenatis magna nec lacus facilisis + + diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index e821d2425b9b..52a50480ffeb 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -595,9 +595,6 @@ are declared in tools/grit/grit_rule.gni. See memories of your favorite profiles and more - - - diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 54631115a97f..93d7415633f5 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -117,9 +117,12 @@ Rename eSIM profile - + Mobile networks + + Hotspot + Turn off Instant Tethering diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 68d14d4448ac..4cc389df5e67 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -41,6 +41,9 @@ Search result $11 of $22: $3Network Settings. Press Enter to navigate to section. + + Report this search result + @@ -319,27 +322,6 @@ Touch the power button with your finger - - The fingerprint sensor is in the power button. Touch it lightly with any finger. - - - Touch the fingerprint sensor with your finger - - - The fingerprint sensor is the bottom left-hand key on your keyboard. Touch it lightly with any finger. - - - The fingerprint sensor is the bottom right-hand key on your keyboard. Touch it lightly with any finger. - - - The fingerprint sensor is the top right-hand key on your keyboard. Touch it lightly with any finger. - - - The fingerprint sensor is on the right-hand side of your $1Chromebook. Touch it lightly with any finger. - - - The fingerprint sensor is on the left-hand side of your $1Chromebook. Touch it lightly with any finger. - @@ -1249,6 +1231,48 @@ Use Ctrl + Alt + Brightness down to zoom out. Hear specific text read aloud. First, select the Select-to-speak icon on the bottom of your screen, then highlight text. + + Highlighting + + + Highlight each word as it is spoken + + + Highlight color + + + Blue + + + Orange + + + Yellow + + + Green + + + Pink + + + Dark background + + + Light background + + + Dim background content + + + The quick brown fox jumped over the lazy dog. + + + Enable navigation controls + + + Provides controls to speed up, slow down, and pause the reading voice + Hear specific text read aloud. First, select the Select-to-speak icon on the bottom of your screen, then highlight text. You can also use a keyboard shortcut: Highlight text, then press Search + S. @@ -1629,6 +1653,9 @@ Press an assigned switch or key to remove assignment. Mono audio, startup, Live Caption, and more + + Select-to-speak settings + @@ -1941,11 +1968,10 @@ Press an assigned switch or key to remove assignment. Create a new container - - - This container and VM name combination already exists. + + This container already exists. - + Container name cannot be empty. @@ -2795,6 +2821,12 @@ Press an assigned switch or key to remove assignment. VPN details + + Hotspot details + + + Uses your Chromebook’s mobile data and your carrier may charge additional fees. May increase battery usage. <a target="_blank" href="$1">Learn more</a> + Wi-Fi networks @@ -2819,6 +2851,9 @@ Press an assigned switch or key to remove assignment. Network + + Hotspot + $1Mobile Data - $2Verizon Wireless @@ -3592,6 +3627,12 @@ Press an assigned switch or key to remove assignment. Local data can be restored if you forget your password + + Disable local data recovery? + + + You will not be able to recover local data if you forget your password or PIN. + diff --git a/app/password_manager_ui_strings.grdp b/app/password_manager_ui_strings.grdp index 5baf1b569acf..55e0125089c9 100644 --- a/app/password_manager_ui_strings.grdp +++ b/app/password_manager_ui_strings.grdp @@ -115,4 +115,9 @@ Sites which never save passwords will appear here + + {COUNT, plural, + =1 {{COUNT} account} + other {{COUNT} accounts}} + diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index c027da503b21..d50b6093b783 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -893,6 +893,9 @@ Password is more than 1000 characters + + Note is more than 1000 characters + A password for this account is already saved to your Brave Password Manager (elisa.g.becket@gmail.com$1) @@ -1758,17 +1761,37 @@ Spam and fraud reduction - - Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. - - When trials are on, Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + When trials are on, Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. - - Based on your interaction with a site, like regularly signing in to an account, that site can issue a trust token to your browser. Later, if other sites you visit check for and find a valid trust token, they're more likely to treat you like a profile and not a bot. + + Based on your interaction with a site, like regularly signing in to an account, that site can issue a private state token to your browser. Later, if other sites you visit check for and find a valid private state token, they're more likely to treat you like a profile and not a bot. - Trust tokens improve privacy on the web and can't be used to find out who you are. + Private state tokens improve privacy on the web and can't be used to find out who you are. + + + + + Donec semper + + + + + Mauris interdum lectus vitae lacinia + + + + + Aenean erat leo + + + + + Vestibulum augue @@ -1972,8 +1995,13 @@ Review - - Permissions removed from unused websites + + {NUM_SITES, plural, + =1 {Permissions removed from <b>1 site</b> you haven’t visited recently} + other {Permissions removed from <b>{NUM_SITES} sites</b> you haven’t visited recently}} + + + Review removed permissions Updates @@ -2040,11 +2068,16 @@ {NUM_SITES, plural, - =1 {Review 1 site that recently sent a lot of notifications} - other {Review {NUM_SITES} sites that recently sent a lot of notifications}} + =1 {Review 1 site that sent a lot of notifications} + other {Review {NUM_SITES} sites that sent a lot of notifications}} + + + Review notification permissions - These sites sent a lot of notifications recently. You can stop them from sending future notifications. + {NUM_SITES, plural, + =1 {This site sent a lot of notifications recently. You can stop it from sending future notifications.} + other {These sites sent a lot of notifications recently. You can stop them from sending future notifications.}} Notifications allowed for $1www.example.com @@ -2232,7 +2265,7 @@ Permissions and content settings - + Controls what information sites can use and show (location, camera, pop-ups, and more) diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index fc4d401d7b5c..f17902526d08 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -96,14 +96,14 @@ Help sites fight fraud and distinguish bots from profiles - - Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. - - When trials are on, Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + When trials are on, Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. - - Based on your interaction with a site, like regularly signing in to an account, that site can issue a trust token to your browser. Later, if other sites you visit check for and find a valid trust token, they're more likely to treat you like a profile and not a bot. + + Based on your interaction with a site, like regularly signing in to an account, that site can issue a private state token to your browser. Later, if other sites you visit check for and find a valid private state token, they're more likely to treat you like a profile and not a bot. Block third-party cookies in Private diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 560d24431964..ffe406e7808d 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -809,6 +809,18 @@ CHAR_LIMIT guidelines: Privacy and security + + Privacy + + + Security + + + Donec semper + + + Fusce purus nibh, dictum sit amet mi in, fringilla ullamcorper tortor + Touch to Search @@ -944,19 +956,19 @@ When you delete your browsing history — all or for a specific site — you als Help sites fight fraud and distinguish bots from profiles - - Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. -Based on your interaction with a site, like regularly signing in to an account, that site can issue a trust token to your browser. Later, if other sites you visit check for and find a valid trust token, they’re more likely to treat you like a profile and not a bot. +Based on your interaction with a site, like regularly signing in to an account, that site can issue a private state token to your browser. Later, if other sites you visit check for and find a valid private state token, they’re more likely to treat you like a profile and not a bot. -Trust tokens improve privacy on the web and can’t be used to find out who you are. +Private state tokens improve privacy on the web and can’t be used to find out who you are. - - When trials are on, Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + When trials are on, Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. -Based on your interaction with a site, like regularly signing in to an account, that site can issue a trust token to your browser. Later, if other sites you visit check for and find a valid trust token, they’re more likely to treat you like a profile and not a bot. +Based on your interaction with a site, like regularly signing in to an account, that site can issue a private state token to your browser. Later, if other sites you visit check for and find a valid private state token, they’re more likely to treat you like a profile and not a bot. -Trust tokens improve privacy on the web and can’t be used to find out who you are. +Private state tokens improve privacy on the web and can’t be used to find out who you are. <b>What data is used:</b> Your browsing history, a record of sites you’ve visited using Brave on this device. @@ -1099,6 +1111,267 @@ Trust tokens improve privacy on the web and can’t be used to find out who you Brave is finding new ways to reduce tracking and keep you even safer as you browse. Brave also <link>estimates your interests</link> and enables you to manage them. Then, sites you visit can ask Brave for your interests to show you ads. + + + Lorem ipsum Consent + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pretium pulvinar metus non mollis. Quisque placerat eget nisl sit amet facilisis. + + + Nulla in tortor a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. Integer et libero id metus egestas consequat non a ipsum. + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu, elementum ut venenatis ornare, consequat ac turpis. + + + Vestibulum orci risus, consectetur + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu, elementum ut venenatis ornare, consequat ac turpis. + + + Consectetur + + + Quisque + + + Lorem + + + Esed purus vestibulum velit convalli + + + <b>Nulla in tortor:</b> a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. + + + <b>Consectetur adipiscing elit:</b> Duis pretium pulvinar metus non mollis + + + <b>Sed purus vestibulum: </b> velit convallis suscipit. Aenean aliquam ut velit eget dapibus. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Esed purus vestibulum velit convalli + + + + + Lorem ipsum Notice EEA + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pretium pulvinar metus non mollis. Quisque placerat eget nisl sit amet facilisis. + + + Nulla in tortor: a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. + + + Sed purus vestibulum: velit convallis suscipit. Aenean aliquam ut velit eget dapibus. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Vestibulum orci risus, consectetur + + + Consectetur adipiscing elit duis pretium pulvinar metus non mollis + + + Sed + + + Cras id + + + Esed purus vestibulum velit convalli + + + Nulla in tortor a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. Integer et libero id metus egestas consequat non a ipsum. + + + Proin sed purus vestibulum velit velit eget dapibus. + + + <b>Nulla in tortor:</b> a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. + + + <b>Consectetur adipiscing elit:</b> Duis pretium pulvinar metus non mollis + + + <b>Sed purus vestibulum: </b> velit convallis suscipit. Aenean aliquam ut velit eget dapibus. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + + + Lorem ipsum Notice ROW + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pretium pulvinar metus non mollis. + + + Nulla in tortor a ligula scelerisque laoreet. Sed sem velit, varius non purus vitae, imperdiet porttitor elit. Integer et libero id metus egestas consequat non a ipsum. Quisque placerat eget nisl sit amet facilisis. + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu, elementum ut venenatis ornare, consequat ac turpis. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Proin sed purus vestibulum velit convallis suscipit eget dapibus. + + + Sed + + + Cras id + + + Vestibulum orci risus consectetur + + + Esed purus vestibulum velit convalli + + + Etiam dictum sem et neque molestie lobortis. Morbi quam tellus, tincidunt eget dapibus ac, lobortis et lacus. Integer nec egestas elit. Nulla venenatis facilisis dui eget suscipit. + + + Class aptent taciti sociosqu ad + + + Vestibulum pretium placerat justo vel suscipit. Quisque urna arcu. + + + Sed elementum tellus condimentum quam vestibulum lacinia. Ut eu lobortis massa, venenatis sodales lacus. Nulla elementum magna et tortor efficitur, at volutpat metus varius. + + + Duis tempor nulla nisi, ac bibendum lorem tempus sit amet. Proin non blandit risus. Maecenas facilisis enim nec tristique tristique. Eelementum ut venenatis ornare, consequat ac turpis. Vestibulum orci risus, consectetur non odio vulputate, mattis dignissim purus. Cras id tempor mi. + + + Etiam hendrerit turpis nibh, ac maximus lectus placerat at. Vivamus ligula quam, posuere luctus felis eu, dictum egestas arcu. per conubia nostra, per inceptos himenaeos. Cras ut metus vel est molestie finibus nec ut orci. + + + Aliquam euismod scelerisque metus, in aliquet est vehicula ut. Curabitur sit amet ligula quis ante maximus gravida non id magna. Pellentesque interdum venenatis leo, at ultrices felis mollis nec. Integer vulputate velit eget mauris lacinia, ut ullamcorper mauris vehicula. + + + Orci varius natoque penatibus et + + + Suspendisse at dui pulvinar, rhoncus orci at, porttitor nibh. Curabitur lacinia nulla sem, eu euismod dolor vulputate quis. Duis mattis eros et arcu elementum tempor. Duis pharetra eleifend sagittis. + + + Cras sed lacus suscipit, efficitur erat nec, semper sapien. Fusce at nunc molestie, elementum augue at, auctor nunc. Sed dui nisi, consectetur sit amet urna vitae, facilisis scelerisque justo. + + + + + Donec semper + + + Mauris interdum lectus vitae lacinia + + + Enabled Nulla eros tortor, placerat blandit dictum a, interdum id metus + + + Aenean erat leo + + + Enabled Duis scelerisque a mi eget ultricies + + + Vestibulum augue erat + + + Enabled Vivamus id lacus et lacus porttitor vulputate. Sed semper egestas orci vel maximus. + + + + + Mauris interdum lectus vitae lacinia + + + Nunc gravida condimentum consectetur + + + + Vivamus nibh turpis, varius quis nisi vel, porta laoreet tellus. <link>Mauris porta imperdiet venenatis</link> + + + Mauris at lectus + + + Nulla tincidunt iaculis nulla, sit amet viverra massa luctus nec. Integer eget pellentesque magna, et venenatis lorem. Integer a porta elit, eget bibendum neque. + + + Sed porta viverra lacus ut euismod. Integer a cursus metus, ac ultricies libero. + + + Curabitur sagittis sapien ut turpis interdum, vitae porttitor sem pretium. Vestibulum sem mauris, ultrices ac massa sit amet, sodales aliquet est. + + + Integer faucibus metus + + + + Quisque eu auctor purus, id tempus nulla. Pellentesque porta orci purus. Donec dictum, <link1>justo nec ultricies semper</link1>, <link2>eros mauris varius nibh</link2>, sit amet molestie quam arcu id urna. Donec vulputate dui ut lorem egestas, ac sollicitudin metus fermentum. + + + + + Aenean erat leo + + + Nunc aliquam consequat felis non tincidunt + + + + Donec pretium non elit vitae ornare. Morbi arcu elit, rutrum nec sapien quis, <link>tristique tristique ante</link> + + + Aliquam + + + Nullam sollicitudin elit vitae hendrerit suscipit. Nunc mi leo, placerat sit amet lorem non, semper convallis sapien. + + + Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos + + + Morbi quis orci in mauris tempus rutrum. Curabitur blandit orci tortor, pellentesque tempor turpis lacinia ac. + + + Donec non mi + + + Curabitur a pharetra + + + + Pellentesque sollicitudin purus sit amet felis fringilla blandit. Donec a eleifend ligula, <link1>et fringilla nunc</link1>. Vivamus sit amet <link2>cursus quam</link2>. Etiam ultricies rutrum orci, eget accumsan purus mattis in. + + + + + Vestibulum augue erat + + + Vestibulum augue erat + + + Vestibulum eleifend nunc a viverra congue. Integer nec mauris rutrum, porta mauris et, pellentesque ligula. Nam et pulvinar eros, in gravida nisl. + + + Mauris + + + Aenean + + + Praesent sodales, magna eget volutpat iaculis, justo odio viverra justo, id venenatis est est sit amet ex + + + Nunc metus est, faucibus sit amet lacus sit amet, aliquet rutrum libero. Maecenas vel euismod ante. + + + Mauris mattis urna elit. Phasellus quis erat sapien. Praesent finibus pellentesque iaculis. Mauris hendrerit metus at enim rhoncus bibendum. + + Custom @@ -1767,6 +2040,9 @@ Your Brave account may have other forms of browsing history like searches and ac If you change the file extension, the file may open in a different application and potentially be a hazard to your device. + + New file name + @@ -3105,8 +3381,23 @@ To change this setting, <resetlink>reset sync

Manage - - Creator Profile + + You're offline + + + Check your internet connection and try again + + + Nothing to show yet + + + You'll see content when it becomes available + + + Something went wrong + + + Try again later Activity @@ -3253,12 +3544,6 @@ To change this setting, <resetlink>reset sync

Checking your internet connection - - See popular websites - - - See popular websites by tapping the "Top sites" button - @@ -4324,15 +4609,6 @@ To change this setting, <resetlink>reset sync

Establishing a tunnel via proxy server failed - - Apps - - - Uninstall - - - Site settings - @@ -5652,6 +5928,17 @@ To change this setting, <resetlink>reset sync

Price drop spotted + + + + Resume your last task? + + + Easily continue where you left off + + + Restore + diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd index f87ee2e7d09a..e51546cf11fc 100644 --- a/browser/ui/android/strings/android_chrome_strings_override.grd +++ b/browser/ui/android/strings/android_chrome_strings_override.grd @@ -126,19 +126,19 @@ CHAR_LIMIT guidelines: Help sites fight fraud and distinguish bots from profiles - - Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. -Based on your interaction with a site, like regularly signing in to an account, that site can issue a trust token to your browser. Later, if other sites you visit check for and find a valid trust token, they’re more likely to treat you like a profile and not a bot. +Based on your interaction with a site, like regularly signing in to an account, that site can issue a private state token to your browser. Later, if other sites you visit check for and find a valid private state token, they’re more likely to treat you like a profile and not a bot. -Trust tokens improve privacy on the web and can’t be used to find out who you are. +Private state tokens improve privacy on the web and can’t be used to find out who you are. - - When trials are on, Spam & fraud reduction relies on trust tokens to help sites fight fraud and distinguish bots from profiles. + + When trials are on, Spam & fraud reduction relies on private state tokens to help sites fight fraud and distinguish bots from profiles. -Based on your interaction with a site, like regularly signing in to an account, that site can issue a trust token to your browser. Later, if other sites you visit check for and find a valid trust token, they’re more likely to treat you like a profile and not a bot. +Based on your interaction with a site, like regularly signing in to an account, that site can issue a private state token to your browser. Later, if other sites you visit check for and find a valid private state token, they’re more likely to treat you like a profile and not a bot. -Trust tokens improve privacy on the web and can’t be used to find out who you are. +Private state tokens improve privacy on the web and can’t be used to find out who you are. Block while using private diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp index 61221a523e96..e2fbc6a91a77 100644 --- a/components/autofill_strings.grdp +++ b/components/autofill_strings.grdp @@ -168,7 +168,7 @@ $1Visa ••••5679, expires on $206/17 - + Expires on $106/17 diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp index f09904f31182..ea59c2c5a6d1 100644 --- a/components/permissions_strings.grdp +++ b/components/permissions_strings.grdp @@ -85,9 +85,6 @@ $1https://www.youtube.com wants to play protected content. Your device’s identity will be verified by Brave. - - $1https://www.youtube.com wants to play protected content. Your device's identity will be verified by Brave and may be accessed by this site. - Know your location diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index 97bb0a28adcc..922ea138c3c8 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -211,6 +211,9 @@ Each urls string entry must contain between 1 to 2 URLs. + + This configuration is marked as installable, but no image is provided for this archetecture, so it cannot be installed. + Ignored because the policy is not set by a cloud source. @@ -253,6 +256,18 @@ One or more of the DnsOverHttpsTemplates server template URIs is invalid and will not be used. + + The DnsOverHttpsSalt value is not relevant, and will not be used, unless the DnsOverHttpsTemplateWithIdentifiers policy is set. + + + The DnsOverHttpsTemplateWithIdentifiers policy is not used unless the DnsOverHttpsSalt policy is set. + + + The DnsOverHttpsSalt value is invalid and will not be used. + + + The DnsOverHttpsSalt value does not meet the size requirements. + The DnsOverHttpsTemplates value is not relevant, and will not be used, unless the DnsOverHttpsMode policy is set to either 'automatic' or 'secure'. @@ -399,6 +414,9 @@ Additional details: Brave Update + + Managed user or device has no policy loaded. + Enrollment domain: @@ -839,6 +857,11 @@ Additional details: =1 {Copy confidential file?} other {Copy confidential files?}} + + {0, plural, + =1 {Open confidential file?} + other {Open confidential files?}} + {0, plural, =1 {Administrator policy doesn’t recommend downloading this file to $1External storage} @@ -864,6 +887,11 @@ Additional details: =1 {Administrator policy doesn’t recommend copying this file to $1External storage} other {Administrator policy doesn’t recommend copying these files to $1External storage}} + + {0, plural, + =1 {Administrator policy doesn’t recommend opening this file in $1External storage} + other {Administrator policy doesn’t recommend opening these files in $1External storage}} + Download anyway @@ -879,6 +907,9 @@ Additional details: Copy anyway + + Open anyway + Removable storage @@ -902,6 +933,14 @@ Additional details: =1 {Uploading this file is blocked by administrator policy} other {Uploading # files is blocked by administrator policy}} + + Blocked open + + + {0, plural, + =1 {Opening this file is blocked by administrator policy} + other {Opening # files is blocked by administrator policy}} + Device will restart very soon diff --git a/components/print_media_strings.grdp b/components/print_media_strings.grdp index a7d7882f8af7..ddcc0c7565cf 100644 --- a/components/print_media_strings.grdp +++ b/components/print_media_strings.grdp @@ -2,8 +2,8 @@ - - E1 + + 28 x 40 in 2A0 From ddf254e5d8adf735261902f63a63782f9c9ff74e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:43:03 +0000 Subject: [PATCH 005/146] OverlayWindowViews merged to VideoOverlayWindowViews MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium change: https://chromium.googlesource.com/chromium/src/+/eac774f3966d0613863935b4354533be52e20fed commit eac774f3966d0613863935b4354533be52e20fed Author: François Beaufort Date: Wed Nov 23 11:53:44 2022 +0000 Pip 2.0: Merge VideoOverlayWindowViews and OverlayWindowViews When exploring Document Picture-in-Picture first[1], a new DocumentOverlayWindowViews subtype was introduced which caused the creation of VideoOverlayWindowViews from OverlayWindowViews. Since it is not necessary anymore, this CL merges VideoOverlayWindowViews and OverlayWindowViews and cleans up many left overs. This CL has no functional changes. [1] https://chromium-review.googlesource.com/c/chromium/src/+/3252789 Bug: 1379386 --- ...window_views.cc => video_overlay_window_views.cc} | 4 ++-- ...er-ui-views-overlay-overlay_window_views.cc.patch | 12 ------------ ...views-overlay-video_overlay_window_views.cc.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) rename chromium_src/chrome/browser/ui/views/overlay/{overlay_window_views.cc => video_overlay_window_views.cc} (69%) delete mode 100644 patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch create mode 100644 patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch diff --git a/chromium_src/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chromium_src/chrome/browser/ui/views/overlay/video_overlay_window_views.cc similarity index 69% rename from chromium_src/chrome/browser/ui/views/overlay/overlay_window_views.cc rename to chromium_src/chrome/browser/ui/views/overlay/video_overlay_window_views.cc index 3b5d993d8e71..7af27b106f46 100644 --- a/chromium_src/chrome/browser/ui/views/overlay/overlay_window_views.cc +++ b/chromium_src/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -1,10 +1,10 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #define BRAVE_UPDATE_MAX_SIZE max_size_ = work_area.size(); -#include "src/chrome/browser/ui/views/overlay/overlay_window_views.cc" +#include "src/chrome/browser/ui/views/overlay/video_overlay_window_views.cc" #undef BRAVE_UPDATE_MAX_SIZE diff --git a/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch deleted file mode 100644 index d1fb19fef8a0..000000000000 --- a/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc -index 7d91ecafdfc2b977aeb73c764cee6bb65f80b5a3..8c79edb7226b7b2907f2f84ae4362cede22be094 100644 ---- a/chrome/browser/ui/views/overlay/overlay_window_views.cc -+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc -@@ -533,6 +533,7 @@ void OverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { - - max_size_ = new_max_size; - -+ BRAVE_UPDATE_MAX_SIZE - if (!native_widget()) - return; - diff --git a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch new file mode 100644 index 000000000000..38ef487ebea4 --- /dev/null +++ b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +index eb3b554f37cdaa1b8ef532cecc210f093554704d..2830864767b7b92afe39f3a3b63260933c727373 100644 +--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc ++++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +@@ -640,6 +640,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { + + max_size_ = new_max_size; + ++ BRAVE_UPDATE_MAX_SIZE + if (!native_widget()) + return; + From bdc461b939a13b3fac285c64357ac113a13b4eb9 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:44:15 +0000 Subject: [PATCH 006/146] Adjusting crashes.js overrrides converted to TypeScript Chromium change: https://chromium.googlesource.com/chromium/src/+/f01446f8d86d185fb86bf802fae36cedbffc44d0 commit f01446f8d86d185fb86bf802fae36cedbffc44d0 Author: dpapad Date: Thu Nov 24 02:04:15 2022 +0000 Migrate chrome://crashes to TypeScript. Bug: 1316438 --- ...ts-crash-core-browser-resources-crashes.js.patch | 13 ------------- ...ts-crash-core-browser-resources-crashes.ts.patch | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 patches/components-crash-core-browser-resources-crashes.js.patch create mode 100644 patches/components-crash-core-browser-resources-crashes.ts.patch diff --git a/patches/components-crash-core-browser-resources-crashes.js.patch b/patches/components-crash-core-browser-resources-crashes.js.patch deleted file mode 100644 index 0610c9028175..000000000000 --- a/patches/components-crash-core-browser-resources-crashes.js.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/components/crash/core/browser/resources/crashes.js b/components/crash/core/browser/resources/crashes.js -index d4b9c365faa37a2a18fbfc0579dda1aeedb6cbb4..3295bfc2aa0ba0043a173b72f00104f0468c735e 100644 ---- a/components/crash/core/browser/resources/crashes.js -+++ b/components/crash/core/browser/resources/crashes.js -@@ -108,7 +108,7 @@ function updateCrashList({ - crashLink.href = `https://goto.google.com/crash/${crash.id}`; - crashLink.target = '_blank'; - crashLink.textContent = crash.id; -- uploadIdValue.appendChild(crashLink); -+ //uploadIdValue.appendChild(crashLink); // feature disabled in Brave - } else { - uploadIdValue.textContent = crash.id; - } diff --git a/patches/components-crash-core-browser-resources-crashes.ts.patch b/patches/components-crash-core-browser-resources-crashes.ts.patch new file mode 100644 index 000000000000..e17e5a3f6e94 --- /dev/null +++ b/patches/components-crash-core-browser-resources-crashes.ts.patch @@ -0,0 +1,13 @@ +diff --git a/components/crash/core/browser/resources/crashes.ts b/components/crash/core/browser/resources/crashes.ts +index 591214145a8025abfa7a6478851f935530148521..7c99c663a630f7e6d82f0191efcc9f22663a3042 100644 +--- a/components/crash/core/browser/resources/crashes.ts ++++ b/components/crash/core/browser/resources/crashes.ts +@@ -141,7 +141,7 @@ function updateCrashList({ + crashLink.href = `https://goto.google.com/crash/${crash.id}`; + crashLink.target = '_blank'; + crashLink.textContent = crash.id; +- uploadIdValue.appendChild(crashLink); ++ // uploadIdValue.appendChild(crashLink); // feature disabled in Brave + } else { + uploadIdValue.textContent = crash.id; + } From 35d0d8980765fcccac0a68f6c043cb876f3a9219 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:45:55 +0000 Subject: [PATCH 007/146] License scripts moved to //tools/licenses Chromium change: https://chromium.googlesource.com/chromium/src/+/2be00b9639867d2fbddeece50394645b977b2a25 commit 2be00b9639867d2fbddeece50394645b977b2a25 Author: Andrew Mellen Date: Fri Nov 11 16:38:42 2022 +0000 Move license tooling into //tools/licenses After https://crrev.com/c/3950177, it makes sense to make a new subdirectory for license related tooling since there are multiple licensing related files now. This change moves those files into the new subdirectory and updates all necessary gn files to point to the new path. Bug: b:248101373 --- ...enses.py.patch => tools-licenses-licenses.py.patch} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename patches/{tools-licenses.py.patch => tools-licenses-licenses.py.patch} (82%) diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses-licenses.py.patch similarity index 82% rename from patches/tools-licenses.py.patch rename to patches/tools-licenses-licenses.py.patch index 34be2b3227ea..a792087bc224 100644 --- a/patches/tools-licenses.py.patch +++ b/patches/tools-licenses-licenses.py.patch @@ -1,9 +1,9 @@ -diff --git a/tools/licenses.py b/tools/licenses.py -index de49fae95801e402cef4cda481bdf17222c9525c..fee2b33b157778166239c3410b6ea08342d5337a 100755 ---- a/tools/licenses.py -+++ b/tools/licenses.py +diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py +index a33adb4901c76895f1dba6cb06ab4f866480a397..25dadee9d45ebbbffc160539bf96be99b90aa6c2 100755 +--- a/tools/licenses/licenses.py ++++ b/tools/licenses/licenses.py @@ -39,6 +39,7 @@ from spdx_writer import SpdxWriter - _REPOSITORY_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) + _REPOSITORY_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) sys.path.insert(0, os.path.join(_REPOSITORY_ROOT, 'build/android/gyp')) from util import build_utils +from brave_license_helper import AddBraveCredits, BRAVE_THIRD_PARTY_DIRS, CheckBraveMissingLicense From ba51a7f5cc4f8df14c33510274860e442de8a6dd Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 12:49:29 +0000 Subject: [PATCH 008/146] Adjust patching for notification permission Chromium change: https://chromium.googlesource.com/chromium/src/+/2c59751c003080fe6eb052501230fdbc5b5f02bb commit 2c59751c003080fe6eb052501230fdbc5b5f02bb Author: Salvador Guerrero Date: Tue Nov 22 00:05:28 2022 +0000 Integrate notification permission rationale dialog with other promos Bug: 1386238 --- ...m-chrome-browser-ChromeTabbedActivity.java.patch | 13 ------------- ...r-tabbed_mode-TabbedRootUiCoordinator.java.patch | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch deleted file mode 100644 index 54847045ee77..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 191f4ae5e04fa25f88d2a6aa7e8b1a087f4281ef..1d8f94595561fe5a7cfcf7a6b34c3bb650b0e05e 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1051,7 +1051,7 @@ public class ChromeTabbedActivity extends ChromeActivity Date: Mon, 5 Dec 2022 16:02:34 +0000 Subject: [PATCH 009/146] js:cr.m, and js:util guarded as ash-only Chromium change: https://chromium.googlesource.com/chromium/src/+/d229f21f3a123bce3b94d95949149f646776bedd commit d229f21f3a123bce3b94d95949149f646776bedd Author: Rebekah Potter Date: Mon Nov 21 20:07:19 2022 +0000 WebUI: Remove cr.m and event_target on most platforms These are no longer needed except for on Ash (event_target and cr.m) and Android (cr.m) because they are wrappers/workarounds for the closure compiler. Bug: 1316438 --- .storybook/BUILD.gn | 1 - browser/resources/federated_internals/BUILD.gn | 2 -- 2 files changed, 3 deletions(-) diff --git a/.storybook/BUILD.gn b/.storybook/BUILD.gn index ad19d8544ee9..ef6312809e95 100644 --- a/.storybook/BUILD.gn +++ b/.storybook/BUILD.gn @@ -21,7 +21,6 @@ group("storybook") { "//brave/components/brave_wallet/common:mojom_js", "//mojo/public/js:bindings", "//mojo/public/js:resources", - "//ui/webui/resources/js:cr.m", "//ui/webui/resources/js:preprocess", ] diff --git a/browser/resources/federated_internals/BUILD.gn b/browser/resources/federated_internals/BUILD.gn index a0ad7ebb33b4..08dcae55c77d 100644 --- a/browser/resources/federated_internals/BUILD.gn +++ b/browser/resources/federated_internals/BUILD.gn @@ -75,7 +75,6 @@ js_library("federated_internals") { deps = [ ":federated_internals_browser_proxy", "//ui/webui/resources/js:assert", - "//ui/webui/resources/js:util", ] } @@ -84,6 +83,5 @@ js_library("federated_internals_browser_proxy") { "//brave/browser/ui/webui/brave_federated:mojo_bindings_webui_js", "//brave/components/brave_federated/public/interfaces:interfaces_webui_js", "//ui/webui/resources/js:assert", - "//ui/webui/resources/js:util", ] } From be70500d4deadf31e95b9193cf3915504e2c1cef Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:31:09 +0000 Subject: [PATCH 010/146] Feature flag kNavigationRequestPreconnect removed Chromium change: https://chromium.googlesource.com/chromium/src/+/d4d0f454f90e5ba6174eb64abda07e079a1c84ac commit d4d0f454f90e5ba6174eb64abda07e079a1c84ac Author: Clark DuVall Date: Tue Nov 15 09:31:20 2022 +0000 Clean up launched features from CombinedNavigationOptimizations These have been enabled by default for awhile and it should be safe to clean up the old code now. Bug: 1309246 --- app/brave_main_delegate_browsertest.cc | 1 - chromium_src/content/public/common/content_features.cc | 1 - test/filters/unit_tests.filter | 4 ---- 3 files changed, 6 deletions(-) diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index 1a751c56a4e5..e6a927ce4748 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -132,7 +132,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kIdleDetection, &features::kIsolatePrerenders, &features::kKAnonymityService, - &features::kNavigationRequestPreconnect, &features::kNotificationTriggers, &features::kOmniboxTriggerForNoStatePrefetch, &features::kPrivacyGuide2, diff --git a/chromium_src/content/public/common/content_features.cc b/chromium_src/content/public/common/content_features.cc index 0404a4750349..5a439281c7fe 100644 --- a/chromium_src/content/public/common/content_features.cc +++ b/chromium_src/content/public/common/content_features.cc @@ -16,7 +16,6 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kFedCm, base::FEATURE_DISABLED_BY_DEFAULT}, {kFirstPartySets, base::FEATURE_DISABLED_BY_DEFAULT}, {kIdleDetection, base::FEATURE_DISABLED_BY_DEFAULT}, - {kNavigationRequestPreconnect, base::FEATURE_DISABLED_BY_DEFAULT}, {kNotificationTriggers, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacySandboxAdsAPIsOverride, base::FEATURE_DISABLED_BY_DEFAULT}, {kSignedExchangeReportingForDistributors, diff --git a/test/filters/unit_tests.filter b/test/filters/unit_tests.filter index 4ddc778f1acc..827dae0a3920 100644 --- a/test/filters/unit_tests.filter +++ b/test/filters/unit_tests.filter @@ -87,10 +87,6 @@ -PrerenderManagerTest.StartSameSuggestionPrerender -PrerenderTest.* -# These tests fail because we have features::kNavigationRequestPreconnect -# disabled --PreconnectManagerTest.* - # Tests failing due to our replacing of MdTextButton with MdTextButtonBase. -ScreenshotCapturedBubbleTest.EditNavigatesToImageEditorWebUI From 152f42a5c48bee60680b81ff4529e6797642a471 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:34:12 +0000 Subject: [PATCH 011/146] Feature kTrustTokens renamed to kPrivateStateTokens Chromium change: https://chromium.googlesource.com/chromium/src/+/c3be71f1edd38a8becf4d85b8b6a805d08182c2c commit c3be71f1edd38a8becf4d85b8b6a805d08182c2c Author: Sergey Kataev Date: Fri Nov 18 20:11:55 2022 +0000 Renaming TrustTokens to PrivateStateTokens in UI and runtime features Runtime Network::features: kTrustTokens -> kPrivateStateTokens blink runtime features: TrustTokens -> PrivateStateTokens TrustTokensAlwaysAllowIssuance -> PrivateStateTokensAlwaysAllowIssuance Bug: 1385468 --- app/brave_main_delegate_browsertest.cc | 2 +- chromium_src/services/network/public/cpp/features.cc | 2 +- .../third_party/blink/common/origin_trials/origin_trials.cc | 2 +- test/filters/browser_tests.filter | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index e6a927ce4748..6e3f4e89be3d 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -158,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &net::features::kNoncedPartitionedCookies, &net::features::kPartitionedCookies, &net::features::kSamePartyAttributeEnabled, - &network::features::kTrustTokens, + &network::features::kPrivateStateTokens, &network_time::kNetworkTimeServiceQuerying, &optimization_guide::features::kOptimizationHints, &optimization_guide::features::kRemoteOptimizationGuideFetching, diff --git a/chromium_src/services/network/public/cpp/features.cc b/chromium_src/services/network/public/cpp/features.cc index f0c34721cd09..1eb789ae4b9b 100644 --- a/chromium_src/services/network/public/cpp/features.cc +++ b/chromium_src/services/network/public/cpp/features.cc @@ -11,7 +11,7 @@ namespace network { namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ - {kTrustTokens, base::FEATURE_DISABLED_BY_DEFAULT}, + {kPrivateStateTokens, base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace features diff --git a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc index 49360a6623d9..075409981e2a 100644 --- a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc +++ b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc @@ -62,7 +62,7 @@ bool IsTrialDisabledInBrave(OriginTrialFeature feature) { OriginTrialFeature::kFledge, OriginTrialFeature::kParakeet, OriginTrialFeature::kPrivacySandboxAdsAPIs, - OriginTrialFeature::kTrustTokens, + OriginTrialFeature::kPrivateStateTokens, }; // clang-format on diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index b6146075dae3..d7c677e3da7b 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -200,7 +200,7 @@ -ZoomControllerForPrerenderingTest.* # This test fails because we intentionally disable trust tokens via -# network::features::kTrustTokens +# network::features::kPrivateStateTokens -BrowsingDataModelTrustTokenBrowserTest.TrustTokenIssuance # These tests fail because we intentionally disable direct/raw sockets via From d73739c8f585f488a0fdb4703bcdc65a900b581e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:35:51 +0000 Subject: [PATCH 012/146] GetPrimaryUserProfile restricted to ash/android Chromium change: https://chromium.googlesource.com/chromium/src/+/40642fc86e2bd90b10285ac9ce2683553be9476d commit 40642fc86e2bd90b10285ac9ce2683553be9476d Author: David Roger Date: Fri Nov 25 11:13:14 2022 +0000 Restrict GetPrimaryUserProfile() to ChromeOS and Android Bug: 1264436 --- .../brave_stats_updater_helper_browsertest.cc | 2 +- .../profiles/brave_profile_manager_browsertest.cc | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/browser/brave_ads/brave_stats_updater_helper_browsertest.cc b/browser/brave_ads/brave_stats_updater_helper_browsertest.cc index 9a1dab2a8e05..99b3d91c86fd 100644 --- a/browser/brave_ads/brave_stats_updater_helper_browsertest.cc +++ b/browser/brave_ads/brave_stats_updater_helper_browsertest.cc @@ -66,7 +66,7 @@ class BraveStatsUpdaterHelperBrowserTest : public PlatformBrowserTest { IN_PROC_BROWSER_TEST_F(BraveStatsUpdaterHelperBrowserTest, PrimaryProfileEnabledUpdate) { - Profile* primary_profile = profile_manager_->GetPrimaryUserProfile(); + Profile* primary_profile = profile_manager_->GetLastUsedProfile(); EXPECT_EQ(local_state_->GetBoolean(ads::prefs::kEnabledForLastProfile), false); diff --git a/browser/profiles/brave_profile_manager_browsertest.cc b/browser/profiles/brave_profile_manager_browsertest.cc index df7c652b636a..6d7b3b7717d2 100644 --- a/browser/profiles/brave_profile_manager_browsertest.cc +++ b/browser/profiles/brave_profile_manager_browsertest.cc @@ -185,8 +185,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, #if !BUILDFLAG(IS_ANDROID) IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, PRE_MediaRouterDisabledRestartTest) { - Profile* profile = - g_browser_process->profile_manager()->GetPrimaryUserProfile(); + Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); { profile->GetPrefs()->SetBoolean(::prefs::kEnableMediaRouter, true); profile->GetPrefs()->SetBoolean(kEnableMediaRouterOnRestart, false); @@ -197,8 +196,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, MediaRouterDisabledRestartTest) { - Profile* profile = - g_browser_process->profile_manager()->GetPrimaryUserProfile(); + Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); { EXPECT_FALSE(profile->GetPrefs()->GetBoolean(::prefs::kEnableMediaRouter)); EXPECT_FALSE(profile->GetPrefs()->GetBoolean(kEnableMediaRouterOnRestart)); @@ -207,8 +205,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, PRE_MediaRouterEnabledRestartTest) { - Profile* profile = - g_browser_process->profile_manager()->GetPrimaryUserProfile(); + Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); { profile->GetPrefs()->SetBoolean(::prefs::kEnableMediaRouter, false); profile->GetPrefs()->SetBoolean(kEnableMediaRouterOnRestart, true); @@ -218,8 +215,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, } IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, MediaRouterEnabledRestartTest) { - Profile* profile = - g_browser_process->profile_manager()->GetPrimaryUserProfile(); + Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); { EXPECT_TRUE(profile->GetPrefs()->GetBoolean(::prefs::kEnableMediaRouter)); EXPECT_TRUE(profile->GetPrefs()->GetBoolean(kEnableMediaRouterOnRestart)); From 80ec946c273381e3f8fa2c37a52ca83d6f3938d9 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:37:07 +0000 Subject: [PATCH 013/146] Profiling is dissalowed for component builds Chromium change: https://chromium.googlesource.com/chromium/src/+/4483479aa2ea8db103b2bba8257d2f1c4d7e32e8 commit 4483479aa2ea8db103b2bba8257d2f1c4d7e32e8 Author: Friedrich Horschig Date: Wed Nov 16 17:19:44 2022 +0000 Prevent configs which try to profile component builds After spending more hours debugging an unreadable seg fault, I propose to make enable_profiling and is_component_build mutually exclusive. The trace: http://go/paste/4778541626425344 Our docs already state that this is the way to go but it's way to easy to miss when changing configs incrementally: https://crrev.com/c791b8b07c5dd14f31ce2ce9a26d9de8e64830ee/docs/memory-infra/heap_profiler.md#how-to-obtain-a-heap-dump-m66_android Bug: 1199271 --- build/commands/lib/config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index b73433e705b7..e55d3dfd9d17 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -378,6 +378,7 @@ Config.prototype.buildArgs = function () { } if (this.isDebug() && + !this.isComponentBuild() && this.targetOS !== 'ios' && this.targetOS !== 'android') { args.enable_profiling = true From fb82bd540c2292dc634eb6ff2be9b3930fa886bf Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:38:58 +0000 Subject: [PATCH 014/146] Re-anchoring CookieSettingsBase's overrides Chromium change: https://chromium.googlesource.com/chromium/src/+/74d0ec1e9c7fc50df56496cfdff626b35181a894 Author: Brian Begnoche Date: Tue Nov 29 19:08:47 2022 +0000 Add force_allow_third_party_cookies arg to CookieSettings::GetCookieSettingInternal This is the first step as part of the implementation laid out in go/user-bypass-3pcd. Note the existing signature is kept as an overload that uses force_allow_third_party_cookies=false so that calling sites are still unchanged and this change is a no op. Calling sites will be updated in a subsequent change. Bug: 1386190 --- .../core/common/cookie_settings_base.cc | 29 +++++++------ .../core/common/cookie_settings_base.h | 2 + .../services/network/cookie_settings.h | 43 ++++++++----------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index cea07b9a5ead..20bc58e5055b 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -117,9 +117,9 @@ bool CookieSettingsBase::ShouldUseEphemeralStorage( net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)) return false; - bool allow_3p = - IsCookieAccessAllowedImpl(url, site_for_cookies, top_frame_origin, - CookieSettingsBase::QueryReason::kCookies); + bool allow_3p = IsCookieAccessAllowedImpl( + url, site_for_cookies, top_frame_origin, net::CookieSettingOverrides(), + CookieSettingsBase::QueryReason::kCookies); bool allow_1p = first_party_setting ? IsAllowed(first_party_setting->setting) : IsFirstPartyAccessAllowed( @@ -149,34 +149,37 @@ bool CookieSettingsBase::IsEphemeralCookieAccessAllowed( } return IsCookieAccessAllowedImpl(url, site_for_cookies, top_frame_origin, + net::CookieSettingOverrides(), CookieSettingsBase::QueryReason::kCookies); } bool CookieSettingsBase::IsFullCookieAccessAllowed( const GURL& url, - const GURL& first_party_url, - CookieSettingsBase::QueryReason query_reason) const { - return IsFullCookieAccessAllowed( - url, net::SiteForCookies::FromUrl(first_party_url), absl::nullopt, - query_reason); + const net::SiteForCookies& site_for_cookies, + const absl::optional& top_frame_origin, + net::CookieSettingOverrides overrides, + QueryReason query_reason) const { + return IsCookieAccessAllowedImpl(url, site_for_cookies, top_frame_origin, + overrides, query_reason); } bool CookieSettingsBase::IsFullCookieAccessAllowed( const GURL& url, - const net::SiteForCookies& site_for_cookies, - const absl::optional& top_frame_origin, + const GURL& first_party_url, CookieSettingsBase::QueryReason query_reason) const { - return IsCookieAccessAllowedImpl(url, site_for_cookies, top_frame_origin, - query_reason); + return IsFullCookieAccessAllowed( + url, net::SiteForCookies::FromUrl(first_party_url), absl::nullopt, + net::CookieSettingOverrides(), query_reason); } bool CookieSettingsBase::IsCookieAccessAllowedImpl( const GURL& url, const net::SiteForCookies& site_for_cookies, const absl::optional& top_frame_origin, + net::CookieSettingOverrides overrides, CookieSettingsBase::QueryReason query_reason) const { bool allow = IsChromiumFullCookieAccessAllowed( - url, site_for_cookies, top_frame_origin, query_reason); + url, site_for_cookies, top_frame_origin, overrides, query_reason); const bool is_1p_ephemeral_feature_enabled = base::FeatureList::IsEnabled( net::features::kBraveFirstPartyEphemeralStorage); diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.h b/chromium_src/components/content_settings/core/common/cookie_settings_base.h index fe9f1249501f..1d35973ce5ff 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.h +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.h @@ -50,6 +50,7 @@ struct CookieSettingWithBraveMetadata { bool IsChromiumFullCookieAccessAllowed( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ const absl::optional& top_frame_origin, \ + net::CookieSettingOverrides overrides, \ CookieSettingsBase::QueryReason query_reason) const; \ bool ShouldBlockThirdPartyIfSettingIsExplicit( \ bool block_third_party_cookies, ContentSetting cookie_setting, \ @@ -65,6 +66,7 @@ struct CookieSettingWithBraveMetadata { bool IsCookieAccessAllowedImpl( \ const GURL& url, const net::SiteForCookies& site_for_cookies, \ const absl::optional& top_frame_origin, \ + net::CookieSettingOverrides overrides, \ CookieSettingsBase::QueryReason query_reason) const; \ \ mutable base::ThreadLocalPointer \ diff --git a/chromium_src/services/network/cookie_settings.h b/chromium_src/services/network/cookie_settings.h index 60dfc5f5b4bb..393b697c6b77 100644 --- a/chromium_src/services/network/cookie_settings.h +++ b/chromium_src/services/network/cookie_settings.h @@ -6,33 +6,26 @@ #ifndef BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ #define BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ -#define IsCookieAccessible \ - IsEphemeralCookieAccessible( \ - const net::CanonicalCookie& cookie, const GURL& url, \ - const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin) const; \ - bool IsCookieAccessible - -#define IsPrivacyModeEnabled \ - IsEphemeralPrivacyModeEnabled( \ - const GURL& url, const net::SiteForCookies& site_for_cookies, \ - const absl::optional& top_frame_origin, \ - net::SamePartyContext::Type same_party_context_type) const; \ - net::NetworkDelegate::PrivacySetting IsPrivacyModeEnabled - -#define AnnotateAndMoveUserBlockedCookies \ - AnnotateAndMoveUserBlockedEphemeralCookies( \ - const GURL& url, const net::SiteForCookies& site_for_cookies, \ - const url::Origin* top_frame_origin, \ - const net::FirstPartySetMetadata& first_party_set_metadata, \ - net::CookieAccessResultList& maybe_included_cookies, \ - net::CookieAccessResultList& excluded_cookies) const; \ - bool AnnotateAndMoveUserBlockedCookies +#define CreateDeleteCookieOnExitPredicate \ + Unused(); \ + bool IsEphemeralCookieAccessible( \ + const net::CanonicalCookie& cookie, const GURL& url, \ + const net::SiteForCookies& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + net::NetworkDelegate::PrivacySetting IsEphemeralPrivacyModeEnabled( \ + const GURL& url, const net::SiteForCookies& site_for_cookies, \ + const absl::optional& top_frame_origin, \ + net::SamePartyContext::Type same_party_context_type) const; \ + bool AnnotateAndMoveUserBlockedEphemeralCookies( \ + const GURL& url, const net::SiteForCookies& site_for_cookies, \ + const url::Origin* top_frame_origin, \ + const net::FirstPartySetMetadata& first_party_set_metadata, \ + net::CookieAccessResultList& maybe_included_cookies, \ + net::CookieAccessResultList& excluded_cookies) const; \ + DeleteCookiePredicate CreateDeleteCookieOnExitPredicate #include "src/services/network/cookie_settings.h" -#undef AnnotateAndMoveUserBlockedCookies -#undef IsPrivacyModeEnabled -#undef IsCookieAccessible +#undef CreateDeleteCookieOnExitPredicate #endif // BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ From e9860c0e603c1776f10b0013ae4bdf38f5d5e305 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:40:56 +0000 Subject: [PATCH 015/146] Renamed functions in DeviceInfo Chromium change: https://chromium.googlesource.com/chromium/src/+/438e5167d15170c336f6444fd5112efe83e377da commit 438e5167d15170c336f6444fd5112efe83e377da Author: Jood Hajeer Date: Mon Nov 21 12:02:19 2022 +0000 Update SyncedSession to use new DeviceInfo Enums. Update SyncedSession, SyncedSessionTracker, SessionStore, and SessionHeader to use the new DeviceInfo enum; FormFactor. Added conversion logic between cpp FormFactor and proto. Bug: 1358151 --- .../components/sync_device_info/device_info_sync_bridge.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/components/sync_device_info/device_info_sync_bridge.cc b/chromium_src/components/sync_device_info/device_info_sync_bridge.cc index f76c703d8d11..3e6fbdad0b9b 100644 --- a/chromium_src/components/sync_device_info/device_info_sync_bridge.cc +++ b/chromium_src/components/sync_device_info/device_info_sync_bridge.cc @@ -61,8 +61,8 @@ std::unique_ptr BraveSpecificsToModel( specifics.cache_guid(), specifics.client_name(), specifics.chrome_version(), specifics.sync_user_agent(), specifics.device_type(), - DeriveOSfromDeviceType(specifics.device_type(), specifics.manufacturer()), - DeriveFormFactorfromDeviceType(specifics.device_type()), + DeriveOsFromDeviceType(specifics.device_type(), specifics.manufacturer()), + DeriveFormFactorFromDeviceType(specifics.device_type()), specifics.signin_scoped_device_id(), specifics.manufacturer(), specifics.model(), ProtoTimeToTime(specifics.last_updated_timestamp()), GetPulseIntervalFromSpecifics(specifics), From a5771ab3fc52ba20ffe191ec6a3ebcf23dc41c3d Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:44:37 +0000 Subject: [PATCH 016/146] CrossOriginOpenerPolicyReporting flag removed Chromium changes: https://chromium.googlesource.com/chromium/src/+/81af735e3efa1046cb0f8ca4e53fe8a1d94e60fe commit 81af735e3efa1046cb0f8ca4e53fe8a1d94e60fe Author: Ian Clelland Date: Tue Nov 22 17:02:09 2022 +0000 Remove COOP Reporting runtime flag COOP reporting has shipped, and there are no more tests in the code which use this flag. Removing the flag from the JSON5 file as a clean up. Bug: 1059303 --- .../third_party/blink/common/origin_trials/origin_trials.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc index 075409981e2a..f8281c02f520 100644 --- a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc +++ b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc @@ -25,7 +25,6 @@ bool IsTrialDisabledInBrave(base::StringPiece trial_name) { // clang-format off static const char* const kBraveDisabledTrialNames[] = { "AdInterestGroupAPI", - "CrossOriginOpenerPolicyReporting", "DeviceAttributes", "DigitalGoodsV2", "InterestCohortAPI", @@ -55,7 +54,6 @@ bool IsTrialDisabledInBrave(OriginTrialFeature feature) { static const OriginTrialFeature kBraveDisabledTrialFeatures[] = { // NOLINT OriginTrialFeature::kAdInterestGroupAPI, - OriginTrialFeature::kCrossOriginOpenerPolicyReporting, OriginTrialFeature::kDeviceAttributes, OriginTrialFeature::kDigitalGoods, OriginTrialFeature::kFencedFrames, From 9d351a826467d84c97d02b728a72ff3c3d264486 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:45:49 +0000 Subject: [PATCH 017/146] GetTypeFromManifestValue modernised for Value::Dict Chromium change: https://chromium.googlesource.com/chromium/src/+/147bd8979a6bb46153cda3e2b98535f7c96c1063 commit 147bd8979a6bb46153cda3e2b98535f7c96c1063 Author: Roman Sorokin Date: Wed Nov 16 10:42:23 2022 +0000 [Code Health] Migrate e/c/manifest.cc to base::Value::Dict interface There are still some leftovers related to the external callers. They will be fixed in follow-ups Bug: 1366865, 1187061 --- common/importer/chrome_importer_utils.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/common/importer/chrome_importer_utils.cc b/common/importer/chrome_importer_utils.cc index 44efa84ef184..7b700d81288f 100644 --- a/common/importer/chrome_importer_utils.cc +++ b/common/importer/chrome_importer_utils.cc @@ -1,7 +1,7 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. +/* Copyright (c) 2019 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/common/importer/chrome_importer_utils.h" @@ -74,11 +74,7 @@ std::vector GetImportableListFromChromeExtensionsList( continue; if (auto* manifest_dict = dict.FindDict("manifest")) { - // TODO(cdesouza): Whenever Manifest::GetTypeFromManifestValue gets - // refactored upstream to take a base::Value::Dict reference, also - // remove the cloning done here to convert back to value. - if (Manifest::GetTypeFromManifestValue(base::Value::AsDictionaryValue( - base::Value(manifest_dict->Clone()))) == + if (Manifest::GetTypeFromManifestValue(*manifest_dict) == Manifest::TYPE_EXTENSION) { extensions.push_back(key); } From 4df62daac0c0fe6c035cdb7f43c2331c31f82c34 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:47:36 +0000 Subject: [PATCH 018/146] Extra fields added to PrepopulatedEngine Chromium change: https://chromium.googlesource.com/chromium/src/+/d52293a5ffc69e254384d1e788e15e212db2da56 commit d52293a5ffc69e254384d1e788e15e212db2da56 Author: Moe Ahmadi Date: Thu Nov 17 21:56:28 2022 +0000 [omnibox] Adds optional "search_intent_params" field for providers "search_intent_params" is an array of strings in TemplateURLData representing the query parameter names that make up the provider's canonical search URL in addition to the search terms. These params disambiguate the search terms and determine the fulfillment. Search providers can specify their own search intent params. For Google, this array is pre-populated with "gs_ssp" and "si" which are used to disambiguate entity suggestions and determine SRP fulfillment. Search intent params do not change the destination URL generated for the suggestions for the provider. That is determined by the `url` in TemplateURLData and the `additional_query_params` in SearchTermsArgs. Search intent params help make features such as "switch to tab" action in omnibox and SRP prefetching trigger more accurately where the search terms alone may be ambiguous and not fully capture the fulfillment. It is the provider's responsibility to make sure search intent params are compatible with the params found in the search destination URL. This CL introduces TemplateURL::KeepSearchTermsInURL() utility function that given a |url| corresponding to a TemplateURL, keeps the search terms and optionally the search intent params, if any, and strips the other parameters out. This utility function will be used in a followup CL for more precise tab matching. Bug: 1291628 --- .../brave_prepopulated_engines.cc | 117 ++++-------------- 1 file changed, 27 insertions(+), 90 deletions(-) diff --git a/components/search_engines/brave_prepopulated_engines.cc b/components/search_engines/brave_prepopulated_engines.cc index 0f28122c050d..00cf7d941838 100644 --- a/components/search_engines/brave_prepopulated_engines.cc +++ b/components/search_engines/brave_prepopulated_engines.cc @@ -19,6 +19,21 @@ const int kBraveFirstTrackedDataVersion = 6; namespace { +PrepopulatedEngine MakeBravePrepopulatedEngine(const wchar_t* const name, + const wchar_t* const keyword, + const char* const favicon_url, + const char* const search_url, + const char* const encoding, + const char* const suggest_url, + SearchEngineType type, + const int id) { + return {name, keyword, favicon_url, search_url, encoding, + suggest_url, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, 0, nullptr, + 0, type, nullptr, nullptr, id}; +} + // Maps BravePrepopulatedEngineID to Chromium's PrepopulatedEngine. const std::map brave_engines_map = { @@ -60,6 +75,8 @@ PrepopulatedEngine ModifyEngineParams(const PrepopulatedEngine& engine, engine.side_search_param, engine.side_image_search_param, engine.image_search_branding_label, + engine.search_intent_params, + engine.search_intent_params_size, engine.alternate_urls, engine.alternate_urls_size, engine.type, @@ -70,31 +87,15 @@ PrepopulatedEngine ModifyEngineParams(const PrepopulatedEngine& engine, } // namespace -const PrepopulatedEngine duckduckgo = { +const PrepopulatedEngine duckduckgo = MakeBravePrepopulatedEngine( L"DuckDuckGo", L":d", "https://duckduckgo.com/favicon.ico", "https://duckduckgo.com/?q={searchTerms}&t=brave", "UTF-8", "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list", - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - 0, SEARCH_ENGINE_DUCKDUCKGO, - nullptr, - nullptr, - PREPOPULATED_ENGINE_ID_DUCKDUCKGO, -}; + PREPOPULATED_ENGINE_ID_DUCKDUCKGO); const PrepopulatedEngine duckduckgo_de = ModifyEngineParams(duckduckgo, @@ -115,31 +116,15 @@ const PrepopulatedEngine duckduckgo_au_nz_ie = PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE); #if BUILDFLAG(IS_ANDROID) -const PrepopulatedEngine duckduckgo_lite = { +const PrepopulatedEngine duckduckgo_lite = MakeBravePrepopulatedEngine( L"DuckDuckGo Lite", L":dl", "https://duckduckgo.com/favicon.ico", "https://duckduckgo.com/lite/?q={searchTerms}&t=brave", "UTF-8", "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list", - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - 0, SEARCH_ENGINE_DUCKDUCKGO, - nullptr, - nullptr, - PREPOPULATED_ENGINE_ID_DUCKDUCKGO_LITE, -}; + PREPOPULATED_ENGINE_ID_DUCKDUCKGO_LITE); #endif // BUILDFLAG(IS_ANDROID) const PrepopulatedEngine brave_ecosia = @@ -157,33 +142,17 @@ const PrepopulatedEngine brave_ecosia = nullptr, PREPOPULATED_ENGINE_ID_ECOSIA); -const PrepopulatedEngine qwant = { +const PrepopulatedEngine qwant = MakeBravePrepopulatedEngine( L"Qwant", L":q", "https://www.qwant.com/favicon.ico", "https://www.qwant.com/?q={searchTerms}&client=brz-brave", "UTF-8", "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch", - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - 0, SEARCH_ENGINE_QWANT, - nullptr, - nullptr, - PREPOPULATED_ENGINE_ID_QWANT, -}; + PREPOPULATED_ENGINE_ID_QWANT); -const PrepopulatedEngine startpage = { +const PrepopulatedEngine startpage = MakeBravePrepopulatedEngine( L"Startpage", L":sp", "https://www.startpage.com/favicon.ico", @@ -192,24 +161,8 @@ const PrepopulatedEngine startpage = { "UTF-8", "https://www.startpage.com/cgi-bin/" "csuggest?query={searchTerms}&limit=10&format=json", - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - 0, SEARCH_ENGINE_OTHER, - nullptr, - nullptr, - PREPOPULATED_ENGINE_ID_STARTPAGE, -}; + PREPOPULATED_ENGINE_ID_STARTPAGE); const PrepopulatedEngine brave_yandex = ModifyEngineParams(yandex_com, @@ -227,7 +180,7 @@ const PrepopulatedEngine brave_yandex = nullptr, PREPOPULATED_ENGINE_ID_YANDEX); -const PrepopulatedEngine brave_search = { +const PrepopulatedEngine brave_search = MakeBravePrepopulatedEngine( L"Brave", L":br", "https://cdn.search.brave.com/serp/favicon.ico", @@ -239,24 +192,8 @@ const PrepopulatedEngine brave_search = { #endif "UTF-8", "https://search.brave.com/api/suggest?q={searchTerms}", - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - nullptr, - 0, SEARCH_ENGINE_OTHER, - nullptr, - nullptr, - PREPOPULATED_ENGINE_ID_BRAVE, -}; + PREPOPULATED_ENGINE_ID_BRAVE); const PrepopulatedEngine brave_search_tor = ModifyEngineParams( brave_search, From 5e4d38e93d02e38eaa6505c96df4dd3a96a4da70 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 16:51:27 +0000 Subject: [PATCH 019/146] Update from Chromium 110.0.5449.0 to Chromium 110.0.5449.3. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 194ad174db58..082426c5c2af 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5449.0", + "tag": "110.0.5449.3", "repository": { "url": "https://github.com/chromium/chromium" } From c44576605e9dd6dc08c97b558814bc9147675849 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 5 Dec 2022 17:13:04 +0000 Subject: [PATCH 020/146] Conflict-resolved patches from Chromium 110.0.5449.0 to Chromium 110.0.5449.3. --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 1cdd96c3ba1e..613ae23d20e9 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index bc5b8f16ab4321355e543cddbfa6b572e5856776..7cfcbf46922060cef150f27729ce4e32f9a73087 100644 +index 1e668a3f0f7b36ca066c8fa841cbe5baac0bf604..14dcb39d187190579440c3cdd5a3e37eb35b0f57 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5449 --PATCH=0 +-PATCH=3 +MINOR=1 +BUILD=49 +PATCH=59 From 6c08c7e08650be37169bd7127db3822cfdef028c Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 5 Dec 2022 17:20:01 -0500 Subject: [PATCH 021/146] Adapt to new function signature for PermissionContextBase::PermissionDenied Chromium change: https://source.chromium.org/chromium/chromium/src/+/e406ecc1fb52f1a4d9775bfa59ef7a0bafb85050 commit e406ecc1fb52f1a4d9775bfa59ef7a0bafb85050 Author: Illia Klimov Date: Tue Nov 22 15:53:29 2022 +0000 Fail fast quiet chip. The feature is enabled by default. This CL finalizes a permission request callback as soon as it is clear that the permission request will be shown as a quiet chip. The quiet chip is not resolved but is shown as normal. Permission request result is delivered via PermissionStatus listener. A permission request can be finalized only if a requesting RFH subscribed to PermissionStatus onchange event. In case of multiple duplicated permission requests, all corresponding RFHs should listen to the change event. Bug: 1364526 --- .../components/permissions/permission_context_base.cc | 6 +++--- .../components/permissions/permission_context_base.h | 4 ++-- .../permissions/contexts/brave_wallet_permission_context.cc | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/chromium_src/components/permissions/permission_context_base.cc b/chromium_src/components/permissions/permission_context_base.cc index dc9052d3bcab..e559095ede3f 100644 --- a/chromium_src/components/permissions/permission_context_base.cc +++ b/chromium_src/components/permissions/permission_context_base.cc @@ -64,8 +64,8 @@ void PermissionContextBase::PermissionDecided( } } PermissionContextBase_ChromiumImpl::PermissionDecided( - id, requesting_origin, embedding_origin, std::move(callback), - content_setting, is_one_time); + id, requesting_origin, embedding_origin, content_setting, is_one_time, + is_final_decision); } void PermissionContextBase::DecidePermission( @@ -95,7 +95,7 @@ void PermissionContextBase::DecidePermission( id.ToString(), std::make_unique())) .first; } - it->second->AddRequest(std::move(pending_request->second)); + it->second->AddRequest(std::move(pending_request->second.first)); pending_requests_.erase(pending_request); } diff --git a/chromium_src/components/permissions/permission_context_base.h b/chromium_src/components/permissions/permission_context_base.h index e60c2295b268..2070189c8871 100644 --- a/chromium_src/components/permissions/permission_context_base.h +++ b/chromium_src/components/permissions/permission_context_base.h @@ -84,9 +84,9 @@ class PermissionContextBase : public PermissionContextBase_ChromiumImpl { void PermissionDecided(const PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, - BrowserPermissionCallback callback, ContentSetting content_setting, - bool is_one_time) override; + bool is_one_time, + bool is_final_decision) override; void CleanUpRequest(const PermissionRequestID& id) override; std::map> diff --git a/components/permissions/contexts/brave_wallet_permission_context.cc b/components/permissions/contexts/brave_wallet_permission_context.cc index d3f1aed048d8..563470fb9187 100644 --- a/components/permissions/contexts/brave_wallet_permission_context.cc +++ b/components/permissions/contexts/brave_wallet_permission_context.cc @@ -85,7 +85,8 @@ void BraveWalletPermissionContext::RequestPermission( url::Origin::Create(web_contents->GetLastCommittedURL()).GetURL(); NotifyPermissionSet(id, requesting_origin.GetURL(), embedding_origin, std::move(callback), /*persist=*/false, - CONTENT_SETTING_BLOCK, /*is_one_time=*/false); + CONTENT_SETTING_BLOCK, /*is_one_time=*/false, + /*is_final_decision=*/true); return; } if (is_new_id) { From 871628bfac49729ca73b79dbb26b9034e9f76722 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 5 Dec 2022 18:21:52 -0500 Subject: [PATCH 022/146] Value::ClearDict is no longer available Chromium change: https://source.chromium.org/chromium/chromium/src/+/5dcba4ade62ffd2f4d022a13c0853ba5b2a0b9c9 commit 5dcba4ade62ffd2f4d022a13c0853ba5b2a0b9c9 Author: Matt Menke Date: Wed Nov 23 14:10:12 2022 +0000 Remove deprecated Value calls in frame_tracker_unittest.cc. In particular, use Value::Dict instead of DictionaryValue, and use base::test::ParseJson() instead of JSONReader::ReadDeprecated(). Also remove Value::ClearDict(), as this test was the last consumer of it. Bug: 1187001 --- components/brave_today/browser/brave_news_controller.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/brave_today/browser/brave_news_controller.cc b/components/brave_today/browser/brave_news_controller.cc index 7ddea8c75e9b..0732f6019a5e 100644 --- a/components/brave_today/browser/brave_news_controller.cc +++ b/components/brave_today/browser/brave_news_controller.cc @@ -436,7 +436,7 @@ void BraveNewsController::SetPublisherPref(const std::string& publisher_id, void BraveNewsController::ClearPrefs() { DictionaryPrefUpdate update(prefs_, prefs::kBraveTodaySources); - update->DictClear(); + update->GetDict().clear(); // Force an update of publishers and feed to include or ignore // content from the affected publisher. publishers_controller_.EnsurePublishersIsUpdating(); From 1f12010ee06c03d82b2129dd29ef5e6f9db85226 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 5 Dec 2022 20:03:41 -0500 Subject: [PATCH 023/146] RichHoverButton now takes a title string vs resource ID Chromium change: https://source.chromium.org/chromium/chromium/src/+/603f47599c2616aa0fc68728da77892f0cad5482 commit 603f47599c2616aa0fc68728da77892f0cad5482 Author: Mohamed Amir Yosef Date: Sat Nov 12 19:06:43 2022 +0000 [UI] Make RichHoverButton accept a title string Before this CL: RichHoverButton constructor accepted a title_resource_id while the secondary text, subtitle, and the tooltip was passed as actualy strings. After this CL: The title has also been changed to a string: 1- For consistency with other parameters. 2- To make the RichHoverButton usable with non-constant strings as titles. This is a purely mechanical change. Bug: 1382018 --- .../ui/views/page_info/page_info_view_factory.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc index 034937911a34..25bad088fa0b 100644 --- a/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/page_info/chrome_page_info_ui_delegate.h" #include "chrome/browser/ui/views/controls/rich_hover_button.h" #include "components/grit/brave_components_strings.h" +#include "ui/base/l10n/l10n_util.h" namespace { @@ -28,14 +29,14 @@ std::unique_ptr CreateButton( views::Button::PressedCallback callback) { auto& bundle = ui::ResourceBundle::GetSharedInstance(); const auto& ipfs_logo = *bundle.GetImageSkiaNamed(logo_resource_id); - const std::u16string& tooltip = + const std::u16string& title_text = + brave_l10n::GetLocalizedResourceUTF16String(text_resource_id); + const std::u16string& tooltip_text = brave_l10n::GetLocalizedResourceUTF16String(tooltip_resource_id); return std::make_unique( - std::move(callback), ui::ImageModel::FromImageSkia(ipfs_logo), - text_resource_id, std::u16string(), - PageInfoViewFactory::VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_COOKIE_DIALOG, - tooltip, std::u16string()); + std::move(callback), ui::ImageModel::FromImageSkia(ipfs_logo), title_text, + std::u16string(), tooltip_text, std::u16string()); } void BraveAddIPFSButtons(views::View* container, From fc5e7a352b31809a4f57ed5409e0bb4c8bedda78 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 7 Dec 2022 17:08:28 +0000 Subject: [PATCH 024/146] Profile deletion done with DeleteProfileHelper Chromium change: https://chromium.googlesource.com/chromium/src/+/23730651436006b8d3af73a95521807a3308b2a2 commit 23730651436006b8d3af73a95521807a3308b2a2 Author: David Roger Date: Mon Nov 28 14:25:02 2022 +0000 Split profile deletion code out of ProfileManager This CL splits some logic related to profile deletion to separate files. This hopefully makes the code more readable, as the ProfileManager was very large and poorly organized. It should be a pure refactoring with no behavior change. This is mostly a code move, although some other minor changes were required, like moving a few functions from the unnamed namespace to the `ProfileManager` API. It also removes `ScheduleProfileForDeletion()` from the public API, as it was only called by tests. The tests were updated to call `MaybeScheduleProfileForDeletion()` instead. In a follow-up change, the KeepAlive management in `DeleteProfileHelper` will be improved to fix a bug where Lacros exits immediately at startup while trying to delete a profile. Bug: 1382815 --- browser/brave_browser_main_parts.cc | 4 ++-- .../blink/renderer/modules/plugins/dom_plugin_array.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/brave_browser_main_parts.cc b/browser/brave_browser_main_parts.cc index 566a1f50ca8b..bbc5b5d2fd65 100644 --- a/browser/brave_browser_main_parts.cc +++ b/browser/brave_browser_main_parts.cc @@ -107,7 +107,7 @@ void BraveBrowserMainParts::PostBrowserStart() { storage.AddProfile(std::move(params)); } - profile_manager->MaybeScheduleProfileForDeletion( + profile_manager->GetDeleteProfileHelper().MaybeScheduleProfileForDeletion( tor_legacy_path, base::DoNothing(), ProfileMetrics::DELETE_PROFILE_SETTINGS); } @@ -117,7 +117,7 @@ void BraveBrowserMainParts::PostBrowserStart() { .Append(brave::kSessionProfileDir) .Append(tor::kTorProfileDir); if (base::PathExists(tor_legacy_session_path)) { - profile_manager->MaybeScheduleProfileForDeletion( + profile_manager->GetDeleteProfileHelper().MaybeScheduleProfileForDeletion( tor_legacy_session_path, base::DoNothing(), ProfileMetrics::DELETE_PROFILE_SETTINGS); } diff --git a/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc b/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc index a8e69b7f7355..33e7914f68e3 100644 --- a/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc +++ b/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc @@ -12,7 +12,6 @@ #include "third_party/blink/renderer/core/page/plugin_data.h" #include "third_party/blink/renderer/modules/plugins/dom_plugin.h" #include "third_party/blink/renderer/platform/graphics/color.h" -#include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" #include "third_party/blink/renderer/platform/wtf/vector.h" From 3073b6d45c2c20b3693554481661edc2a9f4ddab Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 7 Dec 2022 17:10:16 +0000 Subject: [PATCH 025/146] Permission request callback support Chromium change: https://chromium.googlesource.com/chromium/src/+/e406ecc1fb52f1a4d9775bfa59ef7a0bafb85050 commit e406ecc1fb52f1a4d9775bfa59ef7a0bafb85050 Author: Illia Klimov Date: Tue Nov 22 15:53:29 2022 +0000 Fail fast quiet chip. The feature is enabled by default. This CL finalizes a permission request callback as soon as it is clear that the permission request will be shown as a quiet chip. The quiet chip is not resolved but is shown as normal. Permission request result is delivered via PermissionStatus listener. A permission request can be finalized only if a requesting RFH subscribed to PermissionStatus onchange event. In case of multiple duplicated permission requests, all corresponding RFHs should listen to the change event. Bug: 1364526 --- .../widevine/widevine_permission_request.cc | 7 ++++--- .../widevine/widevine_permission_request.h | 4 +++- .../permissions/permission_context_base.cc | 21 ++++++++++--------- .../permissions/permission_context_base.h | 7 +++++-- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/browser/widevine/widevine_permission_request.cc b/browser/widevine/widevine_permission_request.cc index ca863d5fedc7..e5a943216f75 100644 --- a/browser/widevine/widevine_permission_request.cc +++ b/browser/widevine/widevine_permission_request.cc @@ -24,8 +24,8 @@ WidevinePermissionRequest::WidevinePermissionRequest( web_contents->GetVisibleURL(), permissions::RequestType::kWidevine, /*has_gesture=*/false, - base::BindOnce(&WidevinePermissionRequest::PermissionDecided, - base::Unretained(this)), + base::BindRepeating(&WidevinePermissionRequest::PermissionDecided, + base::Unretained(this)), base::BindOnce(&WidevinePermissionRequest::DeleteRequest, base::Unretained(this))), web_contents_(web_contents), @@ -39,7 +39,8 @@ std::u16string WidevinePermissionRequest::GetMessageTextFragment() const { } void WidevinePermissionRequest::PermissionDecided(ContentSetting result, - bool is_one_time) { + bool is_one_time, + bool is_final_decision) { // Permission granted if (result == ContentSetting::CONTENT_SETTING_ALLOW) { #if BUILDFLAG(IS_LINUX) diff --git a/browser/widevine/widevine_permission_request.h b/browser/widevine/widevine_permission_request.h index d79d6f130773..ffd79654620a 100644 --- a/browser/widevine/widevine_permission_request.h +++ b/browser/widevine/widevine_permission_request.h @@ -39,7 +39,9 @@ class WidevinePermissionRequest : public permissions::PermissionRequest { // PermissionRequest overrides: std::u16string GetMessageTextFragment() const override; - void PermissionDecided(ContentSetting result, bool is_one_time); + void PermissionDecided(ContentSetting result, + bool is_one_time, + bool is_final_decision); void DeleteRequest(); // It's safe to use this raw |web_contents_| because this request is deleted diff --git a/chromium_src/components/permissions/permission_context_base.cc b/chromium_src/components/permissions/permission_context_base.cc index e559095ede3f..7b2ace673242 100644 --- a/chromium_src/components/permissions/permission_context_base.cc +++ b/chromium_src/components/permissions/permission_context_base.cc @@ -43,17 +43,17 @@ void PermissionContextBase::SetPermissionLifetimeManagerFactory( permission_lifetime_manager_factory_ = factory; } -void PermissionContextBase::PermissionDecided( - const PermissionRequestID& id, - const GURL& requesting_origin, - const GURL& embedding_origin, - BrowserPermissionCallback callback, - ContentSetting content_setting, - bool is_one_time) { +void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, + const GURL& requesting_origin, + const GURL& embedding_origin, + ContentSetting content_setting, + bool is_one_time, + bool is_final_decision) { if (permission_lifetime_manager_factory_) { const auto request_it = pending_requests_.find(id.ToString()); if (request_it != pending_requests_.end()) { - const PermissionRequest* permission_request = request_it->second.get(); + const PermissionRequest* permission_request = + request_it->second.first.get(); DCHECK(permission_request); if (auto* permission_lifetime_manager = permission_lifetime_manager_factory_.Run(browser_context_)) { @@ -95,7 +95,7 @@ void PermissionContextBase::DecidePermission( id.ToString(), std::make_unique())) .first; } - it->second->AddRequest(std::move(pending_request->second.first)); + it->second->AddRequest(std::move(pending_request->second)); pending_requests_.erase(pending_request); } @@ -126,7 +126,8 @@ bool PermissionContextBase::GroupedPermissionRequests::IsDone() const { } void PermissionContextBase::GroupedPermissionRequests::AddRequest( - std::unique_ptr request) { + std::pair, BrowserPermissionCallback> + request) { requests_.push_back(std::move(request)); } diff --git a/chromium_src/components/permissions/permission_context_base.h b/chromium_src/components/permissions/permission_context_base.h index 2070189c8871..2eeed71ef598 100644 --- a/chromium_src/components/permissions/permission_context_base.h +++ b/chromium_src/components/permissions/permission_context_base.h @@ -73,11 +73,14 @@ class PermissionContextBase : public PermissionContextBase_ChromiumImpl { ~GroupedPermissionRequests(); bool IsDone() const; - void AddRequest(std::unique_ptr request); + void AddRequest(std::pair, + BrowserPermissionCallback> request); void RequestFinished(); private: - std::vector> requests_; + std::vector, + BrowserPermissionCallback>> + requests_; size_t finished_request_count_ = 0; }; From 89f0cf3c99707439006bb263d1fcdafbe8eb1be4 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 7 Dec 2022 17:42:09 +0000 Subject: [PATCH 026/146] Fixing missing inclusion in update_checker.cc This inclusion was possibly occurring in a transient way. --- chromium_src/components/update_client/update_checker.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/components/update_client/update_checker.cc b/chromium_src/components/update_client/update_checker.cc index 0158825ec126..85b1530e8f78 100644 --- a/chromium_src/components/update_client/update_checker.cc +++ b/chromium_src/components/update_client/update_checker.cc @@ -90,7 +90,7 @@ void SequentialUpdateChecker::UpdateResultAvailable( bool done = error || remaining_ids_.empty(); if (done) { - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce( std::move(update_check_callback_), From 323b5e7145bcf0404eb1e81a0c5d53fbaebee5e4 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 7 Dec 2022 17:43:14 +0000 Subject: [PATCH 027/146] Mac resource bundle functions taking c-strings Chromium change: https://chromium.googlesource.com/chromium/src/+/2bb307efe189357b0b9b895aad38436d80e49b70 commit 2bb307efe189357b0b9b895aad38436d80e49b70 Author: Avi Drissman Date: Tue Nov 29 18:14:29 2022 +0000 Use non-deprecated font registration Do some API clean-up along the way. Bug: 1393401 --- common/resource_bundle_helper.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/common/resource_bundle_helper.cc b/common/resource_bundle_helper.cc index c1cb76ea88f2..b927b9966869 100644 --- a/common/resource_bundle_helper.cc +++ b/common/resource_bundle_helper.cc @@ -31,8 +31,7 @@ namespace { #if !BUILDFLAG(IS_ANDROID) base::FilePath GetResourcesPakFilePath() { #if BUILDFLAG(IS_MAC) - return base::mac::PathForFrameworkBundleResource( - CFSTR("brave_resources.pak")); + return base::mac::PathForFrameworkBundleResource("brave_resources.pak"); #else base::FilePath pak_path; base::PathService::Get(base::DIR_MODULE, &pak_path); @@ -51,9 +50,7 @@ base::FilePath GetScaledResourcesPakFilePath( ? "brave_100_percent.pak" : "brave_200_percent.pak"; #if BUILDFLAG(IS_MAC) - base::ScopedCFTypeRef pak_file_mac( - base::SysUTF8ToCFStringRef(pak_file)); - return base::mac::PathForFrameworkBundleResource(pak_file_mac); + return base::mac::PathForFrameworkBundleResource(pak_file); #else base::FilePath pak_path; base::PathService::Get(base::DIR_MODULE, &pak_path); From 5b7148ce9ec360b0ad6619b66c8145c3e96c4f6f Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 8 Dec 2022 13:56:02 +0000 Subject: [PATCH 028/146] Adding test-only function to BraveSidePanel Chromium change: https://chromium.googlesource.com/chromium/src/+/7fc7a9bac98ac6b2f42a98fa8b6a263f9ea3cce7 commit 7fc7a9bac98ac6b2f42a98fa8b6a263f9ea3cce7 Author: Abigail Klein Date: Mon Nov 28 15:37:21 2022 +0000 [Read Anything] Set maximum side panel width during resizing. Current side panel resizing rules: 1. The minimum browser window width is 500 (kMainBrowserContentsMinimumWidth). 2. The minimum side panel width is 320. 3. The side panel can be widened up until it leaves 500 - 320 = 180 in the main web contents. Proposed side panel resizing rules: 1. The minimum window width remains at its current 500. 2. The minimum main web contents width remains at its current 180. 3. At 500px, the side panel is 320 and the main web contents is 180px, as before the proposal. 4. Between window width = 500 to 820, the side panel remains at 320px and the main contents increases in width. 5. At window width > 820, side panel can now be widened. It cannot go wider than a width that would keep the main contents at least at 500. The motivation for this change is that the current behavior, which allows side panel to be resized up to leaving the main web contents at 180, even when the browser window size is very large: https://screenshot.googleplex.com/9Fr9axFE4hfJWFE. For Read Anything we would like to remove this possibility. For more context and alternatives, see https://docs.google.com/document/d/1qfuhKHWrveRc5UQ37KdFGMDvt2JypvyU_4h8ejNfips/edit# Bug: 1329585, 1266555 --- browser/ui/views/side_panel/brave_side_panel.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/ui/views/side_panel/brave_side_panel.h b/browser/ui/views/side_panel/brave_side_panel.h index 982befbcacf6..d5c79be53807 100644 --- a/browser/ui/views/side_panel/brave_side_panel.h +++ b/browser/ui/views/side_panel/brave_side_panel.h @@ -42,6 +42,8 @@ class BraveSidePanel : public views::View, // views::ResizeAreaDelegate: void OnResize(int resize_amount, bool done_resizing) override; + void SetMinimumSidePanelContentsWidthForTesting(int width) {} + private: void UpdateVisibility(); void UpdateBorder(); From 9da98bd9760224dcedc29928c635ac73a36cd4b5 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 8 Dec 2022 15:15:06 +0000 Subject: [PATCH 029/146] Update from Chromium 110.0.5449.3 to Chromium 110.0.5462.3. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 082426c5c2af..1cb141437cf4 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5449.3", + "tag": "110.0.5462.3", "repository": { "url": "https://github.com/chromium/chromium" } From 1e312651edba5369e7c5b7962057a641c17feddd Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 8 Dec 2022 15:40:43 +0000 Subject: [PATCH 030/146] Conflict-resolved patches from Chromium 110.0.5449.3 to Chromium 110.0.5462.3. --- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-android-BUILD.gn.patch | 14 +++++++------- ...s-privacy_page-personalization_options.ts.patch | 12 ++++++------ ...urces-settings-site_settings-constants.ts.patch | 8 ++++---- ...s-signin-profile_picker-profile_picker.ts.patch | 4 ++-- ...rd_manager-core-browser-login_database.cc.patch | 8 ++++---- ...erer-modules-mediastream-media_devices.cc.patch | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 613ae23d20e9..1a95cf3410a2 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 1e668a3f0f7b36ca066c8fa841cbe5baac0bf604..14dcb39d187190579440c3cdd5a3e37eb35b0f57 100644 +index b0696454e2812190e3ef4276cf97ad21ed4a209f..9b25ffed33ab7a81fa8f6774e1b6351e83cb1482 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 --BUILD=5449 +-BUILD=5462 -PATCH=3 +MINOR=1 +BUILD=49 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 2d8974c71a8c..fdfdb983fa3a 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2fa8d7f01 100644 +index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a67379751c81f296 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -239,6 +239,7 @@ if (current_toolchain == default_toolchain) { @@ -42,7 +42,7 @@ index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2099,6 +2104,7 @@ if (current_toolchain == default_toolchain) { +@@ -2100,6 +2105,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2 # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -2347,6 +2353,7 @@ if (current_toolchain == default_toolchain) { +@@ -2348,6 +2354,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,15 +58,15 @@ index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2559,6 +2566,7 @@ if (current_toolchain == default_toolchain) { - load_library_from_apk = chromium_linker_supported +@@ -2554,6 +2561,7 @@ if (current_toolchain == default_toolchain) { + shared_libraries = [ ":libchrome" ] version_name = chrome_version_name + deps += brave_public_apk_or_module_tmpl_deps loadable_modules = brave_public_apk_or_module_tmpl_loadable_modules } } -@@ -2702,6 +2710,7 @@ if (current_toolchain == default_toolchain) { +@@ -2697,6 +2705,7 @@ if (current_toolchain == default_toolchain) { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -74,7 +74,7 @@ index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -2885,6 +2894,7 @@ if (current_toolchain == default_toolchain) { +@@ -2880,6 +2889,7 @@ if (current_toolchain == default_toolchain) { deps += [ "//weblayer/browser/java:upstream_java" ] } } diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch index e8d74e469f82..24f329665bc1 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -index 1df73c6137852f3b0a88f0caf89c2308c7dfed15..d8ce10c0682a42fa27bc7476703ccf86046b9ff1 100644 +index 1324da1f561b085d36d7c83caa993b34e637b462..df170f9577e4ab805eeebdbe0d1d20a2217b8bc8 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -@@ -76,7 +76,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -74,7 +74,7 @@ export class SettingsPersonalizationOptionsElement extends syncStatus: Object, @@ -11,7 +11,7 @@ index 1df73c6137852f3b0a88f0caf89c2308c7dfed15..d8ce10c0682a42fa27bc7476703ccf86 // TODO(dbeam): make a virtual.* pref namespace and set/get this normally // (but handled differently in C++). metricsReportingPref_: { -@@ -118,7 +118,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -109,7 +109,7 @@ export class SettingsPersonalizationOptionsElement extends pageVisibility: PrivacyPageVisibility; syncStatus: SyncStatus; @@ -20,7 +20,7 @@ index 1df73c6137852f3b0a88f0caf89c2308c7dfed15..d8ce10c0682a42fa27bc7476703ccf86 private metricsReportingPref_: chrome.settingsPrivate.PrefObject; private showRestart_: boolean; // -@@ -173,7 +173,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -148,7 +148,7 @@ export class SettingsPersonalizationOptionsElement extends override ready() { super.ready(); @@ -28,8 +28,8 @@ index 1df73c6137852f3b0a88f0caf89c2308c7dfed15..d8ce10c0682a42fa27bc7476703ccf86 + // const setMetricsReportingPref = (metricsReporting: MetricsReporting) => this.setMetricsReportingPref_(metricsReporting); - this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref); -@@ -207,7 +207,7 @@ export class SettingsPersonalizationOptionsElement extends + this.addWebUiListener('metrics-reporting-change', setMetricsReportingPref); +@@ -182,7 +182,7 @@ export class SettingsPersonalizationOptionsElement extends } // diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 3a8f0cf449e6..0250e8a525b0 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index 4b5c3ba6ffe222098e2c7831cde47e4eff2b8d42..bb1658e65a638501cd2eec9312d82a9d8b1984d8 100644 +index a3823a5fa155b06463bb63192cfc72a180ea33c7..b3e196cfcc1c616a3cafcf5e210b1542dfb6798e 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts -@@ -47,6 +47,7 @@ export enum ContentSettingsTypes { - // The following item is not in the C++ kContentSettingsTypeGroupNames, but it - // is used everywhere where ContentSettingsTypes is used in JS. +@@ -48,6 +48,7 @@ export enum ContentSettingsTypes { + // are used everywhere where ContentSettingsTypes is used in JS. PDF_DOCUMENTS = 'pdfDocuments', + SITE_DATA = 'site-data', + AUTOPLAY = 'autoplay', ETHEREUM = 'ethereum', SOLANA = 'solana', BRAVE_SHIELDS = 'braveShields', GOOGLE_SIGN_IN = 'googleSignIn', } diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker.ts.patch index a090e56bb23f..18baf701a5fa 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker.ts b/chrome/browser/resources/signin/profile_picker/profile_picker.ts -index 17be6261ef877c0c23ce38d7ab09036e30354b3d..3e0b1757b0f24f9480d682f46568e6cbf0fd3138 100644 +index a034b5ea61ddf7330fac06aab88efc3d7b742303..d8b4465cd96582c54893cccf635b957cb3b5be08 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker.ts @@ -2,6 +2,7 @@ @@ -7,6 +7,6 @@ index 17be6261ef877c0c23ce38d7ab09036e30354b3d..3e0b1757b0f24f9480d682f46568e6cb // found in the LICENSE file. +import 'chrome://resources/polymer_overriding.js' - export {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; + export {loadTimeData} from 'chrome://resources/js/load_time_data.js'; export {ensureLazyLoaded} from './ensure_lazy_loaded.js'; export {AutogeneratedThemeColorInfo, ManageProfilesBrowserProxy, ManageProfilesBrowserProxyImpl, ProfileState, UserThemeChoice} from './manage_profiles_browser_proxy.js'; diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index f3175d813cc7..3cf1f78119f7 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index 01018303382b087221e1899feab76db2e51b1ef5..d54a0e58b26d67064718df2778a590984e59440a 100644 +index cb1203338385824c8556866de92a3bca9ba0c36f..2e48a1c989d4ccc7985797a7e8da8612145658b5 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1866,6 +1866,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1858,6 +1858,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( + EncryptionResult result = InitPasswordFormFromStatement( - *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, - new_form.get()); + *statement, /*decrypt_and_fill_password_value=*/true, new_form.get()); + BRAVE_STATEMENT_TO_FORMS if (result == ENCRYPTION_RESULT_SERVICE_FAILURE) { has_service_failure = true; diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 5036e2db0bc8..4df18f9e713d 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,12 +1,12 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 7270dc91ca43b646b9b630228703af24689ba078..89f12890ee3f7d0925653b53edec9935bf2ee3d6 100644 +index 8b9a477469ed51dad8d78c4b544b77f3bb73088b..8d00de3e4de4bf5b1eb3f081a9f1082a0d7390e4 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -856,6 +856,7 @@ void MediaDevices::DevicesEnumerated( +@@ -889,6 +889,7 @@ void MediaDevices::DevicesEnumerated( } } + BRAVE_MEDIA_DEVICES_DEVICES_ENUMERATED - RecordEnumeratedDevices(resolver, media_devices); - RecordEnumerateDevicesLatency(request_metadata.start_time); - + RecordEnumeratedDevices(result_tracker->GetScriptState(), media_devices); + // TODO(crbug.com/1395324): Remove this custom EnumerateDevices latency + // tracking by reverting crrev.com/c/3944912/ once the From c69cf674f1992ae224e3769422c575ade0075a10 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 8 Dec 2022 15:40:54 +0000 Subject: [PATCH 031/146] Update patches from Chromium 110.0.5449.3 to Chromium 110.0.5462.3. --- patches/base-BUILD.gn.patch | 4 +- ...base-threading-thread_restrictions.h.patch | 4 +- patches/build-config-BUILDCONFIG.gn.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 8 ++-- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 6 +-- ...ed_mode-TabbedRootUiCoordinator.java.patch | 4 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 4 +- ...hrome-browser-browser_process_impl.h.patch | 2 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +- ...r-extensions-extension_management.cc.patch | 4 +- ...rotocol-external_protocol_handler.cc.patch | 2 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- ...ext_menu-render_view_context_menu.cc.patch | 2 +- ...sources-bookmarks-command_manager.ts.patch | 2 +- ...ser-resources-downloads-downloads.ts.patch | 2 +- ...er-resources-history-history_item.ts.patch | 2 +- ...-browser-resources-settings-BUILD.gn.patch | 4 +- ...ettings-people_page-sync_controls.ts.patch | 2 +- ...cy_page-personalization_options.html.patch | 6 +-- ...tings-privacy_page-privacy_page.html.patch | 6 +-- ...ettings-privacy_page-privacy_page.ts.patch | 2 +- ...y_page-privacy_page_browser_proxy.ts.patch | 6 +-- ...-browser-resources-settings-route.ts.patch | 2 +- ...settings-category_default_setting.ts.patch | 2 +- ..._settings_page-site_settings_page.ts.patch | 2 +- ...e_picker-profile_picker_main_view.ts.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +-- ...rome-browser-ui-appmenu-AppMenu.java.patch | 4 +- ...-browser-ui-android-toolbar-BUILD.gn.patch | 2 +- .../chrome-browser-ui-chrome_pages.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...chrome_location_bar_model_delegate.h.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 4 +- ...ews-location_bar-location_bar_view.h.patch | 8 ++-- ...verlay-video_overlay_window_views.cc.patch | 2 +- ...side_panel-side_panel_coordinator.cc.patch | 2 +- ...ws-tabs-tab_hover_card_bubble_view.h.patch | 4 +- ...e-browser-ui-views-tabs-tab_strip.cc.patch | 6 +-- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ..._integration-web_app_shortcut_mac.mm.patch | 4 +- ...extensions-api-developer_private.idl.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 +- ...me-test-data-webui-settings-BUILD.gn.patch | 4 +- patches/chrome-utility-BUILD.gn.patch | 2 +- ...settings-SingleCategorySettings.java.patch | 4 +- ...error_page-common-localized_error.cc.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 4 +- ...licy-tools-generate_policy_source.py.patch | 4 +- ...protocol-device_info_specifics.proto.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 6 +-- ...vice_info-device_info_sync_bridge.cc.patch | 12 ++--- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 6 +-- ...lic-browser-content_browser_client.h.patch | 4 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- ...r-api-web_request-web_request_api.cc.patch | 2 +- patches/media-audio-pulse-pulse_util.cc.patch | 2 +- patches/net-BUILD.gn.patch | 2 +- ...net-http-transport_security_state.cc.patch | 4 +- ...ices-network-cors-cors_url_loader.cc.patch | 2 +- ...services-network-public-cpp-BUILD.gn.patch | 4 +- ...ices-network-resolve_host_request.cc.patch | 4 +- ...rty-blink-renderer-bindings-BUILD.gn.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...ndings-scripts-bind_gen-interface.py.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 4 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...bgl-webgl2_rendering_context_base.cc.patch | 6 +-- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...rty-blink-renderer-platform-BUILD.gn.patch | 4 +- ...tools-gritsettings-resource_ids.spec.patch | 2 +- patches/tools-licenses-licenses.py.patch | 2 +- ...metadata-histogram_suffixes_list.xml.patch | 4 +- patches/ui-webui-resources-BUILD.gn.patch | 4 +- patches/v8/BUILD.gn.patch | 6 +-- 86 files changed, 185 insertions(+), 185 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index a3ff52e29c01..3df41594ca9f 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index d72367da30bbbfb7b024c0a90c9a257d10326e63..7070d5d4f82ed8700a77d80ff10258cc06b70f2c 100644 +index fab875470b919945127565a300961adc431bf9f7..e184e118916012261bbe860c5447746d58fef831 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4300,6 +4300,7 @@ if (is_android) { +@@ -4308,6 +4308,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index 860f6a98deb5..444f7c86b3ec 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index e1b4f49733268390eec0c19de31d77906183f5c9..1a6a9aa672d40bc76b8eeed5d16718b8db72dc19 100644 +index f3295a465997b04e2345b31ea1bad42f66ab7400..daf0b32335d2cfa0818b3fd7c2805833df89f8b2 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -671,6 +671,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -688,6 +688,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index d11f0c03f54a..c474347758a5 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index efba84719e620954fd093dcac4ce2c60b6b97def..6de9b34d81eeffa41b3c8643c5322a52436207d1 100644 +index cc7e92ddb67cd0da1acd38bfaf1479cb08b2ca65..1671c8ad4ca513b8ba4c5bf4ffec77440df1bb62 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -329,6 +329,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 7ef52f667560..723c413f456f 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index e0f8adc1b28e1dff12d1089ffaabd67250a297c2..85255e95334170d5c79f8faa84c21fdd7b97ae35 100644 +index b78b91f35e1982cf9f14d35d56c7106d68cc3404..a7b3d2410aa5bfce98c8486859b45c2cb9aee50b 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -3898,6 +3898,7 @@ if (enable_java_templates) { +@@ -3884,6 +3884,7 @@ if (enable_java_templates) { } else { not_needed(invoker, [ "missing_classes_allowlist" ]) } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index cb269f090ff0..2687b5d5114a 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 8a8aac68cead19e8e441ac88dc5980fd12b9da1b..ee7b22200e197443ef962a8866319373fe39becd 100644 +index b6d9616929f6e568c5b884b9460ff6cb6b82a65a..0b73c52cb3e35e3d7c6e479f2616366e9cc38f20 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -574,6 +574,7 @@ if (enable_java_templates && is_android) { diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index a69807195d4e..cbe82049e57e 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 352c255cf67127a90b63ef654c3f033afb30de02..aef535566844700ac4c17b4258939180fc67faa1 100644 +index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d60c3cda4f 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -179,6 +179,7 @@ if (!is_android && !is_mac) { @@ -85,7 +85,7 @@ index 352c255cf67127a90b63ef654c3f033afb30de02..aef535566844700ac4c17b4258939180 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1377,6 +1386,7 @@ if (is_win) { +@@ -1378,6 +1386,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -93,7 +93,7 @@ index 352c255cf67127a90b63ef654c3f033afb30de02..aef535566844700ac4c17b4258939180 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1447,7 +1456,7 @@ group("dependencies") { +@@ -1448,7 +1457,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -102,7 +102,7 @@ index 352c255cf67127a90b63ef654c3f033afb30de02..aef535566844700ac4c17b4258939180 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1501,6 +1510,7 @@ group("resources") { +@@ -1502,6 +1511,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 13f152456f37..c6192d1da4f5 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index cb9d82225b5aa6cefe74aaaef3aaeea41651c9ef..fdcc92fcada3951abf6ba5739bef7e5db2e7809f 100644 +index e22cb3c1e9481c344478069e665e39b407f4775c..892cf95ecde4d96ab371e6abfa136b2f19e32a7a 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1215,3 +1215,4 @@ chrome_java_sources = [ +@@ -1216,3 +1216,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 619cf0dd32de..c5b295fc1eb6 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 29dd4a43f814facd5a562682822bba0144535b57..43d8220f14f4207748d1e53fb9cd607c61c49eb4 100644 +index 068b8391b06aba28364b63e4fe6f56d54b9ae4af..66f1df36666445906714b4e05f2ce0580aa9ced2 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -102,6 +102,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -98,6 +98,7 @@ template("chrome_public_common_apk_or_module_tmpl") { "*ic_file_download_white*", # Bottom edge seems misaligned. "*ic_lock.*", # Bottom edge seems misaligned. ] @@ -10,7 +10,7 @@ index 29dd4a43f814facd5a562682822bba0144535b57..43d8220f14f4207748d1e53fb9cd607c # Note most of these, with the exception of resource_exclusion_exceptions, # are currently duplicated in system_webview_apk_tmpl.gni. -@@ -202,6 +203,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -198,6 +199,7 @@ template("chrome_public_common_apk_or_module_tmpl") { proguard_configs = [] } proguard_configs += [ "//chrome/android/proguard/main.flags" ] diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch index e38247a129e2..f127b5abd1d6 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -index 26b8be81f41e266bb42500b9fc6b68bfe847dcfe..518b01c9dabbcddd75c2a67fae3e5fe6972d262f 100644 +index c95e0a59b113c733654dc3abfc1584d1edd4e506..a45dcdb301b6a91144cf077c4a54583c2c3a3f6e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -688,7 +688,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -689,7 +689,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mActivity, mModalDialogManagerSupplier.get())); NotificationPermissionController.attach( mWindowAndroid, mNotificationPermissionController); diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 862021a16119..c175bea81c1a 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index e7757349a76a067c0010ffafdbc806aa5733cf56..a619156723c3034bafba4fd25bdb50ea7e15545d 100644 +index ae76fcf1c7912bbcaaf073bee3fe8753e88ab5a2..3cd1e8413b0a3f54aacf36f931f046aa5e539fce 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2536,6 +2536,7 @@ static_library("browser") { +@@ -2535,6 +2535,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 90c7c1c79ab8..c912a7e9940c 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index d0336793772e2b4f35ee695406d3babe2e29bf17..9ac5a802c8257d4834c952d74ef771d96f0f673a 100644 +index ce932800fc12e959d8e1b741f701a355f1aa95c9..45b5c953da77c941436ecb2d6771ea0f1f8802a3 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3338,6 +3338,7 @@ const FeatureEntry::FeatureVariation +@@ -3379,6 +3379,7 @@ const FeatureEntry::FeatureVariation // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index b60451620fd0..2764f1ba2064 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index f8a1250d7ba0725c413d5314b6a20d24b25bc5d0..6b2d9cc6d469554fcdf2b0bfe521c5ebfb9e2986 100644 +index a649553a1a6d7f0212f3bd07fac2f15953768171..554412f32dc82b837f795277289c78d4814b9543 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -215,6 +215,7 @@ class BrowserProcessImpl : public BrowserProcess, diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index be81a32ba634..b1fe3faec9f0 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index edaeeb3bd0839805fa0634e1bcba86ca207ead0b..524b94a6728627e498049c8be1057c3370c69ba0 100644 +index a7c6779e0424ed89f2aee73e2b0c6ffcad913e7c..63728377ea362fb820d1642a0ec0092000c5e934 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1366,6 +1366,7 @@ static_library("extensions") { +@@ -1367,6 +1367,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 79b04493993a..0410945fe005 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 50c8b56325b3f417647550a14376dd1af39d1c9a..7920ab44e3c089c1381d77662e5e51b41115dc21 100644 +index 94c85501355314d6fa594d0ec60472adee24e04b..d528057860cd66fdcf86d3e4e560185849527c4e 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -864,6 +864,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -875,6 +875,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index 862547e266ea..80e1daf38628 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index e6459bc3474df327be5eee03180c32ebc4587130..52291de2148b0669a641744f420b2941d88f5784 100644 +index 5ac521e898d4d97179a177d32105c8c3932846b4..6435e5dc1d2ff37d1c792d17d0ed84b44cf180d1 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -345,7 +345,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 1ef3185a39c0..a78b9b0a55bf 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index f82adfafb10ec8f3dca919330faf609b84d861be..b36b3888ba75da2e35e5de7d50f60be0dbe2b5fd 100644 +index 5c04d83478f454bbeb5ac83c7a988c950d4174a1..af2836cf65631aa521b8ab9db48db3e790b9c6b8 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1275,6 +1275,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1300,6 +1300,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -11,7 +11,7 @@ index f82adfafb10ec8f3dca919330faf609b84d861be..b36b3888ba75da2e35e5de7d50f60be0 #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) screen_ai::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -@@ -1656,6 +1658,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1680,6 +1682,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif registry->RegisterTimePref(prefs::kDIPSTimerLastUpdate, base::Time()); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 748efa12c372..88b9ab2aa6fb 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index b853d43a90d133d241215521ab5a740803aa51cc..713fe1626215a9dafe071c32e3cdb14219aca09f 100644 +index 102603d423eaa259bfc2e657f53e105c10061ada..f37c6b1335b55c51ea546c25d16f8c78659db667 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1939,6 +1939,7 @@ void RenderViewContextMenu::AppendSearchProvider() { diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch index 29e7315c93a0..dd69e50bdf63 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts -index c7035b0dccead100a688156658107cab581ab144..fb36a52a8fac449e3042565d774bf3473f661f0c 100644 +index e739c7845c4fbe1b28f448cea752ae2b942d4379..3bf96192e934d1a946437a1727cf5762d88793f1 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts @@ -427,7 +427,7 @@ export class BookmarksCommandManagerElement extends diff --git a/patches/chrome-browser-resources-downloads-downloads.ts.patch b/patches/chrome-browser-resources-downloads-downloads.ts.patch index 88b6f4cabb64..269d59f3f940 100644 --- a/patches/chrome-browser-resources-downloads-downloads.ts.patch +++ b/patches/chrome-browser-resources-downloads-downloads.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/downloads.ts b/chrome/browser/resources/downloads/downloads.ts -index f54656f1d7ee40cf7dc1c95d3e416fc65c2bf293..74062bee8cc2fce442332fd53f7dec83bfdfa60b 100644 +index 0b05e22165c61dcb57aeeb46f251f697a6514978..ea224dc0fad035208782345c8520e2fe12b92902 100644 --- a/chrome/browser/resources/downloads/downloads.ts +++ b/chrome/browser/resources/downloads/downloads.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-history-history_item.ts.patch b/patches/chrome-browser-resources-history-history_item.ts.patch index fa4bece7fdaf..21b337f577e9 100644 --- a/patches/chrome-browser-resources-history-history_item.ts.patch +++ b/patches/chrome-browser-resources-history-history_item.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_item.ts b/chrome/browser/resources/history/history_item.ts -index 2743f5c0aa454d1b8ff91260af329eefe58707db..f08b405dbc37a196bc52cccedacf101e5bdb941c 100644 +index e91e5cdea2466bb9092a1756b35316412b448ee7..aad88bb0b97c3f900bc7d21916ccc3003b7cc0f4 100644 --- a/chrome/browser/resources/history/history_item.ts +++ b/chrome/browser/resources/history/history_item.ts @@ -9,6 +9,7 @@ import 'chrome://resources/cr_elements/cr_icons.css.js'; diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index c34cf7a04dfe..9d75ebcb612f 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 176339319efca6b412f28178ad383f002f44df2b..f558b2a01e465fb90e04b760366b237b68805de5 100644 +index 928d40e7295313f7feb1348cdf08e19481eb497f..358aee53de8c5e6804d699403b46ed4b69c677c3 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -490,4 +490,5 @@ build_webui("build") { +@@ -496,4 +496,5 @@ build_webui("build") { "lazy_load.rollup.js|lazy_load.js", ] } diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch index f48c17b1ef3a..d66d7b894836 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts -index 844af33fb424c61ebae7dca47a47fe378faf6c70..8b0abd622ecc1fcf708f968a4c538f24d6e5f220 100644 +index b8162976279eea18754bd3814068013bb5ed3728..698400aa2b24ecb554d4943304680ca2c5e38874 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts @@ -100,7 +100,7 @@ export class SettingsSyncControlsElement extends diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch index cb28a64a4b90..5aa5e1dcd5f6 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html -index c01b1dcf517e95faf4f808cf85799ee4319d68a6..034cc3865d3ca51c023ae8e562c711227a46820e 100644 +index 5c5dea3eb6c0b8ede27a972927a2214e1e356343..8af6a8fd4202653dddcf02c0b409f43a094d1344 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html @@ -13,6 +13,7 @@ @@ -43,7 +43,7 @@ index c01b1dcf517e95faf4f808cf85799ee4319d68a6..034cc3865d3ca51c023ae8e562c71122 @@ -51,7 +51,7 @@ index c01b1dcf517e95faf4f808cf85799ee4319d68a6..034cc3865d3ca51c023ae8e562c71122 diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 7a6167843bed..9d95c21ce04a 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index ce286a2faf3513c87deb87e1700185765af3d99a..8eaca562c4f83974cc65430fb871e49796739558 100644 +index 24a1cc0deea4164d76d33081a95fa9ed7b06a5f6..5119a16a11464166800b7ca73db7640008b385b7 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -40,6 +40,7 @@ @@ -10,7 +10,7 @@ index ce286a2faf3513c87deb87e1700185765af3d99a..8eaca562c4f83974cc65430fb871e497 @@ -18,7 +18,7 @@ index ce286a2faf3513c87deb87e1700185765af3d99a..8eaca562c4f83974cc65430fb871e497 diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index a8c704c044fb..91ba7bb51336 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index 949e389b315b8ec376760566a58bf00be074ecce..070859055d3b68692b2b13bbc56e72e6c177ed30 100644 +index c7049b73e11bca6143e44c5b30375b4e06c64974..11cfb0d4571925fb21a7fb52d6a2a5c64fd184d4 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch index 002f0c62d72f..31b6b6b60b5d 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts -index 6450085f7c924172bb077454015b865cd350a7be..11e30622c22529b568781a2514e28845a14cf517 100644 +index 001f438e666ea61c4038a49566c897b8274e2132..c3eff8c17737197a4657f8150b6b399ec234bcda 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts -@@ -46,7 +46,7 @@ export interface SecureDnsSetting { +@@ -54,7 +54,7 @@ export interface SecureDnsSetting { } export interface PrivacyPageBrowserProxy { @@ -11,7 +11,7 @@ index 6450085f7c924172bb077454015b865cd350a7be..11e30622c22529b568781a2514e28845 getMetricsReporting(): Promise; setMetricsReportingEnabled(enabled: boolean): void; -@@ -84,7 +84,7 @@ export interface PrivacyPageBrowserProxy { +@@ -92,7 +92,7 @@ export interface PrivacyPageBrowserProxy { } export class PrivacyPageBrowserProxyImpl implements PrivacyPageBrowserProxy { diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index a193fb353295..6a9683eba316 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index ca294b85461294b60284d6fbd31045e161299bb2..4222298d7accbfd49a9a049a04a94e3f1d516cae 100644 +index 98f4685d18f921c666c02db0fc46ad4db73bbd25..39c5b0e61f7a11050362f92af2bffc1aff6bbfe4 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch index e26817158554..25fca4d0493d 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts -index 2f2f1de67e4f9d4e07b8aa97c7860c1ded6f27fe..b37b06c35bf7d1dd4d4fc6ae0534709f75d7909f 100644 +index 23ca13f050103ec396f8e3d73e03492475182dcf..f953a49612ad4a67911bc51ac01805d310e4026e 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts @@ -184,6 +184,7 @@ export class CategoryDefaultSettingElement extends diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index 96e8587f5df4..c4880815f2d7 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index 7e998696f6e476a0fc7840eafd9626a039fe8ca3..47d0e1629dbdface8a20c1d0a9348d75fe787913 100644 +index cd3121ad89976a83c8a33ae76e6f6c272a7100c1..ac5825d3c7e9456a00ccbb30617f261a85a706b2 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch index 450df5141664..aaee7c067774 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -index 98373d10063d5eab1e0bc4dc177e4880548a515a..d0bc355902113afb740db81e2ec44a95be34c169 100644 +index 89360107e0f0b3b6398bdfd8bfcd5aaec0a5de33..93fae620d89e47056b5eaf0136efe587086421ef 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts @@ -96,6 +96,7 @@ export class ProfilePickerMainViewElement extends diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 3cc89775ea83..5add9363d5d2 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 011506ee4df759f9ca3ef8971a9f43cf778e608f..6ce0f9bf3092d0848e83864a7e05f84229017928 100644 +index d0204a157a2405f6db95d70df3c454479cca15f1..8b8ebfbab7e4d05fd0687f0b3b6aaf1a905f1360 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -671,6 +671,7 @@ static_library("ui") { +@@ -666,6 +666,7 @@ static_library("ui") { "//ui/webui", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 011506ee4df759f9ca3ef8971a9f43cf778e608f..6ce0f9bf3092d0848e83864a7e05f842 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -4007,10 +4008,13 @@ static_library("ui") { +@@ -3991,10 +3992,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index ffb1b42a4a72..457f04390994 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index b0de8e5672c922b4a36a4dc2175813536db1f82c..e1886d04627e612b25b2113db4663e76c37b8a3e 100644 +index 0642111d423c5ab12a7bda74749e5f15378cc900..b81ccd72d75bbc0fe96cd435268ca2d01bd61f29 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -225,6 +225,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -222,6 +222,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler mPopup.setAnimationStyle( isMenuIconAtStart ? R.style.StartIconMenuAnim : R.style.EndIconMenuAnim); } diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 8feb99dd5a6f..5e796fbec4e0 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index 2f24c59bd46e2d7a53e7382526399cef5794dada..d9662533bf45d11236a9c50263de2ff069199b74 100644 +index 1b4476d5fafe35caa001131fa590c317a015d440..e0d764bf793dd26500e563fa5581aebbd4a5c97a 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn @@ -110,6 +110,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index aad8f4c59509..afdd85c63e6b 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index 8ce93783882a5c5a09b10bdc1a8f2593b8c4ea86..7ac018da5689d3af7d89abe5f21bd682c0329780 100644 +index e02762a9640c118a286e17d3d49fc84104599523..85880132f40c93c05dd1d43a8a62f79322030a33 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -343,7 +343,7 @@ void ShowSlow(Browser* browser) { +@@ -342,7 +342,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index d5fced0bdd24..3ca94692d20c 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 76d68bdd8cab6ea7eaa935a888246ecf9b221bcd..7d76a05196101ec2569ddd8bfb211398042c75b9 100644 +index 11d876a127ee92c33407a9f2d1d2b8654c37a62f..0b22db56200c34084c7112e664a9303ee96232e0 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -669,4 +669,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -660,4 +660,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index 9be09d5825cf..d28b43a1084a 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index 7a302f36af0aa848f8d9beeca47d38a97390b45b..3a21cb79a88ba0f0613a8e4047ccc584833562da 100644 +index 8d241fdf774d2d885dae5f5d8b03d975b46d7f74..5c67b4cbbbcf31fe6044302b633beea5a8a49673 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -577,6 +577,7 @@ class TabStripModel : public TabGroupController { +@@ -579,6 +579,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; diff --git a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch index 03ea2dac2f67..05c017bfa7e1 100644 --- a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch +++ b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h -index 9650d891c1572196cc57f5b5b694a9cbf2c83360..e6340b92e69876da29ea9ecc39b9182280715589 100644 +index 8afbe8994d86a05c10ec92ac60f6f6db0899b36d..f7137304149e249a84a44cce96a0b900f34535cc 100644 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h -@@ -64,6 +64,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate { +@@ -63,6 +63,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate { // Helper method to get the navigation entry from the navigation controller. content::NavigationEntry* GetNavigationEntry() const; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index c9ef1ce47497..bd572ab5f71b 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index b7499d1bd46f38f64ee7c92d95dfef7b1133a000..0a5cd14c092ae77ae028f3615df241471dd747f4 100644 +index d7ed6c2a5af6bf0e845d977d76623de42fe9b09f..fd081e80e3b45e7c13d4b65889ad6c4a05dec535 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -674,6 +674,7 @@ void LocationBarView::Layout() { +@@ -667,6 +667,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index 6500077d2f41..a1f06cc92a48 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index 9abf4d8bd0c48c7f37874820efd267fd2f1c30a8..7445899639666d8cd50ee8a1f714446e9bdb4ccf 100644 +index cd834f43bf87d4878bd489fb91ff82f297ea052e..b69fec863a54caa29b7495945df7d03d8e655534 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h -@@ -114,6 +114,7 @@ class LocationBarView : public LocationBar, +@@ -112,6 +112,7 @@ class LocationBarView : public LocationBar, int GetBorderRadius() const; // Initializes the LocationBarView. @@ -10,7 +10,7 @@ index 9abf4d8bd0c48c7f37874820efd267fd2f1c30a8..7445899639666d8cd50ee8a1f714446e void Init(); // True if this instance has been initialized by calling Init, which can only -@@ -166,6 +167,7 @@ class LocationBarView : public LocationBar, +@@ -164,6 +165,7 @@ class LocationBarView : public LocationBar, // Updates the controller, and, if |contents| is non-null, restores saved // state that the tab holds. @@ -18,7 +18,7 @@ index 9abf4d8bd0c48c7f37874820efd267fd2f1c30a8..7445899639666d8cd50ee8a1f714446e void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -252,6 +254,7 @@ class LocationBarView : public LocationBar, +@@ -246,6 +248,7 @@ class LocationBarView : public LocationBar, std::vector& GetContentSettingViewsForTest() { return content_setting_views_; } diff --git a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch index 38ef487ebea4..39b894d4f11b 100644 --- a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch +++ b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index eb3b554f37cdaa1b8ef532cecc210f093554704d..2830864767b7b92afe39f3a3b63260933c727373 100644 +index d2d65a1073c8f9c43543b7127c2caa7ca0859982..79ba2d6f395907760bc88c017f32b2cdcd0b4d6c 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -640,6 +640,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch index cf603a4fb54a..72a10054948f 100644 --- a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch +++ b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc -index 8de644670c5f587375cde2320b718427480f210b..e79698cce5bec175db064d79ba18097edb0f3a18 100644 +index ca76f2c61bd3c1b1b5fafacfe41efbd7dc3fa3a6..c560b664f7c1bd17dd4234cea42820cf7e11ed07 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc @@ -184,6 +184,7 @@ SidePanelCoordinator::~SidePanelCoordinator() { diff --git a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch index dd93253e2ccd..6559a0d5ed42 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -index 401131ee73bded8b9a5af519a2a29c4233b416a8..e69eb00e1c1441e94ffa1c809d2189bb36cff50d 100644 +index e2297c2305872b28bd645f3f918c425781b6edbd..abe790633fadd7739bfd10375c0bcccc558dc971 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -@@ -137,6 +137,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { +@@ -138,6 +138,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { // available, or `absl::nullopt` to disable crossfades entirely. static absl::optional GetPreviewImageCrossfadeStart(); diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index ef9e93ec51b4..4dabb0db79a7 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index f4a7d92d80170c09fc5f4c716458469314f230d8..eef3f6d7f340d1f4023d23278813f853a9002b0a 100644 +index 8e1faaa3409abb5a83567071c783fb4cfb54e30b..886c787ce092b4a7f0dc571bae22d65329b91995 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -493,6 +493,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -495,6 +495,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, std::vector CalculateBoundsForDraggedViews( const std::vector& views) override { @@ -10,7 +10,7 @@ index f4a7d92d80170c09fc5f4c716458469314f230d8..eef3f6d7f340d1f4023d23278813f853 DCHECK(!views.empty()); std::vector bounds; -@@ -742,6 +743,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -761,6 +762,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, continue; } diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 9f8816d45fcc..b084473f0bc6 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index 357c462ca109d22b7cf73be686badc7d142ca79e..823ced2b2630a5ccad31616617d39b694eb3d489 100644 +index fb8def53074e9da7539127f56fa687b4bfcd88e8..8eb9ab28087596a5f5496789b594e8e19618af8f 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1318,6 +1318,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1316,6 +1316,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 63f3a898aab9..248badedc7c5 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index e73519d67c813507c1f0990472b9637cf2ad0f9b..129a5b06914470e8c819bfcdfc2ec1503e551e4b 100644 +index c90b57ee26b3d2b33328b57e649ff29d856f1748..d69dd10205f48b2ee020f366e63a529ef8866c37 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3223,6 +3223,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3268,6 +3268,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch index 7ef51f327eef..509d32c012f7 100644 --- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -index 7035c70e698bf1a53c8d143d515ff09a886e22d7..7df7ad0b53fc1acfc1b213ab627f748bee29fcf1 100644 +index 266e031765833a75101fdb369f567bc51bdd5c5e..8af6daf3ada78d45d42fe9b0ae8274af2754ffb8 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -@@ -797,6 +797,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -776,6 +776,7 @@ base::FilePath GetChromeAppsFolder() { if (path.empty()) return path; diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 299f0cefde5e..25cfd91a5e3d 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index 23478c1b3d24a9103be116c4cbd0dbf71b700b29..a1d872be48b17f0cdd0a618c2f53f303023d7942 100644 +index 4437805e02c5f141450426285d47679e4131c713..9395188e7082686d45e8f254dd834e1228b25dd4 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl @@ -233,6 +233,7 @@ namespace developerPrivate { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index e04b874a7fb9..03c0dee61c8b 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 9d802f1a7ae118de7b1c81daf6dfe4e7338f2077..30add02724a6afd9939debe68fbb9635ee207299 100644 +index 572ca887693b2cfbcabf9d02193dcc11d294c3ae..1f367a1a87fecc7784acd964236dd95c7abd4345 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { @@ -10,7 +10,7 @@ index 9d802f1a7ae118de7b1c81daf6dfe4e7338f2077..30add02724a6afd9939debe68fbb9635 data_deps = [] if (enable_pdf) { -@@ -5255,7 +5256,7 @@ config("disable_thinlto_cache_flags") { +@@ -5262,7 +5263,7 @@ config("disable_thinlto_cache_flags") { } config("pdb_larger_than_4gb") { diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index 96231770973b..dbe3488b0473 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index 8910f6e7fae85dfd27d9955918f18030a23fb716..7bfe7677f0241d45554d44d3b5fe9a2f293839cd 100644 +index 76c2ae713293661166633472c89f6e302f4444fa..47dc43d4cc16e97c938f419c3d5b4c67aeb26a09 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -236,6 +236,7 @@ ts_library("build_ts") { +@@ -235,6 +235,7 @@ ts_library("build_ts") { definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index c4d9680b0461..0b21351ceca0 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index 5c0f0ce689c09a743d6ac6e13ceae4eb383c587a..c72c324284476551cda657609f11df1851786854 100644 +index 63a0c23f068f15f7cbc8f41a80a3af93568f8486..22415191cceffc52603ddbb31b17dd45687186bc 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -72,6 +72,8 @@ static_library("utility") { diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index 45f3301fd06f..434aad7e5990 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index 07ce3aed95669dc1ad4797046218dc9ed794ddad..389c3c648eb61596d7aa137bf6e750dfc5f43b0f 100644 +index a3849d56e716da27ef97fe073f07038955bb8f7a..749bc1cdd62014f21f52e88e7f7af195bb6a5a39 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -464,7 +464,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -488,7 +488,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-error_page-common-localized_error.cc.patch b/patches/components-error_page-common-localized_error.cc.patch index df62ebe0a9b5..351c3eea1aee 100644 --- a/patches/components-error_page-common-localized_error.cc.patch +++ b/patches/components-error_page-common-localized_error.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc -index 65bfb1ac568bb303feeaeb6cf6ff9e8aa23280c6..bcadd2d897564e51c4404bf4da95067f5654890b 100644 +index 3e6e49328455506e68b8a70b8779256b52d3c0ba..1ccdcdd79f15010138aeb00a0235f9929380ae59 100644 --- a/components/error_page/common/localized_error.cc +++ b/components/error_page/common/localized_error.cc -@@ -480,6 +480,7 @@ const LocalizedErrorMap* LookupErrorMap(const std::string& error_domain, +@@ -479,6 +479,7 @@ const LocalizedErrorMap* LookupErrorMap(const std::string& error_domain, int error_code, bool is_secure_dns_network_error, bool is_post) { diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index b9500751a256..b5d4d12c42df 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index de0b00b12370c2b777d657f3c9e1bf9782f4a216..79681c1e4b820fe3709fdf4bf51441a790ef17bb 100644 +index 870c0b0e547b9c2b39cf69256e5baddad04e294f..32394ff34e04b428b90c2fb91457eec37b8e6eba 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -301,6 +301,7 @@ static_library("browser") { +@@ -317,6 +317,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 4b78d1d630d5..04780a6ca39a 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index c7ad9a2241451056b20c20efbf9ecce7fc8393b9..0cf20374b6d083f8afb85df4de48a4abb839c88c 100644 +index 61e94879d2bee957b650b84107d822d4337dcbff..80f08e0b5d38178af606f0af1b1572a51cfa79f2 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -455,6 +455,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -456,6 +456,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, (*text == display_text_ || *text == url_for_editing_)) { *url_from_text = controller()->GetLocationBarModel()->GetURL(); *write_url = true; diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 61acaf1985f2..5bcc18296876 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index 1e92a36bcf85de6b525487f7f036a5719230a8f7..5aa1b7a624d03f8e5975690ee749a937698164e9 100755 +index 273a7686a494f5813ba7540025f4a95c29bfd8c2..49afbccc92bb69db3959ef79d95916c838c30c55 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -55,6 +55,7 @@ PLATFORM_STRINGS = { @@ -10,7 +10,7 @@ index 1e92a36bcf85de6b525487f7f036a5719230a8f7..5aa1b7a624d03f8e5975690ee749a937 class PolicyDetails: """Parses a policy template and caches all its details.""" -@@ -382,6 +383,7 @@ def main(): +@@ -384,6 +385,7 @@ def main(): chrome_major_version = ParseVersionFile(version_path) template_file_contents = _LoadJSONFile(template_file_name) diff --git a/patches/components-sync-protocol-device_info_specifics.proto.patch b/patches/components-sync-protocol-device_info_specifics.proto.patch index 45cd64552eca..fc0de6021402 100644 --- a/patches/components-sync-protocol-device_info_specifics.proto.patch +++ b/patches/components-sync-protocol-device_info_specifics.proto.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/device_info_specifics.proto b/components/sync/protocol/device_info_specifics.proto -index 99fb9895edd4830129068f3f0d47714942d0be67..a989d86d2a2f2b589032eefc9b42b00e96a19c36 100644 +index d14dec2b4aca53a69da5612bfb42e9585bd00834..36720b0f758a90f9e6c26db91ef84598c0219c09 100644 --- a/components/sync/protocol/device_info_specifics.proto +++ b/components/sync/protocol/device_info_specifics.proto @@ -17,6 +17,7 @@ option optimize_for = LITE_RUNTIME; @@ -10,7 +10,7 @@ index 99fb9895edd4830129068f3f0d47714942d0be67..a989d86d2a2f2b589032eefc9b42b00e // Information about a device that is running a sync-enabled Chrome browser. We // are mapping the per-client cache guid to more specific information about the -@@ -96,6 +97,7 @@ message DeviceInfoSpecifics { +@@ -98,6 +99,7 @@ message DeviceInfoSpecifics { // The form factor of the device. optional SyncEnums.DeviceFormFactor device_form_factor = 20; diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 74a6300860f1..0575c5ff4b73 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 7c3b96cac30acffdcb04fe256e34749a393a3a2b..d4365139e40f851852440d57aa69614783861f22 100644 +index 0456bbee1dba30e19bf2cf88110d271385e2142c..4a2eb281b5dd777d7e2fe916bbf2137102b8b7d1 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -473,6 +473,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -474,6 +474,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 7c3b96cac30acffdcb04fe256e34749a393a3a2b..d4365139e40f851852440d57aa696147 VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -487,6 +488,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -488,6 +489,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch index 541f06bad06e..696d4361c134 100644 --- a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch +++ b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index 3f960a94c1cc1f093958b9216dc87577abb2a421..6dcf4404add63aa1c4463b1591f168f68d952df3 100644 +index 30621d716e577c14587046fbc0342d7381668dc2..a823c382e037608c43538c4c62c7d8afa310af64 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc -@@ -256,6 +256,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( +@@ -273,6 +273,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( GetSpecificsFieldNumberFromModelType(data_type)); } @@ -10,7 +10,7 @@ index 3f960a94c1cc1f093958b9216dc87577abb2a421..6dcf4404add63aa1c4463b1591f168f6 return specifics; } -@@ -425,6 +426,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( +@@ -444,6 +445,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( for (const std::unique_ptr& change : entity_changes) { const std::string guid = change->storage_key(); @@ -18,7 +18,7 @@ index 3f960a94c1cc1f093958b9216dc87577abb2a421..6dcf4404add63aa1c4463b1591f168f6 // Reupload local device if it was deleted from the server. if (local_cache_guid_ == guid && change->type() == EntityChange::ACTION_DELETE) { -@@ -435,7 +437,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( +@@ -454,7 +456,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( // Ignore any remote changes that have a cache guid that is or was this // local device. if (device_info_prefs_->IsRecentLocalCacheGuid(guid)) { @@ -27,7 +27,7 @@ index 3f960a94c1cc1f093958b9216dc87577abb2a421..6dcf4404add63aa1c4463b1591f168f6 } if (change->type() == EntityChange::ACTION_DELETE) { -@@ -702,6 +704,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( +@@ -721,6 +723,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( return; } @@ -35,7 +35,7 @@ index 3f960a94c1cc1f093958b9216dc87577abb2a421..6dcf4404add63aa1c4463b1591f168f6 // In the regular case for sync being disabled, wait for MergeSyncData() // before initializing the LocalDeviceInfoProvider. if (!metadata_batch->GetModelTypeState().initial_sync_done() && -@@ -910,6 +913,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const { +@@ -950,6 +953,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const { } void DeviceInfoSyncBridge::ExpireOldEntries() { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 089307408988..0b5c235334cc 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 51e339b95811e54ce29a4fa9a312e6d7a6551096..e4d289705742c3d6f8b5ec3b1003f3edd6c6dc80 100644 +index 53a860a7e2ed6b63d1405cfbe44257663b14946c..b90f9bee08503525d7e2ae1a25a5a346af5d8c60 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3438,16 +3438,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3439,16 +3439,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index c5926876da3f..803305d0436a 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 64bd2ff85a1ca4b130c49558cd496f9867d2d9e0..f0d73d788c62a94a56e71a3beba6d36d89f6adc8 100644 +index 6530ee791f7eb6d2f236152bb310399458f500eb..35e7d7d42b54ffd0cc2924768ecde39fff6a4dee 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2900,6 +2900,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2910,6 +2910,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 64bd2ff85a1ca4b130c49558cd496f9867d2d9e0..f0d73d788c62a94a56e71a3beba6d36d common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4386,6 +4387,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4396,6 +4397,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 56a8fe9dac42..05edc732428c 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 39eadbcc3fe914c154f5b655a09675427a24d0ed..de278c26f5d98563f2dc4a095562bd8d3a5879d8 100644 +index a436c6a67b565e6cbb2a08af055cafab2d0d1086..8766284bc7cff793adb6e21e8d3e775005347a4e 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -2047,6 +2047,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2052,6 +2052,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 7c9c7c3d1c5d..905c4fb487ab 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c42c1fa3c62b3f18450aaf83e80f8a623141c2d9..7f836da60ab9f5098ac45b738d56c9ca348e177f 100644 +index cb64cc0b5e7cb776bb7585871223ee5b444ba98c..2081d5d49528a83c94eb2ff871722505db5956a2 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4448,6 +4448,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4450,6 +4450,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 52cee2b84b99..adadb11d5883 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 411d6304f557a3af83ac8f43e8f92d0c9cea0aca..26189b2631c1cb90b6b3647c0d694011342cbc76 100644 +index cd278b96695bae7f8421d3760dabdb0dd9720533..ac606ef1c69aeccefb076f249636f0d4cbbfb3a0 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -933,6 +933,7 @@ void RenderThreadImpl::InitializeRenderer( +@@ -925,6 +925,7 @@ void RenderThreadImpl::InitializeRenderer( } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index 41f3c9d75b25..ba07f70fa322 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index de92cfbe70a20c350d164bd614c8b24297e67972..9b1dc98fc4382d50f55c6b42bc3dff22ab6ab87e 100644 +index 5ab49cf27ee1b2171c660880111c287dbcf8f0d5..f8cfcb42e541f4cab875d1c03978a94605b8b960 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc @@ -1385,6 +1385,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( diff --git a/patches/media-audio-pulse-pulse_util.cc.patch b/patches/media-audio-pulse-pulse_util.cc.patch index 677689b2871e..d26dd3d73300 100644 --- a/patches/media-audio-pulse-pulse_util.cc.patch +++ b/patches/media-audio-pulse-pulse_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc -index 1ef136960b3a3b8771a4f0739c419352ea13ef7f..76d94e43110f0396c1a405dd200b9abd8460e0f7 100644 +index 054ab8b305d9ebaa3af75138b8a6616ea3060e2b..922a2991fe0e8b2a998cf75abae8f31102126d0d 100644 --- a/media/audio/pulse/pulse_util.cc +++ b/media/audio/pulse/pulse_util.cc @@ -38,7 +38,7 @@ namespace { diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 6c10dfbd51d9..f6993906d868 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 99e6e76b29fb10672f9f373dab9c4522e3c8cdd0..6d9d629aee4ce84dcf1fdf9fb903ab253ad13284 100644 +index 801a2fa7e2a3f44e2b82141b22f6c0ea1fdb321b..269d56ec75f1d16db5db2c1566dffaf5e70d6b10 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1134,6 +1134,7 @@ component("net") { diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index 8f63ba389bfe..89072477ad9b 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index 1133374c14770c115656edce4169d273b142f043..979716997c91bb812548dc9d30860a8f83393b61 100644 +index e04f41c18f12ea9c9b95bdbb8dd149e142728718..f099e718a640b9fa2b7f18de2e65ebe4aa1edf4d 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc -@@ -414,6 +414,7 @@ TransportSecurityState::TransportSecurityState( +@@ -410,6 +410,7 @@ TransportSecurityState::TransportSecurityState( #if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || BUILDFLAG(IS_IOS) enable_static_pins_ = false; enable_static_expect_ct_ = false; diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index 1acbc18cb4e4..8272d627ef5e 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index 285652276863d40ad9f76bd596c54e98aa9cf7d7..a4abfb36766d5d3ee2520f4514abf67b81904f73 100644 +index 581ba9542b6268fbec3d4c6b6bdb1b572c01f285..3269e3a99625d7474909f6dd5dcb039969f2cc4c 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc @@ -727,6 +727,7 @@ void CorsURLLoader::StartRequest() { diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 5f53b68ea8dd..d510aeb7c31a 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index abedbe96fc7e0b27d57a9edc7bc758cfd1b8ab93..025871ca420e392eae858d78c55503a064bd8b9b 100644 +index 8d874bc51f2c6f576ca0e7f99f8eaaf2bc98a0e0..1e6518c48627e79e43c644540792cdfd75f59aea 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -180,6 +180,7 @@ component("cpp") { +@@ -182,6 +182,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/services-network-resolve_host_request.cc.patch b/patches/services-network-resolve_host_request.cc.patch index b96f5419ff08..ab08e24699ed 100644 --- a/patches/services-network-resolve_host_request.cc.patch +++ b/patches/services-network-resolve_host_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/resolve_host_request.cc b/services/network/resolve_host_request.cc -index 64f3e88eb86a501853cd728d89f524c08f9479a6..166a0d14fee3efb28504d629e449f01a05e5ab25 100644 +index fd76753fa9c27625b5d1008285481aa5f7b8cdd1..a17a22cf0b2a59ecf9f37e88a57d2618ac90a5fd 100644 --- a/services/network/resolve_host_request.cc +++ b/services/network/resolve_host_request.cc -@@ -71,6 +71,7 @@ int ResolveHostRequest::Start( +@@ -94,6 +94,7 @@ int ResolveHostRequest::Start( mojo::Remote response_client( std::move(pending_response_client)); if (rv != net::ERR_IO_PENDING) { diff --git a/patches/third_party-blink-renderer-bindings-BUILD.gn.patch b/patches/third_party-blink-renderer-bindings-BUILD.gn.patch index fef759c8158e..265125eab4ff 100644 --- a/patches/third_party-blink-renderer-bindings-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-bindings-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/bindings/BUILD.gn b/third_party/blink/renderer/bindings/BUILD.gn -index 1288dfbf6361428bb8a3298812aa9ba6f26b4c79..38be558ee556256f95cac6ce32df5eab6accb6eb 100644 +index 488b2ddf8462dbb9a85eb010818265e92a6e8c53..9971e8f977ed027c92807e83da1789dc8726f5db 100644 --- a/third_party/blink/renderer/bindings/BUILD.gn +++ b/third_party/blink/renderer/bindings/BUILD.gn @@ -173,6 +173,7 @@ template("generate_bindings") { diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index c8205aaf6554..5949050a6441 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 08c058b88ac7c23992979fdd400a8657b645b290..1589f01b63a4d7fadd0623a5d24408a950ee2646 100644 +index 507b69129cdbe9914893cc70e6536e25ea43dbea..04ddd4b49136958ab26ea895080eb44c3f888bdc 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2616,6 +2616,7 @@ generated_interface_sources_in_modules = [ +@@ -2622,6 +2622,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index f240a09ed098..7c80496ba005 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index bc608ab9820fd21c1010432ce25a2a63517e1d9f..6ece31bc8f8fcc733e29b8929a4c8748f3eadd7c 100644 +index 4ca7b688c9a74d709b4eede65edad7c018bc4f33..7346c537b6088627f1d1e5e263e72bde4f0ea34b 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1175,6 +1175,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1176,6 +1176,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch index a32cf0611673..43e7b6c0e600 100644 --- a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch +++ b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -index 3ee794e8b17e77505c4cca82ec0a9accc73b9b91..e963bf3921d2de6f6ef6055cf1b17dcbc4c9f305 100644 +index cf0a01b472f93f248c31d7b667720518fa1f9623..745eaf8aedff09130b78dc60572bbfeac1575f15 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -8132,3 +8132,4 @@ def generate_interfaces(task_queue): +@@ -8181,3 +8181,4 @@ def generate_interfaces(task_queue): "InitIDLInterfacesForTesting", "init_idl_interfaces_for_testing", for_testing=True) diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index f663cc3b6251..a2d0b36523be 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index c6835288532363c247104673157647b11666a152..a6c987d8cfecb612c02b10be3cdaefa63613b402 100644 +index 6530a17d2e991c4b20759a11344fe9b7488d2adb..04c55be96308d0185fe84a27985b5b2b3ed798a3 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -370,6 +370,7 @@ component("core") { +@@ -368,6 +368,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 2eba1b1ca99d..0c71c3ee144e 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 5bc1a3a0c0496e3c5ce3b9f037178e4d7b7fc90d..39bfe1ef910856f00a94c3b47434d8bdf6efc788 100644 +index 528527e1819211240b705d0018b8fe38f3bc88d2..5952f9b20254c4275b9d4fb2dafb5648981418c7 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -1069,6 +1069,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1066,6 +1066,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 51a413d12301..f96be5c1c7c0 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 644647327f01803088dae660c1601a79aa982ba5..35c74462aedc29fb82c9979075ac0bd0ad100580 100644 +index 40eb674753300791ac091ae420886e962560c7ce..d338cb351fd7f2eed113a6f09a958f09ee98dd74 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -15,6 +15,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index 644647327f01803088dae660c1601a79aa982ba5..35c74462aedc29fb82c9979075ac0bd0 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -170,6 +171,7 @@ component("modules") { +@@ -169,6 +170,7 @@ component("modules") { # generating the snapshot for android, blink is compiled with # current_os="linux" and target_os="android". Using target_os is necessary as # we need to compile in the same way as would happen when current_os="android". diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index 28797b797a7c..cfa3097c30c8 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -index 207010dd0af0ebeed81831c5317cb6bc2972288f..697d92824cd06899a714265fbebbf949fc845334 100644 +index 020b4d97ec280fadd9a4280f840aeee8f144c96d..a27a01ec1578c960607ef7f20098d514d6fa6bc5 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -922,6 +922,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -931,6 +931,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 397435656bdc..1e25cb21fe88 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 7c6266a03ef194fa5c605c41c92f1eaa120dab58..3829a0796c718eec165dc3589f03c33a9fb2aa79 100644 +index b73267021d6c46580855f5e532d3826a16ef9bc3..1047275582ab16623822a76d8f7bb876857d696b 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc @@ -5237,6 +5237,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, @@ -10,7 +10,7 @@ index 7c6266a03ef194fa5c605c41c92f1eaa120dab58..3829a0796c718eec165dc3589f03c33a switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5780,6 +5781,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5788,6 +5789,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 7c6266a03ef194fa5c605c41c92f1eaa120dab58..3829a0796c718eec165dc3589f03c33a WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -5998,6 +6000,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -6006,6 +6008,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost() || !ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 3384bf1c0f2e..4776463800d0 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73c0780082 100644 +index d57716d564be1f488c2e9d427d8d9c078ea93778..e33924e50610d9b645e38d8596753abb62303e2f 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3045,6 +3045,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3051,6 +3051,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3076,6 +3077,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3082,6 +3083,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3106,6 +3108,7 @@ absl::optional>> +@@ -3112,6 +3114,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3120,6 +3123,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3126,6 +3129,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3153,6 +3157,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3159,6 +3163,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3292,6 +3297,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3298,6 +3303,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3690,6 +3696,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3696,6 +3702,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3705,6 +3712,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3711,6 +3718,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3797,6 +3805,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3803,6 +3811,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3852,6 +3861,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3858,6 +3867,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3862,6 +3872,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3868,6 +3878,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3913,6 +3924,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3919,6 +3930,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3944,6 +3956,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3950,6 +3962,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3974,6 +3987,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3980,6 +3993,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSampleType( -@@ -3986,6 +4000,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3992,6 +4006,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 return EnsureNotNull(shader->Source()); } -@@ -4011,6 +4026,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -4017,6 +4032,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4045,6 +4061,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4051,6 +4067,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4304,6 +4321,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4310,6 +4327,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4328,6 +4346,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4334,6 +4352,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4405,6 +4424,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4411,6 +4430,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4760,6 +4780,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4766,6 +4786,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index e528e5697eab..836e5dc73435 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 7575dfdb01293f64c3118f9b0f8df008bad38e06..468f6d1a7e7c925804ef90a14b281929944728f1 100644 +index 65fc337efa292a0e9623682ba61dd0032140060d..7e859769747786b33a348f63e73ec89e713d96f8 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1819,6 +1819,7 @@ component("platform") { +@@ -1848,6 +1848,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index e1ef4dd2d6e4..5449536e72a0 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 55c1ee2590576aded7cde2625297e9b47713c29f..66b4fb2be1ef5202f868a2b5e4c0b47901333685 100644 +index 0c7a6f2d071d52c692f9c82d32ba1a3399508760..1489ca8f50dbe8ed47e2403ef152bbc913840bc1 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -41,6 +41,9 @@ diff --git a/patches/tools-licenses-licenses.py.patch b/patches/tools-licenses-licenses.py.patch index a792087bc224..a866217a8916 100644 --- a/patches/tools-licenses-licenses.py.patch +++ b/patches/tools-licenses-licenses.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py -index a33adb4901c76895f1dba6cb06ab4f866480a397..25dadee9d45ebbbffc160539bf96be99b90aa6c2 100755 +index 6f2e1a707767462e7b0e6909149cc16e6b22e62c..185e03d6c325857ad9fb03146722b9355e4db773 100755 --- a/tools/licenses/licenses.py +++ b/tools/licenses/licenses.py @@ -39,6 +39,7 @@ from spdx_writer import SpdxWriter diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index e7f75a26971a..bab06838b156 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index 67b097cd7a23d8bc074dfc2552b716770448c9df..95dfaf7b27cefa83489849c58f2edd151bf8952f 100644 +index bbbe55cc127dc68426cc7e26a6a1947e51daf361..5095a530052693b221468270a971f4c5bb5ae24b 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -4226,6 +4226,7 @@ chromium-metrics-reviews@google.com. +@@ -4234,6 +4234,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index a3ef2585123b..707721f5a569 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index 8e93492d361cec271051c7d4ccbc8a1bce3dbcff..ab199eefd31e7ce9ffba08b20051c21dc222c811 100644 +index b240bbf296ece6a3c9bcf3be82a1d4dc0fdba921..f788753b91d676643890badd7b28b128fb4bba44 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn @@ -105,6 +105,7 @@ generate_grd("build_grd") { @@ -10,7 +10,7 @@ index 8e93492d361cec271051c7d4ccbc8a1bce3dbcff..ab199eefd31e7ce9ffba08b20051c21d } if (is_chromeos_ash) { -@@ -238,6 +239,7 @@ ts_library("library") { +@@ -232,6 +233,7 @@ ts_library("library") { ":generate_definitions", ":preprocess", ] diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 41297ede5979..fe0a6f9c7a74 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index ce16c70d8ac78869401572035c8297c0c246d96e..4df4d80a4fe103a768d1d6412f616e5a6616b56f 100644 +index bbdd39038dbf505488d51bb09afd41ef424b1d75..7fb78118488943ccb010991bf7cc00ed97374263 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -616,6 +616,7 @@ config("internal_config_base") { +@@ -629,6 +629,7 @@ config("internal_config_base") { "$target_gen_dir", "$target_gen_dir/include", ] @@ -10,7 +10,7 @@ index ce16c70d8ac78869401572035c8297c0c246d96e..4df4d80a4fe103a768d1d6412f616e5a } config("internal_config") { -@@ -2633,6 +2634,7 @@ v8_header_set("v8_headers") { +@@ -2656,6 +2657,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] From 44498c32c2cce5b50cdb87c52bc4e90945f8e0f6 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 8 Dec 2022 15:43:53 +0000 Subject: [PATCH 032/146] Updated strings for Chromium 110.0.5462.3. --- app/generated_resources.grd | 74 ++---------- app/generated_resources_override.grd | 2 - app/os_settings_strings.grdp | 34 +++++- app/password_manager_ui_strings.grdp | 32 +++++- app/settings_brave_strings.grdp | 8 -- app/settings_strings.grdp | 105 ++++++++++++++++-- app/settings_strings_override.grdp | 2 + app/supervised_user_error_page_strings.grdp | 12 -- ...ised_user_error_page_strings_override.grdp | 3 - .../strings/android_chrome_strings.grd | 32 +----- components/autofill_strings.grdp | 8 ++ components/components_brave_strings.grd | 3 - components/error_page_strings.grdp | 9 +- components/fullscreen_control_strings.grdp | 3 + components/page_info_strings.grdp | 23 ---- components/password_manager_strings.grdp | 12 -- components/pdf_strings.grdp | 12 ++ 17 files changed, 199 insertions(+), 175 deletions(-) diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 3ee516868596..8ea4c102eaf3 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -8529,6 +8529,9 @@ Check your passwords anytime in $1Brave P + + Tab-group title + Save group @@ -11530,9 +11533,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Remove the suggestion $1Harry Potter - - Append the suggestion $1Harry Potter to search box - New tab @@ -13138,6 +13138,11 @@ Please help our engineers fix this problem. Tell us what happened right before y Open now + + + Get more protection against dangerous websites and downloads + + Enhanced Safe Browsing is on @@ -13790,69 +13795,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Ut venenatis magna nec lacus facilisis - - - - Assistant - - - Automatic password change - - - Let Brave Assistant help you change your password - - - Brave Assistant in Brave can complete actions across websites for you - - - To help you complete tasks, Brave will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Brave sync chain. You can turn off Assistant in Brave settings. $1Learn more - - - Learn more - - - Learn more about automatic password change - - - Cancel - - - I agree - - - Opening $1example.com... - - - Successfully changed the compromised password - - - Check your email to choose a new password - - - Check your passwords anytime in $1Brave Password Manager. - - - Done - - - OK - - - Something went wrong. - - - Check the site and try changing your password. - - - Try again - - - Your password didn't change. To change it, try again and leave this tab and side panel open. $1Try again - - - Brave Assistant stopped - - diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 52a50480ffeb..a6c3a958728f 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -1135,8 +1135,6 @@ are declared in tools/grit/grit_rule.gni. - - diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 4cc389df5e67..02283a9bd43b 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -44,6 +44,9 @@ Report this search result + + #Settings No search results returned for '$1'query + @@ -1231,12 +1234,24 @@ Use Ctrl + Alt + Brightness down to zoom out. Hear specific text read aloud. First, select the Select-to-speak icon on the bottom of your screen, then highlight text. + + Speech + Highlighting Highlight each word as it is spoken + + Automatically change language to match selected content + + + Use natural voice when device is online + + + Text will be sent to Brave for processing. + Highlight color @@ -1758,7 +1773,7 @@ Press an assigned switch or key to remove assignment. Cancel - + Manage shared folders @@ -2094,7 +2109,18 @@ Press an assigned switch or key to remove assignment. Give Bruschetta permission to access USB devices. Bruschetta won't remember a USB device after it's removed. - + + + Shared folders are available in Bruschetta at $1/mnt/chromeos. + + + To share, right-click on a folder in Files app, then select "Share with Bruschetta". + + + Couldn't unshare because an application is using this folder. The folder will be unshared when Bruschetta is next shut down. + Google Play Store @@ -4198,6 +4224,10 @@ Press an assigned switch or key to remove assignment. Set date and time + + + Per-device Keyboard + Keyboard diff --git a/app/password_manager_ui_strings.grdp b/app/password_manager_ui_strings.grdp index 55e0125089c9..100b6411e95f 100644 --- a/app/password_manager_ui_strings.grdp +++ b/app/password_manager_ui_strings.grdp @@ -49,12 +49,15 @@ Add saved passwords to Brave Password Manager - + Export passwords Download a copy to use elsewhere + + Your passwords will be visible to anyone who can see the exported file. + Password Checkup @@ -120,4 +123,31 @@ =1 {{COUNT} account} other {{COUNT} accounts}} + + Username + + + Sites + + + Password + + + Notes + + + No notes saved + + + Copy password + + + Copy username + + + Show password + + + Hide password + diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index 047ba61d7fd5..bc6532dc3a46 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -269,14 +269,6 @@ Sign in to sync and personalize Brave across your devices - - - Brave Assistant in Brave - - - Brave Assistant in Brave can complete actions across websites for you - - When on, Brave frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Brave fast. Your inactive tabs automatically become active again when you go back to them. <a id="highEfficiencyLearnMore" target="_blank" href="$1" aria-label="$2">Learn more</a> diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index d50b6093b783..d2c0de9e55eb 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -8,6 +8,9 @@ Continue + + Got it + More actions @@ -699,9 +702,6 @@ When you edit your passkey, your $1relyingPartyId account won't change - - Got it - Saved addresses will appear here @@ -1774,10 +1774,45 @@ Private state tokens improve privacy on the web and can't be used to find out who you are. + + + Donec semper + + + Fusce purus nibh, dictum sit amet mi in, fringilla ullamcorper tortor + + Donec semper + + Mauris interdum lectus vitae lacinia + + + Enabled Nulla eros tortor, placerat blandit dictum a, interdum id metus + + + Disabled Nulla eros tortor, placerat blandit dictum a, interdum id metus + + + Aenean erat leo + + + Enabled Duis scelerisque a mi eget ultricies + + + Disabled Duis scelerisque a mi eget ultricies + + + Vestibulum augue erat + + + Enabled Vivamus id lacus et lacus porttitor vulputate. Sed semper egestas orci vel maximus. + + + Disabled Vivamus id lacus et lacus porttitor vulputate. Sed semper egestas orci vel maximus. + @@ -1793,6 +1828,27 @@ Vestibulum augue + + Vestibulum augue erat + + + Vestibulum eleifend nunc a viverra congue. Integer nec mauris rutrum, porta mauris et, pellentesque ligula. Nam et pulvinar eros, in gravida nisl. + + + Mauris + + + Aenean + + + Praesent sodales, magna eget volutpat iaculis, justo odio viverra justo, id venenatis est est sit amet ex + + + Nunc metus est, faucibus sit amet lacus sit amet, aliquet rutrum libero. Maecenas vel euismod ante. + + + Mauris mattis urna elit. Phasellus quis erat sapien. Praesent finibus pellentesque iaculis. Mauris hendrerit metus at enim rhoncus bibendum. + @@ -1995,13 +2051,32 @@ Review + + Allow permissions again for $1website.com + + + Allow again + + + Review removed permissions + {NUM_SITES, plural, =1 {Permissions removed from <b>1 site</b> you haven’t visited recently} other {Permissions removed from <b>{NUM_SITES} sites</b> you haven’t visited recently}} - - Review removed permissions + + {NUM_SITES, plural, + =1 {Permissions removed for 1 site} + other {Permissions removed for {NUM_SITES} sites}} + + + {NUM_SITES, plural, + =1 {To protect your data, permissions were removed from this site you haven't visited in 2 months} + other {To protect your data, permissions were removed from sites you haven't visited in 2 months}} + + + Permissions allowed again for $1www.example.com Updates @@ -2093,9 +2168,6 @@ =1 {About 1 notification a day} other {About {NUM_NOTIFICATION} notifications a day}} - - All done for now - Don't allow @@ -2117,9 +2189,6 @@ More actions for $1website.com - - Undo - {NUM_SITES, plural, =1 {Review <b>1 site</b> that recently sent a lot of notifications} @@ -2133,6 +2202,12 @@ =1 {Notifications not allowed for 1 site} other {Notifications not allowed for {NUM_SITES} sites}} + + All done for now + + + Undo + Device software @@ -2309,6 +2384,11 @@ Determines how to connect to websites over a secure connection + + + Determines how to connect to websites over a secure connection. This uses a managed service provider at $1https://dns.example.net/dns-query{?dns} + + With your current service provider @@ -3811,6 +3891,9 @@ Encrypt synced data with your own <a href="$1" target="_blank"><a href="$1" target="_blank">sync passphrase</a></a>. This doesn't include payment methods and addresses from Google Pay. + + Encrypt synced data with your own <a href="$1" target="_blank"><a href="$1" target="_blank">sync passphrase</a></a>. Payment methods and addresses from Google Pay won’t be encrypted. Browsing history from Brave won’t sync. + Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Brave. If you forget your passphrase or want to change this setting, you'll need to <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a>. diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index f17902526d08..a0c064c889e1 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -119,6 +119,8 @@ + + diff --git a/app/supervised_user_error_page_strings.grdp b/app/supervised_user_error_page_strings.grdp index c5a2c50cf7e8..79d44401340d 100644 --- a/app/supervised_user_error_page_strings.grdp +++ b/app/supervised_user_error_page_strings.grdp @@ -5,9 +5,6 @@ Site blocked - - You need permission from $1John Doe to visit this site - Ask your parent @@ -23,9 +20,6 @@ A parent or guardian has to say that it's OK for you to visit this website - - Questions? Contact the profile who supervises your profile. - Go back @@ -44,12 +38,6 @@ Ask permission - - Your request to access this site has been sent to $1John Doe - - - Your request to access this site could not be sent to $1John Doe. Please try again. - You asked your parent if it's OK to visit this site diff --git a/app/supervised_user_error_page_strings_override.grdp b/app/supervised_user_error_page_strings_override.grdp index ef668480114b..af47cca74f5a 100644 --- a/app/supervised_user_error_page_strings_override.grdp +++ b/app/supervised_user_error_page_strings_override.grdp @@ -1,8 +1,5 @@ - - Questions? Contact the profile who supervises your profile. - Ask in profile diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index ffe406e7808d..56d5244ba44d 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -1348,7 +1348,7 @@ Private state tokens improve privacy on the web and can’t be used to find out - Vestibulum augue erat + Vestibulum augue Vestibulum augue erat @@ -2308,6 +2308,10 @@ Your Brave account may have other forms of browsing history like searches and ac Passphrase encryption doesn’t include payment methods and addresses from Google Pay. Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Brave. If you forget your passphrase or want to change this setting you'll need to reset sync. <learnmore>Learn more</learnmore> + + Payment methods and addresses from Google Pay won’t be encrypted. Browsing history from Brave won’t sync. +Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Brave. If you forget your passphrase or want to change this setting, you’ll need to reset sync. <learnmore>Learn more</learnmore> + Passphrase @@ -3381,12 +3385,6 @@ To change this setting, <resetlink>reset sync

Manage - - You're offline - - - Check your internet connection and try again - Nothing to show yet @@ -3522,7 +3520,7 @@ To change this setting, <resetlink>reset sync

%1$s5 tabs as a new background tab group. - Follow any sites you want + See sites you follow here @@ -5085,24 +5083,6 @@ To change this setting, <resetlink>reset sync

Helps you complete tasks, such as checkout, throughout the web - - Web Assistance - - - Get help with tasks on the web - - - To help you complete tasks, Brave will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant - - - Proactive Help - - - Assistant will appear when it detects that it can help you on supported websites - - - To use this setting <link>Make searches and browsing better</link> must be turned on - Show your Brave activity in Digital Wellbeing? diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp index e2fbc6a91a77..2b7af875d148 100644 --- a/components/autofill_strings.grdp +++ b/components/autofill_strings.grdp @@ -93,6 +93,14 @@ , ''' + + The form was filled in + + + + The autofilled info was cleared from the form + + Hide suggestions diff --git a/components/components_brave_strings.grd b/components/components_brave_strings.grd index 14d48706f480..ec872efe907a 100644 --- a/components/components_brave_strings.grd +++ b/components/components_brave_strings.grd @@ -211,9 +211,6 @@ This page has been blocked by Brave - - ChromeOS hasn’t completed its initial setup. - Go to diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp index 8dbc166f50c2..15a51f940f81 100644 --- a/components/error_page_strings.grdp +++ b/components/error_page_strings.grdp @@ -89,6 +89,9 @@ $1Goto the wrench menu and choose Fix It. + + <a href="#buttons" onclick="javascript:portalSignin()">Signing in</a> to the network. + You can disable any proxies configured for a connection from the settings page. @@ -329,12 +332,6 @@ Reconnecting to Wi-Fi - - Fix your connection using the <a href="#buttons" onclick="javascript:diagnoseErrors()">diagnostics app</a></a> - - - Sign out and complete setup - Try disabling your extensions. diff --git a/components/fullscreen_control_strings.grdp b/components/fullscreen_control_strings.grdp index 927f46a80181..ba1960344280 100644 --- a/components/fullscreen_control_strings.grdp +++ b/components/fullscreen_control_strings.grdp @@ -25,4 +25,7 @@ Press |$1Esc| to exit full screen and see download. + + Press and hold |$1Esc| to exit full screen and see download. + diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index 34e815e5d08c..8b55d49b818d 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -65,29 +65,6 @@ Attackers sometimes mimic sites by making hard-to-see changes to the web address. - - - Take a moment to consider accuracy - - - Learn more - - - Ignore - - - Don't show again - - - Who’s behind this information? - - - What evidence supports it? - - - What do other sources say? - - You're viewing a local or shared file diff --git a/components/password_manager_strings.grdp b/components/password_manager_strings.grdp index a1a778c6bddc..9b8c92494d3f 100644 --- a/components/password_manager_strings.grdp +++ b/components/password_manager_strings.grdp @@ -11,15 +11,9 @@ Check passwords - - Change automatically - Change your password - - Change your password now - Check your passwords @@ -32,15 +26,9 @@ Brave found the password you just used in a data breach. We recommend changing this password now. - - Brave found the password you just used in a data breach. Your Brave Assistant can change your password automatically. - Brave found the password you just used in a data breach. To secure your accounts, we recommend changing it now and then checking your saved passwords. - - The password you just used was found in a data breach. Your Brave Assistant can change your password automatically. - The password you just used was found in a data breach. To secure your accounts, Brave Password Manager recommends checking your saved passwords. diff --git a/components/pdf_strings.grdp b/components/pdf_strings.grdp index 17e2845daf50..4e7ab838de4c 100644 --- a/components/pdf_strings.grdp +++ b/components/pdf_strings.grdp @@ -117,6 +117,18 @@ Rotate counterclockwise + + 0 degrees + + + 90 degrees + + + 180 degrees + + + 270 degrees + Download From 716f70d3c2c5ed7998f968495ac72bd112a2600b Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 09:40:36 +0000 Subject: [PATCH 033/146] WebUiListenerMixin's renaming addWebUIListener to addWebUiListener Chromium change: https://chromium.googlesource.com/chromium/src/+/5f821667eeec8eb847ed1290dff369324ce121e0 commit 5f821667eeec8eb847ed1290dff369324ce121e0 Author: dpapad Date: Thu Dec 1 01:05:07 2022 +0000 WebUI: Rename WebUiListenerMixin's addWebUIListener method. Renaming 'addWebUIListener' to 'addWebUiListener'. This is in preparation of enforcing stricter ESLint checks (strictCamelCase instead of camelCase) for method names. The stricter checks catch naming violations like 'addWebUIListenerMixin' which were previously missed, and are more accurately enforcing the Abbreviations section of the styleguide at [1]. "Treat abbreviations like acronyms in names as whole words, i.e. use loadHttpUrl, not loadHTTPURL ..." [1] https://google.github.io/styleguide/tsguide.html#identifiers Bug: 720034 --- .../brave_appearance_page/brave_theme.ts | 2 +- ...ave_clear_browsing_data_dialog_behavior.ts | 2 +- .../brave_default_extensions_page.ts | 7 ++-- .../brave_ipfs_page/brave_ipfs_page.ts | 2 +- .../brave_ipfs_page/ipfs_peers_subpage.ts | 5 ++- .../brave_ipfs_page/p2p_keys_subpage.ts | 39 ++++++++++--------- .../brave_new_tab_page/brave_new_tab_page.ts | 5 ++- .../brave_personalization_options.ts | 5 ++- .../brave_search_engines_page.ts | 3 +- .../brave_sync_page/brave_sync_configure.ts | 3 +- .../brave_sync_page/brave_sync_page.ts | 4 +- .../brave_tor_page/brave_tor_subpage.ts | 4 +- .../brave_adblock_subpage.ts | 4 +- .../pin_shortcut_page/pin_shortcut_page.ts | 3 +- 14 files changed, 49 insertions(+), 39 deletions(-) diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.ts b/browser/resources/settings/brave_appearance_page/brave_theme.ts index adadb81d602c..f182fe40a89b 100644 --- a/browser/resources/settings/brave_appearance_page/brave_theme.ts +++ b/browser/resources/settings/brave_appearance_page/brave_theme.ts @@ -53,7 +53,7 @@ export class SettingsBraveAppearanceThemeElement extends SettingsBraveAppearance override ready() { super.ready() - this.addWebUIListener('brave-theme-type-changed', (type: number) => { + this.addWebUiListener('brave-theme-type-changed', (type: number) => { this.braveThemeType_ = type; }) this.browserProxy_.getBraveThemeList().then((list) => { diff --git a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.ts b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.ts index 95a7f3295596..5ea41e6a5ea4 100644 --- a/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.ts +++ b/browser/resources/settings/brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.ts @@ -20,7 +20,7 @@ export class BraveSettingsClearBrowsingDataDialogElement extends BaseElement { // Append On exit tab to tab selector. this.tabsNames_.push(loadTimeData.getString('onExitPageTitle')); - this.addWebUIListener( + this.addWebUiListener( 'update-counter-text', this.updateOnExitCountersText.bind(this)); } diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.ts b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.ts index 1ca694ce3bff..a0833599d9f7 100644 --- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.ts +++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.ts @@ -58,8 +58,9 @@ export class SettingBraveDefaultExtensionsPageElement extends SettingBraveDefaul override ready() { super.ready() - this.addWebUIListener('brave-needs-restart-changed', (needsRestart: boolean) => { - this.showRestartToast_ = needsRestart + this.addWebUiListener( + 'brave-needs-restart-changed', (needsRestart: boolean) => { + this.showRestartToast_ = needsRestart }) this.browserProxy_.getRestartNeeded().then(show => { this.showRestartToast_ = show @@ -68,7 +69,7 @@ export class SettingBraveDefaultExtensionsPageElement extends SettingBraveDefaul // PrefControlMixin checks for a pref being valid, so have to fake it, // same as upstream. const setWidevineEnabledPref = (enabled: boolean) => this.setWidevineEnabledPref_(enabled) - this.addWebUIListener('widevine-enabled-changed', setWidevineEnabledPref) + this.addWebUiListener('widevine-enabled-changed', setWidevineEnabledPref) this.browserProxy_.isWidevineEnabled().then(setWidevineEnabledPref) } diff --git a/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.ts b/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.ts index b77775621756..7e35200b11b0 100644 --- a/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.ts +++ b/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.ts @@ -69,7 +69,7 @@ class SettingsBraveIpfsPageElement extends SettingBraveIpfsPageElementBase { this.ipfsEnabled_ = enabled }); - this.addWebUIListener('brave-ipfs-node-status-changed', (launched) => { + this.addWebUiListener('brave-ipfs-node-status-changed', (launched) => { this.isLocalNodeLaunched_ = launched }) this.browserProxy_.notifyIpfsNodeStatus(); diff --git a/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.ts b/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.ts index a0a8682e7e94..2a6113514b1d 100644 --- a/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.ts +++ b/browser/resources/settings/brave_ipfs_page/ipfs_peers_subpage.ts @@ -90,8 +90,9 @@ export class SettingsBraveIpfsPeersSubpageElement extends SettingsBraveIpfsPeers override ready() { super.ready() - this.addWebUIListener('brave-ipfs-node-status-changed', (launched: boolean) => { - this.onServiceLaunched(launched) + this.addWebUiListener( + 'brave-ipfs-node-status-changed', (launched: boolean) => { + this.onServiceLaunched(launched) }) this.onServiceLaunched(this.localNodeLaunched) this.updatePeers(); diff --git a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts index 95bb85aea208..4a6258304f09 100644 --- a/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts +++ b/browser/resources/settings/brave_ipfs_page/p2p_keys_subpage.ts @@ -106,28 +106,31 @@ export class SettingsBraveP2pKeysSubpageElement extends SettingsBraveP2pKeysSubp override ready() { super.ready() - this.addWebUIListener('brave-ipfs-node-status-changed', (launched: boolean) => { - this.onServiceLaunched(launched) + this.addWebUiListener( + 'brave-ipfs-node-status-changed', (launched: boolean) => { + this.onServiceLaunched(launched) }) - this.addWebUIListener('brave-ipfs-keys-loaded', () => { + this.addWebUiListener('brave-ipfs-keys-loaded', () => { this.updateKeys() }) - this.addWebUIListener('brave-ipfs-key-exported', (key: string, success: boolean) => { - this.actionKeysError_ = !success - if (this.actionKeysError_) { - const errorLabel = (this.$.keyError); - errorLabel.textContent = this.i18n('ipfsKeyExportError', key) - return; - } + this.addWebUiListener( + 'brave-ipfs-key-exported', (key: string, success: boolean) => { + this.actionKeysError_ = !success + if (this.actionKeysError_) { + const errorLabel = (this.$.keyError); + errorLabel.textContent = this.i18n('ipfsKeyExportError', key) + return; + } }) - this.addWebUIListener('brave-ipfs-key-imported', (key: string, success: boolean) => { - this.actionKeysError_ = !success - if (this.actionKeysError_ ) { - const errorLabel = (this.$.keyError); - errorLabel.textContent = this.i18n('ipfsImporKeysError', key) - return; - } - this.updateKeys(); + this.addWebUiListener( + 'brave-ipfs-key-imported', (key: string, success: boolean) => { + this.actionKeysError_ = !success + if (this.actionKeysError_ ) { + const errorLabel = (this.$.keyError); + errorLabel.textContent = this.i18n('ipfsImporKeysError', key) + return; + } + this.updateKeys(); }) window.addEventListener('load', this.onLoad_.bind(this)); if (document.readyState == 'complete') { diff --git a/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.ts b/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.ts index b7884cca0be6..0420ea017791 100644 --- a/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.ts +++ b/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.ts @@ -50,8 +50,9 @@ export class SettingsBraveNewTabPageElement extends SettingsBraveNewTabPageEleme this.browserProxy_.shouldShowNewTabDashboardSettings().then((show: boolean) => { this.showNewTabDashboardSettings_ = show }) - this.addWebUIListener('show-new-tab-dashboard-settings-changed', (show: boolean) => { - this.showNewTabDashboardSettings_ = show + this.addWebUiListener( + 'show-new-tab-dashboard-settings-changed', (show: boolean) => { + this.showNewTabDashboardSettings_ = show }) } diff --git a/browser/resources/settings/brave_privacy_page/brave_personalization_options.ts b/browser/resources/settings/brave_privacy_page/brave_personalization_options.ts index bddcc217f39b..408a9e9c2759 100644 --- a/browser/resources/settings/brave_privacy_page/brave_personalization_options.ts +++ b/browser/resources/settings/brave_privacy_page/brave_personalization_options.ts @@ -87,12 +87,13 @@ export class SettingsBravePersonalizationOptions extends SettingsBravePersonaliz // because p3a enabled is a local state setting, but PrefControlMixin // checks for a pref being valid, so have to fake it, same as upstream. const setP3AEnabledPref = (enabled: boolean) => this.setP3AEnabledPref_(enabled); - this.addWebUIListener('p3a-enabled-changed', setP3AEnabledPref); + this.addWebUiListener('p3a-enabled-changed', setP3AEnabledPref); this.browserProxy_.getP3AEnabled().then( (enabled: boolean) => setP3AEnabledPref(enabled)); const setStatsUsagePingEnabledPref = (enabled: boolean) => this.setStatsUsagePingEnabledPref_(enabled); - this.addWebUIListener('stats-usage-ping-enabled-changed', setStatsUsagePingEnabledPref); + this.addWebUiListener( + 'stats-usage-ping-enabled-changed', setStatsUsagePingEnabledPref); this.browserProxy_.getStatsUsagePingEnabled().then( (enabled: boolean) => setStatsUsagePingEnabledPref(enabled)); } diff --git a/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.ts b/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.ts index bd0d474d62b2..07f3db9a5ff3 100644 --- a/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.ts +++ b/browser/resources/settings/brave_search_engines_page/brave_search_engines_page.ts @@ -44,7 +44,8 @@ class BraveSearchEnginesPage extends BraveSearchEnginesPageBase { } this.browserProxy_.getPrivateSearchEnginesList().then(updatePrivateSearchEngines) - this.addWebUIListener('private-search-engines-changed', updatePrivateSearchEngines) + this.addWebUiListener( + 'private-search-engines-changed', updatePrivateSearchEngines) } shouldShowPrivateSearchProvider_(prefs) { diff --git a/browser/resources/settings/brave_sync_page/brave_sync_configure.ts b/browser/resources/settings/brave_sync_page/brave_sync_configure.ts index 1c03210206a9..4d0ae0907b47 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_configure.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_configure.ts @@ -81,7 +81,8 @@ export class SettingsBraveSyncConfigureElement extends SettingsBraveSyncConfigur override async connectedCallback() { super.connectedCallback() const deviceList = await this.browserProxy_.getDeviceList() - this.addWebUIListener('device-info-changed', this.handleDeviceInfo_.bind(this)) + this.addWebUiListener( + 'device-info-changed', this.handleDeviceInfo_.bind(this)) this.handleDeviceInfo_(deviceList) } diff --git a/browser/resources/settings/brave_sync_page/brave_sync_page.ts b/browser/resources/settings/brave_sync_page/brave_sync_page.ts index a8e260feef9f..979bb8418a28 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_page.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_page.ts @@ -81,9 +81,9 @@ export class SettingsBraveSyncPageElement extends SettingsBraveSyncPageElementBa const onSyncStatus = this.handleSyncStatus_.bind(this) this.braveBrowserProxy_.getSyncStatus().then( (status: BraveSyncStatus) => onSyncStatus(status)); - this.addWebUIListener( + this.addWebUiListener( 'sync-prefs-changed', this.handleSyncPrefsChanged_.bind(this)); - this.addWebUIListener('sync-status-changed', onSyncStatus); + this.addWebUiListener('sync-status-changed', onSyncStatus); } onSyncTap_() { diff --git a/browser/resources/settings/brave_tor_page/brave_tor_subpage.ts b/browser/resources/settings/brave_tor_page/brave_tor_subpage.ts index 6cdeb9457b6b..093829b0f94c 100644 --- a/browser/resources/settings/brave_tor_page/brave_tor_subpage.ts +++ b/browser/resources/settings/brave_tor_page/brave_tor_subpage.ts @@ -178,7 +178,7 @@ class SettingsBraveTorPageElement extends SettingBraveTorPageElementBase { // PrefControlMixin checks for a pref being valid, so have to fake it, // same as upstream. - this.addWebUIListener('tor-enabled-changed', enabled => { + this.addWebUiListener('tor-enabled-changed', enabled => { this.setTorEnabledPref_(enabled) }) this.browserProxy_.isTorEnabled().then(enabled => { @@ -192,7 +192,7 @@ class SettingsBraveTorPageElement extends SettingBraveTorPageElementBase { this.browserProxy_.isSnowflakeExtensionAllowed().then(allowed => { this.torSnowflakeExtensionAllowed_ = allowed }) - this.addWebUIListener('tor-snowflake-extension-enabled', enabled => { + this.addWebUiListener('tor-snowflake-extension-enabled', enabled => { this.setTorSnowflakeExtensionEnabledPref_(enabled) }) this.browserProxy_.isSnowflakeExtensionEnabled().then(enabled => { diff --git a/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.ts b/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.ts index 99fea5390d5b..9b4248b1a14f 100644 --- a/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.ts +++ b/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.ts @@ -1,4 +1,4 @@ -/* Copyright 2022 The Brave Authors. All rights reserved. +/* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ @@ -57,7 +57,7 @@ class AdBlockSubpage extends AdBlockSubpageBase { this.customFilters_ = value }) - this.browserProxy_.addWebUIListener( + this.browserProxy_.addWebUiListener( 'brave_adblock.onGetListSubscriptions', (value) => { this.subscriptionList_ = value }) diff --git a/browser/resources/settings/pin_shortcut_page/pin_shortcut_page.ts b/browser/resources/settings/pin_shortcut_page/pin_shortcut_page.ts index 6a558ed1e203..ae2cb1d9a6b5 100644 --- a/browser/resources/settings/pin_shortcut_page/pin_shortcut_page.ts +++ b/browser/resources/settings/pin_shortcut_page/pin_shortcut_page.ts @@ -40,7 +40,8 @@ class SettingsPinShortcutPage extends SettingsPinShortcutPageBase { this.pinned_ = false this.browserProxy_.checkShortcutPinState() - this.addWebUIListener('shortcut-pin-state-changed', pinned => this.set('pinned_', pinned)) + this.addWebUiListener( + 'shortcut-pin-state-changed', pinned => this.set('pinned_', pinned)) } onPinShortcutTap_() { From 627a58a2f2220a2b45d12f8c9c3fc45aa2c72e39 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 09:43:12 +0000 Subject: [PATCH 034/146] ExtensionPrefs's GetInstallTime renamed to GetLastUpdateTime Chromium change: https://chromium.googlesource.com/chromium/src/+/b88b4bbaf41a8917167823a1642f44846b9fe16d commit b88b4bbaf41a8917167823a1642f44846b9fe16d Author: Anunoy Ghosh Date: Mon Dec 5 17:59:39 2022 +0000 Rename ExtensionPrefs method GetInstallTime to GetLastUpdateTime. The ExtensionPrefs::GetInstallTime retrieved the last_update_time pref which records the last time an extension was updated. This CL renames the method to GetLastUpdateTime to better match the pref retrieved. All call sites are updated to use the renamed method as well. This CL does not modify existing functionality. Bug: 1381132 --- .../private_window_search_engine_provider_service_base.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/search_engines/private_window_search_engine_provider_service_base.cc b/browser/search_engines/private_window_search_engine_provider_service_base.cc index f76f5d6bdf0c..2c8ae4dea95d 100644 --- a/browser/search_engines/private_window_search_engine_provider_service_base.cc +++ b/browser/search_engines/private_window_search_engine_provider_service_base.cc @@ -50,7 +50,7 @@ void PrivateWindowSearchEngineProviderServiceBase:: auto extension_id = extension_provider_url->GetExtensionId(); extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(otr_profile_->GetOriginalProfile()); - auto time = prefs->GetInstallTime(extension_id); + auto time = prefs->GetLastUpdateTime(extension_id); auto turl = std::make_unique(data, type, extension_id, time, true); From 267839b7b520c0b5f39f63d5a70aeefe69b3b26b Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:01:10 +0000 Subject: [PATCH 035/146] Desktop sharing validating tab URL Chromium change: https://chromium.googlesource.com/chromium/src/+/47bc054b9bb3ac4839ed0e4cd9ac774e889b47ec commit 47bc054b9bb3ac4839ed0e4cd9ac774e889b47ec Author: Elly Fong-Jones Date: Thu Dec 1 17:12:53 2022 +0000 desktop-sharing-hub: don't offer 3P actions for non-web URLs These are generally not usefully share-able, and trying to do so usually yields an error page on the receiving service - see the linked bug for details. To achieve that, this change: 1. Makes SharingHubModel::GetThirdPartyActionList() take the WebContents being shared, like GetFirstPartyActionList() does 2. Makes SharingHubModel::GetThirdPartyActionList() return an empty list of actions if the currently loaded URL's scheme is not HTTP or HTTPS 3. Adds unit tests to cover this new behavior Fixed: 1250670 --- browser/sharing_hub/brave_sharing_hub_browsertest.cc | 3 ++- browser/sharing_hub/brave_sharing_hub_model.cc | 1 + browser/sharing_hub/brave_sharing_hub_model.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/sharing_hub/brave_sharing_hub_browsertest.cc b/browser/sharing_hub/brave_sharing_hub_browsertest.cc index 6d8282db6d12..b93c8e69adda 100644 --- a/browser/sharing_hub/brave_sharing_hub_browsertest.cc +++ b/browser/sharing_hub/brave_sharing_hub_browsertest.cc @@ -27,7 +27,8 @@ IN_PROC_BROWSER_TEST_F(BraveSharingHubTest, auto* sharing_hub_service = SharingHubServiceFactory::GetForProfile(profile); auto* model = sharing_hub_service->GetSharingHubModel(); std::vector list; - model->GetThirdPartyActionList(&list); + model->GetThirdPartyActionList( + browser()->tab_strip_model()->GetActiveWebContents(), &list); EXPECT_TRUE(list.empty()); } diff --git a/browser/sharing_hub/brave_sharing_hub_model.cc b/browser/sharing_hub/brave_sharing_hub_model.cc index 7cc46a03e17a..94996094c058 100644 --- a/browser/sharing_hub/brave_sharing_hub_model.cc +++ b/browser/sharing_hub/brave_sharing_hub_model.cc @@ -10,6 +10,7 @@ namespace sharing_hub { BraveSharingHubModel::~BraveSharingHubModel() = default; void BraveSharingHubModel::GetThirdPartyActionList( + content::WebContents* web_contents, std::vector* list) { // We don't use any third party actions now. } diff --git a/browser/sharing_hub/brave_sharing_hub_model.h b/browser/sharing_hub/brave_sharing_hub_model.h index 4fd5740b8158..bcc447ed9833 100644 --- a/browser/sharing_hub/brave_sharing_hub_model.h +++ b/browser/sharing_hub/brave_sharing_hub_model.h @@ -20,7 +20,8 @@ class BraveSharingHubModel : public sharing_hub::SharingHubModel { ~BraveSharingHubModel() override; // SharingHubModel overrides: - void GetThirdPartyActionList(std::vector* list) override; + void GetThirdPartyActionList(content::WebContents* web_contents, + std::vector* list) override; }; } // namespace sharing_hub From baf7ccae03dd16b446b314b79c174fb66dc66a91 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:03:36 +0000 Subject: [PATCH 036/146] GetModelIndexOf returning optional Chromium change: https://chromium.googlesource.com/chromium/src/+/b9d161a0e7f80243e7ef6ab0195e4e3a707ae939 commit b9d161a0e7f80243e7ef6ab0195e4e3a707ae939 Author: Taylor Bergquist Date: Thu Dec 1 01:50:34 2022 +0000 Replace kNoTab with absl::optional throughout TabStrip view-side classes. I did not change TabStripModel nor TabStripController, which still speak kNoTab themselves. TabStrip still has to deal with kNoTab when it talks to its TabStripController. Several other changes came along with this, e.g. some fixes to discovered bugs: - TabStrip::GetModelIndexOf now returns nullopt if the tab is in the TabStrip's viewmodel, but at an index that's not in the model. This happens transiently during tab removal, especially when removing multiple tabs at once, e.g. when closing a tab group. - Fixed a bug where CompoundTabContainer::GetModelIndexOf didn't check for kNoTab when looking in the unpinned container. It now correctly returns nullopt when the slot_view can't be found in either container. Previously it would do math is if the unpinned container's index was valid, even if it was kNoTab i.e. -1. This was the original bug that prompted this CL! - Fixed a bug with consecutiveness detection during initialization of header drags, where tab group headers, with an index of -1, were only consecutive if the actual tabs were at index 0. - Changed hover card interactive ui tests, which were impacted by the change to TabStrip::GetModelIndexOf because they were adding tabs directly to the TabStrip view that weren't present in the model. --- .../views/tabs/brave_browser_tab_strip_controller.cc | 10 ++++++---- .../tabs/tab_hover_card_bubble_view_browsertest.cc | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc b/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc index 48f3d8ee3884..074b54d9be9c 100644 --- a/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc +++ b/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc @@ -30,9 +30,11 @@ void BraveBrowserTabStripController::ShowContextMenuForTab( ui::MenuSourceType source_type) { BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); - context_menu_contents_ = std::make_unique( - tab, - this, - browser_view->tabstrip()->GetModelIndexOf(tab)); + const auto tab_index = browser_view->tabstrip()->GetModelIndexOf(tab); + if (!tab_index) { + return; + } + context_menu_contents_ = + std::make_unique(tab, this, *tab_index); context_menu_contents_->RunMenuAt(p, source_type); } diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc index ad4c6573cf71..2d8ce1858d02 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc @@ -44,9 +44,9 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest, TabRendererData new_tab_data = TabRendererData(); new_tab_data.title = kTabTitle; new_tab_data.last_committed_url = GURL(kTabUrl); - GetTabStrip(browser())->AddTabAt(1, new_tab_data); + GetTabStrip(browser())->AddTabAt(0, new_tab_data); - SimulateHoverTab(browser(), 1); + SimulateHoverTab(browser(), 0); } bool VerifyUi() override { From 6bd8388dfda7d36a91bc7aae431f2c54c4b33bdf Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:05:20 +0000 Subject: [PATCH 037/146] TabContainerImpl's StartBasicAnimation removed Chromium change: https://chromium.googlesource.com/chromium/src/+/1c63c8665895f8f9373c525877846c5ba44d63b1 commit 1c63c8665895f8f9373c525877846c5ba44d63b1 Author: Taylor Bergquist Date: Wed Nov 30 01:35:40 2022 +0000 Animate pinning or unpinning with CompoundTabContainer enabled. CompoundTabContainer::TransferTabBetweenContainers now animates the transfer. As part of that process, it takes ownership of the Tab view during that animation, animating its bounds with its own BoundsAnimator, then handing it off to the target TabContainer when the animation completes. The whole process is closely analogous to how TabDragContext handles its drag end animation. The TabContainer interface was changed to support this: - AddTabToViewModel is now public. It informs the TabContainer that it's getting a new tab, without giving ownership of the Tab view itself. - StoppedDraggingView was renamed to ReturnTabSlotView and generalized slightly to handle the pinning case as well. It gives View ownership of a Tab to a TabContainer that knows about the tab but doesn't own the view in the view hierarchy. - StartBasicAnimation was re-exposed in TabContainer to allow CompoundTabContainer to trigger a coordinated animation between all three containers. Misc cleanups: - Some methods (UpdateIdealBounds, AnimateToIdealBounds, GetVisibleContentRect, AnimateScrollToXCoordinate, AnimateTabSlotViewTo) were in different order in the header vs the cc file, fixed that. - AnimateTabSlotViewTo and UpdateIdealBounds were changed slightly too, the others are just straight moved. - Added an OnTabRemoved helper - we really wouldn't want those call sites to drift apart, that could cause subtle bugs with security implications. - ReturnTabSlotView (nee StoppedDraggingView) was refactored to better isolate and document the exceptional code path where this method is called during the tab's destructor (!!!). Bug: 1346023 --- browser/ui/views/tabs/brave_tab_container.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc index ce680ce31078..02472bcaa236 100644 --- a/browser/ui/views/tabs/brave_tab_container.cc +++ b/browser/ui/views/tabs/brave_tab_container.cc @@ -226,7 +226,7 @@ void BraveTabContainer::StartInsertTabAnimation(int model_index) { GetTabAtModelIndex(model_index)->SetBoundsRect(bounds); // Animate in to the full width. - StartBasicAnimation(); + AnimateToIdealBounds(); } void BraveTabContainer::RemoveTab(int index, bool was_active) { From ea62f03f18923b93796eab3761b1af656d2c0745 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:09:44 +0000 Subject: [PATCH 038/146] Incognito data removed from PrivacySandboxSettings Chromium change: https://chromium.googlesource.com/chromium/src/+/eb304675fb1fa4e00862d7873413e2b4a96d53a7 commit eb304675fb1fa4e00862d7873413e2b4a96d53a7 Author: Rohit Agarwal Date: Thu Dec 1 08:22:44 2022 +0000 Privacy Sandbox Settings: Move incognito logic to delegate This CL moves the incognito check from PrivacySandboxSettings to PrivacySandboxSettingsDelegate instead which is more appropriate place to hold that information. Bug: 1378703 --- .../privacy_sandbox/privacy_sandbox_settings_factory.cc | 3 +-- .../privacy_sandbox/privacy_sandbox_settings_unittest.cc | 6 +++--- .../privacy_sandbox/brave_privacy_sandbox_settings.cc | 6 ++---- components/privacy_sandbox/brave_privacy_sandbox_settings.h | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc index f3d5ee017506..2829c8b1f587 100644 --- a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc +++ b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.cc @@ -18,6 +18,5 @@ KeyedService* PrivacySandboxSettingsFactory::BuildServiceInstanceFor( return new BravePrivacySandboxSettings( std::make_unique(profile), HostContentSettingsMapFactory::GetForProfile(profile), - CookieSettingsFactory::GetForProfile(profile).get(), profile->GetPrefs(), - profile->IsIncognitoProfile()); + CookieSettingsFactory::GetForProfile(profile).get(), profile->GetPrefs()); } diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc index bdb9769d99cc..f16aa13b9977 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc @@ -30,7 +30,8 @@ class MockPrivacySandboxDelegate : public PrivacySandboxSettings::Delegate { return false; }); } - MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (override)); + MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (const, override)); + MOCK_METHOD(bool, IsIncognitoProfile, (), (const, override)); }; class PrivacySandboxSettingsTest : public testing::Test { @@ -60,8 +61,7 @@ class PrivacySandboxSettingsTest : public testing::Test { privacy_sandbox_settings_ = std::make_unique( std::move(mock_delegate), host_content_settings_map(), - cookie_settings(), prefs(), - /*incognito_profile=*/false); + cookie_settings(), prefs()); } virtual void InitializePrefsBeforeStart() {} diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc index 3f5924ed22be..da13bd1a83ba 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.cc +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.cc @@ -17,13 +17,11 @@ BravePrivacySandboxSettings::BravePrivacySandboxSettings( std::unique_ptr delegate, HostContentSettingsMap* host_content_settings_map, content_settings::CookieSettings* cookie_settings, - PrefService* pref_service, - bool incognito_profile) + PrefService* pref_service) : privacy_sandbox::PrivacySandboxSettings(std::move(delegate), host_content_settings_map, cookie_settings, - pref_service, - incognito_profile), + pref_service), pref_service_(pref_service) { // Register observers for the Privacy Sandbox. user_prefs_registrar_.Init(pref_service_); diff --git a/components/privacy_sandbox/brave_privacy_sandbox_settings.h b/components/privacy_sandbox/brave_privacy_sandbox_settings.h index 86db6fbd2565..8dfab9f1e57f 100644 --- a/components/privacy_sandbox/brave_privacy_sandbox_settings.h +++ b/components/privacy_sandbox/brave_privacy_sandbox_settings.h @@ -25,8 +25,7 @@ class BravePrivacySandboxSettings BravePrivacySandboxSettings(std::unique_ptr delegate, HostContentSettingsMap* host_content_settings_map, content_settings::CookieSettings* cookie_settings, - PrefService* pref_service, - bool incognito_profile); + PrefService* pref_service); ~BravePrivacySandboxSettings() override; private: From 3baebce220c8b397c2a0a4ee135a76c23c0c4c55 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:11:16 +0000 Subject: [PATCH 039/146] Re-anchoring ChooserBubbleUiViewDelegate overrides --- .../chrome/browser/ui/views/permissions/chooser_bubble_ui.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc b/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc index ab7b1a9a0e9a..80e1e61a7436 100644 --- a/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc +++ b/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc @@ -5,10 +5,13 @@ #include "brave/browser/brave_wallet/brave_wallet_tab_helper.h" #include "brave/components/constants/webui_url_constants.h" +#include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "content/public/browser/web_contents.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h" #include "ui/views/focus/focus_manager.h" From 0e558fbbf8a0833c861e1f3bfecd73bb7d7e956e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:12:05 +0000 Subject: [PATCH 040/146] kPaymentMethodsLearnMoreURL url constant removed Chromium change: https://chromium.googlesource.com/chromium/src/+/11112f11eca140844107c28e558b7e3430162b98 commit 11112f11eca140844107c28e558b7e3430162b98 Author: Elizabeth Popova Date: Thu Dec 1 10:50:42 2022 +0000 [Autofill] Add learn more icon to chrome://settings/addresses It will make "Addresses and more" page consistent with other autofill pages (e.g. "Payment methods") and with implementations on other platforms (e.g. Android). Bug: 1313427 --- chromium_src/chrome/common/url_constants.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index 4875ca6003ef..7bef4448b279 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -163,9 +163,6 @@ const char kPasswordManagerLearnMoreURL[] = const char kPaymentMethodsURL[] = "https://support.brave.com"; -const char kPaymentMethodsLearnMoreURL[] = - "https://support.brave.com"; - const char kPrivacyLearnMoreURL[] = "https://support.brave.com/hc/en-us/articles/" "360017989132-How-do-I-change-my-Privacy-Settings-"; From 399fd42c2413e2b2d4b57cc54bbed9e547524dac Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:13:18 +0000 Subject: [PATCH 041/146] GetFrameTree-like functions returning a reference Chromium change: https://chromium.googlesource.com/chromium/src/+/15caeeb12d9f10196fb4567bb2c5ad808f73b108 commit 15caeeb12d9f10196fb4567bb2c5ad808f73b108 Author: Carlos Caballero Date: Wed Oct 27 09:57:55 2021 +0000 Rename WebContentsImpl::GetFrameTree to GetPrimaryFrameTree Note that the old method is already returning the PrimaryFrameTree so this patch is just about making that explicit. Trivial change that renames all test files leaving the production code for a later patch. That code will need a closer look to make sure that call sites are really expecting the primary frame tree (note they are already getting the primary frame tree, so this is just an extra check for peace of mind). Keeping the old method around for a while will also prevent this massive patch from being reverted if an optional try-bot later fails. Bug: 1251094 --- .../content/browser/renderer_host/navigation_request.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/content/browser/renderer_host/navigation_request.cc b/chromium_src/content/browser/renderer_host/navigation_request.cc index 565b3a5ff7d2..b1285d04369e 100644 --- a/chromium_src/content/browser/renderer_host/navigation_request.cc +++ b/chromium_src/content/browser/renderer_host/navigation_request.cc @@ -27,7 +27,7 @@ GURL GetTopDocumentGURL(content::FrameTreeNode* frame_tree_node) { gurl = last_committed_entry->GetBaseURLForDataURL(); #endif if (gurl.is_empty()) - gurl = frame_tree_node->frame_tree()->root()->current_url(); + gurl = frame_tree_node->frame_tree().root()->current_url(); return gurl; } From 9c89a5a856a0549f62104c07edfe0173487e2b19 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:16:08 +0000 Subject: [PATCH 042/146] Adjusting blink's MediaDevices override Chromium change: https://chromium.googlesource.com/chromium/src/+/a09037084874803a73b343997077da0e42473195 commit a09037084874803a73b343997077da0e42473195 Author: Tony Herre Date: Mon Dec 5 14:22:47 2022 +0000 Add histogram tracking enumerateDevices success/error rates and latency Use a ScriptPromiseResolverWithTracker to report histograms for enumerateDevices() results, now that it can return errors. Bug: 1373398, 1313822 --- .../blink/renderer/modules/mediastream/media_devices.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chromium_src/third_party/blink/renderer/modules/mediastream/media_devices.cc b/chromium_src/third_party/blink/renderer/modules/mediastream/media_devices.cc index 910c5f812728..c0f8080d4793 100644 --- a/chromium_src/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/chromium_src/third_party/blink/renderer/modules/mediastream/media_devices.cc @@ -30,9 +30,10 @@ void FarbleMediaDevices(ExecutionContext* context, } // namespace brave -#define BRAVE_MEDIA_DEVICES_DEVICES_ENUMERATED \ - if (ExecutionContext* context = resolver->GetExecutionContext()) { \ - brave::FarbleMediaDevices(context, &media_devices); \ +#define BRAVE_MEDIA_DEVICES_DEVICES_ENUMERATED \ + if (ExecutionContext* context = \ + ExecutionContext::From(result_tracker->GetScriptState())) { \ + brave::FarbleMediaDevices(context, &media_devices); \ } #include "src/third_party/blink/renderer/modules/mediastream/media_devices.cc" From 34949e70fac5f0c4edc328ac6b9ded6456843d0b Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 10:21:47 +0000 Subject: [PATCH 043/146] Removing deprecated uses This stdlib header was being used for utf16 to utf8 conversions which should be done using chromium's utf conversion functions. --- components/brave_today/browser/direct_feed_controller.cc | 5 ++--- components/brave_today/browser/feed_parsing.cc | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/brave_today/browser/direct_feed_controller.cc b/components/brave_today/browser/direct_feed_controller.cc index 831664a307fb..eda396b5c417 100644 --- a/components/brave_today/browser/direct_feed_controller.cc +++ b/components/brave_today/browser/direct_feed_controller.cc @@ -6,7 +6,6 @@ #include "brave/components/brave_today/browser/direct_feed_controller.h" #include -#include #include #include #include @@ -21,6 +20,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "brave/components/brave_private_cdn/headers.h" @@ -72,9 +72,8 @@ mojom::ArticlePtr RustFeedItemToArticle(const FeedItem& rust_feed_item, // Get language-specific relative time base::TimeDelta relative_time_delta = base::Time::Now() - metadata->publish_time; - std::wstring_convert, char16_t> converter; metadata->relative_time_description = - converter.to_bytes(ui::TimeFormat::Simple( + base::UTF16ToUTF8(ui::TimeFormat::Simple( ui::TimeFormat::Format::FORMAT_ELAPSED, ui::TimeFormat::Length::LENGTH_LONG, relative_time_delta)); auto article = mojom::Article::New(); diff --git a/components/brave_today/browser/feed_parsing.cc b/components/brave_today/browser/feed_parsing.cc index f6b40f745d24..216640155003 100644 --- a/components/brave_today/browser/feed_parsing.cc +++ b/components/brave_today/browser/feed_parsing.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_today/browser/feed_parsing.h" -#include #include #include #include #include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "brave/components/brave_today/common/brave_news.mojom-forward.h" #include "brave/components/brave_today/common/brave_news.mojom-shared.h" @@ -83,9 +83,8 @@ bool ParseFeedItem(const base::Value& feed_item_raw, // Successful, get language-specific relative time base::TimeDelta relative_time_delta = base::Time::Now() - metadata->publish_time; - std::wstring_convert, char16_t> converter; metadata->relative_time_description = - converter.to_bytes(ui::TimeFormat::Simple( + base::UTF16ToUTF8(ui::TimeFormat::Simple( ui::TimeFormat::Format::FORMAT_ELAPSED, ui::TimeFormat::Length::LENGTH_LONG, relative_time_delta)); } From a93db19367f3130073d5bdfb538a5740154a8212 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 11:25:38 +0000 Subject: [PATCH 044/146] Fixing base::Unretained static checks against void Chromium change: https://chromium.googlesource.com/chromium/src/+/b83b97d8c6e3b9344db91ad818658203d0b4ea2e commit b83b97d8c6e3b9344db91ad818658203d0b4ea2e Author: Daniel Cheng Date: Wed Nov 23 22:28:04 2022 +0000 Ban GarbageCollected from being Unretained in Chrome callbacks. This is not a perfect solution: - The trait implementation does not force T to be fully-defined. A forward-declared type can always be used as Unretained(). This is tracked as https://crbug.com/1392872. - The Blink traits themselves are reliant on the marker types in v8 always evaluating to void if present. Attempting to use std::void_t<> as part of the specialization causes the compiler complain that the template specialization is redefined. Bug: 1386249 --- chromium_src/third_party/blink/public/web/web_document.h | 2 +- .../third_party/blink/renderer/core/exported/web_document.cc | 2 ++ .../brave_wallet/brave_wallet_render_frame_observer_p3a_util.cc | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chromium_src/third_party/blink/public/web/web_document.h b/chromium_src/third_party/blink/public/web/web_document.h index d63eff846b6c..60efe390df57 100644 --- a/chromium_src/third_party/blink/public/web/web_document.h +++ b/chromium_src/third_party/blink/public/web/web_document.h @@ -6,7 +6,7 @@ #ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DOCUMENT_H_ #define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DOCUMENT_H_ -#include "third_party/blink/renderer/core/permissions_policy/dom_feature_policy.h" +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #define IsPluginDocument \ IsDOMFeaturePolicyEnabled(v8::Local context, \ diff --git a/chromium_src/third_party/blink/renderer/core/exported/web_document.cc b/chromium_src/third_party/blink/renderer/core/exported/web_document.cc index ff679d9383d5..60c545cc73f4 100644 --- a/chromium_src/third_party/blink/renderer/core/exported/web_document.cc +++ b/chromium_src/third_party/blink/renderer/core/exported/web_document.cc @@ -5,6 +5,8 @@ #include "src/third_party/blink/renderer/core/exported/web_document.cc" +#include "third_party/blink/renderer/core/permissions_policy/dom_feature_policy.h" + namespace blink { bool WebDocument::IsDOMFeaturePolicyEnabled(v8::Local context, diff --git a/renderer/brave_wallet/brave_wallet_render_frame_observer_p3a_util.cc b/renderer/brave_wallet/brave_wallet_render_frame_observer_p3a_util.cc index 84489e15ea51..f4eb4132cb4d 100644 --- a/renderer/brave_wallet/brave_wallet_render_frame_observer_p3a_util.cc +++ b/renderer/brave_wallet/brave_wallet_render_frame_observer_p3a_util.cc @@ -7,8 +7,10 @@ #include "brave/components/brave_wallet/renderer/v8_helper.h" #include "gin/converter.h" +#include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_local_frame.h" +#include "v8/include/v8.h" namespace brave_wallet { From c7474f55c92672c84e68d6454e06b794cf0a3f3b Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 14:10:18 +0000 Subject: [PATCH 045/146] Adding definition for kAddressesAndPaymentMethodsLearnMoreURL Chromium change: https://chromium.googlesource.com/chromium/src/+/11112f11eca140844107c28e558b7e3430162b98 commit 11112f11eca140844107c28e558b7e3430162b98 Author: Elizabeth Popova Date: Thu Dec 1 10:50:42 2022 +0000 [Autofill] Add learn more icon to chrome://settings/addresses It will make "Addresses and more" page consistent with other autofill pages (e.g. "Payment methods") and with implementations on other platforms (e.g. Android). Bug: 1313427 --- chromium_src/chrome/common/url_constants.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index 7bef4448b279..e733847067f0 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -271,4 +271,7 @@ const char kChromeRootStoreSettingsHelpCenterURL[] = "chrome_root_store/root_store.md"; #endif +const char kAddressesAndPaymentMethodsLearnMoreURL[] = + "https://support.brave.com"; + } // namespace chrome From a1ef31f15a02e9a2fe74e505098f81c153f4ba95 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 14:12:03 +0000 Subject: [PATCH 046/146] Host hash keys using uint8_t arrays Chromium change: https://chromium.googlesource.com/chromium/src/+/0eeeef18a45c127c54ef1f216e9c0fa89603b5c7 commit 0eeeef18a45c127c54ef1f216e9c0fa89603b5c7 Author: Eric Orth Date: Thu Dec 1 23:49:57 2022 +0000 Convert wire-format DNS names to uint8_t vectors Change the output of the conversion functions in dns_util.h and also modernize them to put the output in the return using an optional. Convert the stuff normally taking wire-format DNS names (mostly DnsQuery and DnsResponse) to take the vectors or spans. A noteworthy change is in TransportSecurityState, which takes domain names, converts to wire format, and then SHA-2 hashes them. The SHA-2 hash code being used does support hashing binary data, but it then returns the hash as a std::array instead of as a string. So I made the changes to keep treating the hashes as std::arrays instead of adding extra code to convert them to/from strings. No expected behavior changes. --- .../net/http/transport_security_state.cc | 24 +++++----- net/http/partitioned_host_state_map.cc | 48 ++++++++++++------- net/http/partitioned_host_state_map.h | 32 ++++++++----- .../partitioned_host_state_map_unittest.cc | 19 ++++---- 4 files changed, 75 insertions(+), 48 deletions(-) diff --git a/chromium_src/net/http/transport_security_state.cc b/chromium_src/net/http/transport_security_state.cc index 7c312e398d51..c8e7dd9fef24 100644 --- a/chromium_src/net/http/transport_security_state.cc +++ b/chromium_src/net/http/transport_security_state.cc @@ -67,26 +67,26 @@ bool IsTopFrameOriginCryptographic(const IsolationInfo& isolation_info) { isolation_info.top_frame_origin()->scheme()); } -std::string GetHSTSPartitionHash( +TransportSecurityState::HashedHost GetHSTSPartitionHash( const NetworkAnonymizationKey& network_anonymization_key) { DCHECK(base::FeatureList::IsEnabled(features::kBravePartitionHSTS)); // An empty top frame site cannot be used as a partition key, return an empty // hash which will be treated as a non-persistable partition. if (!network_anonymization_key.GetTopFrameSite().has_value()) { - return std::string(); + return TransportSecurityState::HashedHost(); } const std::string partition_domain = HSTSPartitionHashHelper::GetPartitionDomain( *network_anonymization_key.GetTopFrameSite()); if (partition_domain.empty()) { - return std::string(); + return TransportSecurityState::HashedHost(); } - const std::string canonicalized_partition_domain = + const std::vector canonicalized_partition_domain = CanonicalizeHost(partition_domain); if (canonicalized_partition_domain.empty()) { - return std::string(); + return TransportSecurityState::HashedHost(); } return HashHost(canonicalized_partition_domain); @@ -96,8 +96,8 @@ std::string GetHSTSPartitionHash( // HSTS state storage. Check top frame site for equality with site for cookies, // don't store HSTS if it differs. IsolationInfo is not available everywhere, // that's why we're using it only when parsing new HSTS state. -absl::optional GetPartitionHashForAddingHSTS( - const IsolationInfo& isolation_info) { +absl::optional +GetPartitionHashForAddingHSTS(const IsolationInfo& isolation_info) { if (!base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { return absl::nullopt; } @@ -109,14 +109,14 @@ absl::optional GetPartitionHashForAddingHSTS( if (IsTopFrameOriginCryptographic(isolation_info) && isolation_info.site_for_cookies().site() != *isolation_info.network_anonymization_key().GetTopFrameSite()) { - return std::string(); + return TransportSecurityState::HashedHost(); } return GetHSTSPartitionHash(isolation_info.network_anonymization_key()); } // Use NetworkIsolationKey to create PartitionHash for accessing/storing data. -absl::optional GetPartitionHashForHSTS( +absl::optional GetPartitionHashForHSTS( const NetworkAnonymizationKey& network_anonymization_key) { if (!base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { return absl::nullopt; @@ -127,8 +127,8 @@ absl::optional GetPartitionHashForHSTS( // Use host-bound NetworkIsolationKey in cases when no NetworkIsolationKey is // available. Such cases may include net-internals page, PasswordManager. // All network::NetworkContext HSTS-related public methods will use this. -absl::optional GetHostBoundPartitionHashForHSTS( - const std::string& host) { +absl::optional +GetHostBoundPartitionHashForHSTS(const std::string& host) { if (!base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { return absl::nullopt; } @@ -213,7 +213,7 @@ bool TransportSecurityState::DeleteDynamicDataForHost(const std::string& host) { bool brave_deleted = false; if (base::FeatureList::IsEnabled(features::kBravePartitionHSTS)) { - const std::string canonicalized_host = CanonicalizeHost(host); + const std::vector canonicalized_host = CanonicalizeHost(host); if (!canonicalized_host.empty()) { if (enabled_sts_hosts_.DeleteDataInAllPartitions( HashHost(canonicalized_host))) { diff --git a/net/http/partitioned_host_state_map.cc b/net/http/partitioned_host_state_map.cc index 5a90cca8c1f5..719aace6cc48 100644 --- a/net/http/partitioned_host_state_map.cc +++ b/net/http/partitioned_host_state_map.cc @@ -1,4 +1,4 @@ -/* Copyright 2022 The Brave Authors. All rights reserved. +/* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ @@ -7,22 +7,30 @@ #include -#include "base/strings/strcat.h" +#include "base/ranges/algorithm.h" #include "crypto/sha2.h" #include "net/base/network_isolation_key.h" +namespace { + +bool IsEmptyPartitionHash( + const net::PartitionedHostStateMapBase::HashedHost& hashed_host) { + return base::ranges::all_of(hashed_host.begin(), hashed_host.end(), + [](uint8_t i) { return i == 0; }); +} + +} // namespace + namespace net { PartitionedHostStateMapBase::PartitionedHostStateMapBase() = default; PartitionedHostStateMapBase::~PartitionedHostStateMapBase() = default; -base::AutoReset> +base::AutoReset> PartitionedHostStateMapBase::SetScopedPartitionHash( - absl::optional partition_hash) { - CHECK(!partition_hash || partition_hash->empty() || - partition_hash->size() == crypto::kSHA256Length); - return base::AutoReset>( - &partition_hash_, std::move(partition_hash)); + absl::optional partition_hash) { + return base::AutoReset>(&partition_hash_, + std::move(partition_hash)); } bool PartitionedHostStateMapBase::HasPartitionHash() const { @@ -30,23 +38,29 @@ bool PartitionedHostStateMapBase::HasPartitionHash() const { } bool PartitionedHostStateMapBase::IsPartitionHashValid() const { - return partition_hash_ && !partition_hash_->empty(); + return partition_hash_ && !IsEmptyPartitionHash(*partition_hash_); } -std::string PartitionedHostStateMapBase::GetKeyWithPartitionHash( - const std::string& k) const { +PartitionedHostStateMapBase::HashedHost +PartitionedHostStateMapBase::GetKeyWithPartitionHash( + const HashedHost& k) const { CHECK(IsPartitionHashValid()); if (k == *partition_hash_) { return k; } - return base::StrCat({GetHalfKey(k), GetHalfKey(*partition_hash_)}); + + HashedHost result; + static_assert(result.size() == crypto::kSHA256Length, + "Unexpected HashedHost size"); + base::ranges::copy(GetHalfKey(k), result.begin()); + base::ranges::copy(GetHalfKey(*partition_hash_), + std::next(result.begin(), std::size(result) / 2)); + return result; } -// static -base::StringPiece PartitionedHostStateMapBase::GetHalfKey(base::StringPiece k) { - CHECK_EQ(k.size(), crypto::kSHA256Length); - const size_t kHalfSHA256HashLength = crypto::kSHA256Length / 2; - return k.substr(0, kHalfSHA256HashLength); +base::span PartitionedHostStateMapBase::GetHalfKey( + const HashedHost& k) { + return base::make_span(k.data(), std::size(k) / 2); } } // namespace net diff --git a/net/http/partitioned_host_state_map.h b/net/http/partitioned_host_state_map.h index 32bf12f76108..891b141dd9a1 100644 --- a/net/http/partitioned_host_state_map.h +++ b/net/http/partitioned_host_state_map.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The Brave Authors. All rights reserved. +/* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ @@ -6,11 +6,13 @@ #ifndef BRAVE_NET_HTTP_PARTITIONED_HOST_STATE_MAP_H_ #define BRAVE_NET_HTTP_PARTITIONED_HOST_STATE_MAP_H_ +#include #include #include "base/auto_reset.h" +#include "base/containers/span.h" #include "base/ranges/algorithm.h" -#include "base/strings/string_piece.h" +#include "crypto/sha2.h" #include "net/base/net_export.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -19,6 +21,8 @@ namespace net { // Implements partitioning support for structures in TransportSecurityState. class NET_EXPORT PartitionedHostStateMapBase { public: + using HashedHost = std::array; + PartitionedHostStateMapBase(); ~PartitionedHostStateMapBase(); @@ -27,8 +31,8 @@ class NET_EXPORT PartitionedHostStateMapBase { delete; // Stores scoped partition hash for use in subsequent calls. - base::AutoReset> SetScopedPartitionHash( - absl::optional partition_hash); + base::AutoReset> SetScopedPartitionHash( + absl::optional partition_hash); // Returns true if |partition_hash_| is set. The value may be empty. bool HasPartitionHash() const; // Returns true if |partition_hash_| contains a non empty valid hash. @@ -36,17 +40,18 @@ class NET_EXPORT PartitionedHostStateMapBase { // Creates a host hash by concatenating first 16 bytes (half of SHA256) from // |k| and first 16 bytes from |partition_hash_|. // CHECKs if |partition_hash_| is not valid. - std::string GetKeyWithPartitionHash(const std::string& k) const; + HashedHost GetKeyWithPartitionHash(const HashedHost& k) const; - // Returns first 16 bytes from |k|. - static base::StringPiece GetHalfKey(base::StringPiece k); + // Returns first `HashedHost::size() / 2` bytes from |k|. + static base::span GetHalfKey(const HashedHost& k); private: // Partition hash can be of these values: // nullopt - unpartitioned; - // empty string - invalid/opaque partition, i.e. shouldn't be stored; - // non empty string - valid partition. - absl::optional partition_hash_; + // empty array - invalid/opaque partition, i.e. shouldn't be stored; + // non-empty array - valid partition. + // Where empty is defined as zero-initialized. + absl::optional partition_hash_; }; // Allows data partitioning using half key from PartitionHash. The class mimics @@ -112,7 +117,12 @@ class NET_EXPORT PartitionedHostStateMap : public PartitionedHostStateMapBase { // partition hash part. bool DeleteDataInAllPartitions(const key_type& k) { auto equal_range_pair = base::ranges::equal_range( - map_, GetHalfKey(k), {}, + map_, GetHalfKey(k), + [](const auto& v1, const auto& v2) { + // Mimic std::less by calling memcmp on base::span arrays. + DCHECK(v1.size() == v2.size()); + return memcmp(v1.data(), v2.data(), v1.size()) < 0; + }, [](const value_type& v) { return GetHalfKey(v.first); }); if (equal_range_pair.first == equal_range_pair.second) { diff --git a/net/http/partitioned_host_state_map_unittest.cc b/net/http/partitioned_host_state_map_unittest.cc index d9c60d18aaf7..98456e0e522e 100644 --- a/net/http/partitioned_host_state_map_unittest.cc +++ b/net/http/partitioned_host_state_map_unittest.cc @@ -1,4 +1,4 @@ -/* Copyright 2022 The Brave Authors. All rights reserved. +/* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ @@ -8,6 +8,7 @@ #include #include +#include "base/containers/span.h" #include "crypto/sha2.h" #include "testing/gtest/include/gtest/gtest.h" @@ -15,13 +16,15 @@ namespace net { namespace { -using PartitionedMap = - PartitionedHostStateMap>; +using HostHash = std::array; +using PartitionedMap = PartitionedHostStateMap>; -std::string HashHost(base::StringPiece canonicalized_host) { - char hashed[crypto::kSHA256Length]; - crypto::SHA256HashString(canonicalized_host, hashed, sizeof(hashed)); - return std::string(hashed, sizeof(hashed)); +HostHash HashHost(base::StringPiece canonicalized_host) { + if (canonicalized_host.empty()) { + return {}; + } + return crypto::SHA256Hash( + base::as_bytes(base::make_span(canonicalized_host))); } } // namespace @@ -51,7 +54,7 @@ TEST(PartitionedHostStateMapTest, WithoutPartitionHash) { TEST(PartitionedHostStateMapTest, InvalidPartitionHash) { PartitionedMap map; // Empty string is an invalid partition. It means it should not be persisted. - auto auto_reset_partition_hash = map.SetScopedPartitionHash(""); + auto auto_reset_partition_hash = map.SetScopedPartitionHash(HashHost("")); EXPECT_TRUE(map.HasPartitionHash()); EXPECT_FALSE(map.IsPartitionHashValid()); From 7edb3456180f20f2183e81c1823eedf66a0a59c0 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 14:44:33 +0000 Subject: [PATCH 047/146] Update from Chromium 110.0.5462.3 to Chromium 110.0.5464.2. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1cb141437cf4..76a9a9a76851 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5462.3", + "tag": "110.0.5464.2", "repository": { "url": "https://github.com/chromium/chromium" } From c7ba7bcd85f109425125a401f68502224ed1cd79 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 14:50:28 +0000 Subject: [PATCH 048/146] Conflict-resolved patches from Chromium 110.0.5462.3 to Chromium 110.0.5464.2. --- patches/chrome-VERSION.patch | 6 +++--- ...ces-settings-privacy_page-privacy_page.ts.patch | 6 +++--- ..._settings-core-common-content_settings.cc.patch | 8 ++++---- ...ios-chrome-browser-prefs-browser_prefs.mm.patch | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 1a95cf3410a2..a12e1f6e01a7 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index b0696454e2812190e3ef4276cf97ad21ed4a209f..9b25ffed33ab7a81fa8f6774e1b6351e83cb1482 100644 +index 153a1f6db9c596ffebc69f00c56950fabd732096..9b25ffed33ab7a81fa8f6774e1b6351e83cb1482 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 --BUILD=5462 --PATCH=3 +-BUILD=5464 +-PATCH=2 +MINOR=1 +BUILD=49 +PATCH=59 diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index 91ba7bb51336..5a190e8e4887 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index c7049b73e11bca6143e44c5b30375b4e06c64974..11cfb0d4571925fb21a7fb52d6a2a5c64fd184d4 100644 +index 563272df6cc068a6567d63c8bd645b2153358d90..a6bbd1d3e364e39bc70d2435a86cfe2cbf31f82c 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -@@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; - import '../settings_page/settings_animated_pages.js'; +@@ -18,6 +18,7 @@ import '../settings_page/settings_animated_pages.js'; import '../settings_page/settings_subpage.js'; import '../settings_shared.css.js'; + import '../site_settings/settings_category_default_radio_group.js'; +import './personalization_options.js'; import './privacy_guide/privacy_guide_dialog.js'; diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 785de6657dcf..40a09591686c 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index c9e69f17d7a4c7ef390e688bc13aa6ab704bf4c0..fb03fe22d3c7ca0679a4576cedeed69aed7aa26b 100644 +index 7c1b5b6ccf737bbbef90f3638eb651d6cd565d0f..f0ef751051679ef62cdd80bb2ffc84d13d74b8ad 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -109,6 +109,7 @@ constexpr HistogramValue kHistogramValue[] = { - {ContentSettingsType::NOTIFICATION_PERMISSION_REVIEW, 88}, - {ContentSettingsType::PRIVATE_NETWORK_GUARD, 89}, +@@ -111,6 +111,7 @@ constexpr HistogramValue kHistogramValue[] = { {ContentSettingsType::PRIVATE_NETWORK_CHOOSER_DATA, 90}, + {ContentSettingsType::FEDERATED_IDENTITY_IDENTITY_PROVIDER_SIGNIN_STATUS, + 91}, + BRAVE_HISTOGRAM_VALUE_LIST }; diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index 7604b3338d29..8a2cdb74f038 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index 14b1aa155424c223942b56d0189e7b7707509dd5..f6ae9e72de0bc25d86b3407328235716a1598b83 100644 +index c000df9b76ed47bc4a172802562f39eb7dfba90b..17044fb3206f4b4981aa3a4d520c493bc9436db8 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -208,6 +208,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -209,6 +209,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { prefs::kAutofillBrandingIconAnimationRemainingCountPrefName, 2); registry->RegisterDictionaryPref(kLocalConsentsDictionary); @@ -10,7 +10,7 @@ index 14b1aa155424c223942b56d0189e7b7707509dd5..f6ae9e72de0bc25d86b3407328235716 } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -338,6 +339,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -339,6 +340,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { base::to_underlying( prerender_prefs::NetworkPredictionSetting::kEnabledWifiOnly), user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); @@ -18,9 +18,9 @@ index 14b1aa155424c223942b56d0189e7b7707509dd5..f6ae9e72de0bc25d86b3407328235716 } // This method should be periodically pruned of year+ old migrations. -@@ -400,4 +402,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { - if (!account_id.empty()) - prefs->SetString(prefs::kGoogleServicesLastGaiaId, account_id); - } +@@ -404,4 +406,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { + + // Added 12/2022. + prefs->ClearPref(reading_list::prefs::kDeprecatedReadingListHasUnseenEntries); + BRAVE_MIGRATE_OBSOLETE_BROWSER_STATE_PREFS } From 835742641d5906ec56ea6346ca13820f09fc7816 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 14:51:05 +0000 Subject: [PATCH 049/146] Update patches from Chromium 110.0.5462.3 to Chromium 110.0.5464.2. --- patches/base-BUILD.gn.patch | 4 ++-- patches/build-android-gyp-dex.py.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- patches/build-config-android-internal_rules.gni.patch | 4 ++-- patches/build-config-android-rules.gni.patch | 2 +- patches/chrome-android-chrome_java_sources.gni.patch | 4 ++-- patches/chrome-browser-BUILD.gn.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 4 ++-- .../chrome-browser-extensions-extension_management.cc.patch | 4 ++-- ...-browser-importer-external_process_importer_host.h.patch | 2 +- ...rome-browser-net-system_network_context_manager.cc.patch | 4 ++-- patches/chrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- patches/chrome-browser-resources-settings-BUILD.gn.patch | 4 ++-- ...-resources-settings-privacy_page-privacy_page.html.patch | 2 +- ...ettings-privacy_page-privacy_page_browser_proxy.ts.patch | 2 +- patches/chrome-browser-resources-settings-route.ts.patch | 4 ++-- ...rome-browser-resources-settings-settings_routes.ts.patch | 4 ++-- ...-settings-site_settings_page-site_settings_page.ts.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 2 +- ...ui-settings-settings_localized_strings_provider.cc.patch | 4 ++-- ...-browser-ui-webui-settings-site_settings_helper.cc.patch | 6 +++--- ...pplications-os_integration-web_app_shortcut_mac.mm.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 2 +- ...browser_ui-site_settings-SiteSettingsCategory.java.patch | 6 +++--- ...components-crash-core-browser-resources-crashes.ts.patch | 2 +- patches/components-omnibox-browser-BUILD.gn.patch | 2 +- .../components-omnibox-browser-omnibox_edit_model.cc.patch | 4 ++-- ...ts-password_manager-core-browser-login_database.cc.patch | 2 +- ...word_manager-core-browser-password_form_filling.cc.patch | 2 +- ...rowser-renderer_host-navigation_controller_impl.cc.patch | 2 +- ...ontent-browser-renderer_host-navigation_request.cc.patch | 6 +++--- patches/content-renderer-render_frame_impl.cc.patch | 4 ++-- patches/content-renderer-render_thread_impl.cc.patch | 2 +- ...ensions-browser-api-web_request-web_request_api.cc.patch | 4 ++-- ...rty-blink-renderer-core-dom-events-event_target.cc.patch | 4 ++-- patches/third_party-blink-renderer-platform-BUILD.gn.patch | 4 ++-- ...i-accessibility-platform-ax_platform_node_cocoa.mm.patch | 4 ++-- patches/ui-webui-resources-BUILD.gn.patch | 6 +++--- patches/v8/BUILD.gn.patch | 4 ++-- 39 files changed, 68 insertions(+), 68 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 3df41594ca9f..80256d009e53 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index fab875470b919945127565a300961adc431bf9f7..e184e118916012261bbe860c5447746d58fef831 100644 +index 8454ef6f29a69317b445de9d47cdf8c013141c1b..b0d13dda6e3dd4c2f1bdcbadcf643621f0e48147 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4308,6 +4308,7 @@ if (is_android) { +@@ -4304,6 +4304,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-android-gyp-dex.py.patch b/patches/build-android-gyp-dex.py.patch index 54bd2be02e82..2fe9aac33ba8 100644 --- a/patches/build-android-gyp-dex.py.patch +++ b/patches/build-android-gyp-dex.py.patch @@ -1,5 +1,5 @@ diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py -index 9ef80df4722386187128f3c1d605c2099d593c18..a8d1593b1fbfeb5415d926b7ce72324980aec32c 100755 +index 0b2577090e4874dfdbf61947e0af44e1d56bdf69..d25fd8f893ab3069a37121c20176630ee35aa879 100755 --- a/build/android/gyp/dex.py +++ b/build/android/gyp/dex.py @@ -54,7 +54,7 @@ _IGNORE_WARNINGS = ( diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index c5f48687d391..a58fc68ddd46 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 2b3d2a8413f240c5c65fe9659efd902e898c3ae7..7f2b021432585997b6c43abf3bba98ca7563f914 100644 +index d893ebc344219f85a244e7530e633949507ee0b8..9d50ee72c76e5739ed3ec9fdf2e3c6d5a54b3652 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -8,6 +8,7 @@ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 723c413f456f..3ca18a61d54a 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index b78b91f35e1982cf9f14d35d56c7106d68cc3404..a7b3d2410aa5bfce98c8486859b45c2cb9aee50b 100644 +index a555059dce4cdc59a97ec1974c3a9ac8e965bf6d..a619851637fb797705b638827514cc46cee6644f 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -3884,6 +3884,7 @@ if (enable_java_templates) { +@@ -3801,6 +3801,7 @@ if (enable_java_templates) { } else { not_needed(invoker, [ "missing_classes_allowlist" ]) } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 2687b5d5114a..684c7fdfadb0 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index b6d9616929f6e568c5b884b9460ff6cb6b82a65a..0b73c52cb3e35e3d7c6e479f2616366e9cc38f20 100644 +index e548492f82e2fb62d204bc47ef9f13f9c0459cd5..c67aae9012303345129e24b040409dccfe9457cf 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -574,6 +574,7 @@ if (enable_java_templates && is_android) { diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index c6192d1da4f5..ff73f23757b2 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index e22cb3c1e9481c344478069e665e39b407f4775c..892cf95ecde4d96ab371e6abfa136b2f19e32a7a 100644 +index 91ce3cbf8d620e5e73419cda161288c6134821c8..f59ecb4616aee1daab2fa5d28180651120f5f25a 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1216,3 +1216,4 @@ chrome_java_sources = [ +@@ -1215,3 +1215,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index c175bea81c1a..296316e81ae9 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index ae76fcf1c7912bbcaaf073bee3fe8753e88ab5a2..3cd1e8413b0a3f54aacf36f931f046aa5e539fce 100644 +index da8103900f3e3545316a8aecdb37e09b3ac83720..120231d6291e843d86dd57717b8028c5794a249e 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2535,6 +2535,7 @@ static_library("browser") { +@@ -2537,6 +2537,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index c912a7e9940c..b5a2ac70da2a 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index ce932800fc12e959d8e1b741f701a355f1aa95c9..45b5c953da77c941436ecb2d6771ea0f1f8802a3 100644 +index 49c38a50214ee7ca39cf6091902b1e14178a1aa9..3199a0f2d30236ab4f5eff34fe84f85e316aa46f 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3379,6 +3379,7 @@ const FeatureEntry::FeatureVariation +@@ -3390,6 +3390,7 @@ const FeatureEntry::FeatureVariation kWebRtcApmDownmixMethodVariations[] = { // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 0410945fe005..9b10689771ca 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 94c85501355314d6fa594d0ec60472adee24e04b..d528057860cd66fdcf86d3e4e560185849527c4e 100644 +index 3488182177e82599b19ab11cb2721a19aacf8681..a105d63034c36829eccbb91b9698a725dffd359e 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -875,6 +875,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -888,6 +888,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-importer-external_process_importer_host.h.patch b/patches/chrome-browser-importer-external_process_importer_host.h.patch index eb9ca674cb03..deb4b0f66812 100644 --- a/patches/chrome-browser-importer-external_process_importer_host.h.patch +++ b/patches/chrome-browser-importer-external_process_importer_host.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h -index e482d76980f8b9371b05d901e3cd9e7b08f5d98c..f9c7376e1416e32b2f8a42d60918235f6d397d7a 100644 +index a55ef6ae01873eff0d83d7ea82bfd506ca31566b..c22ff75ec50a6a030b175385b309b12dc7ae9c0c 100644 --- a/chrome/browser/importer/external_process_importer_host.h +++ b/chrome/browser/importer/external_process_importer_host.h @@ -75,6 +75,7 @@ class ExternalProcessImporterHost diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch index fc8a1bb14d21..2a45cc8421e6 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 39f5f4ab69d11ad4522770557cb739113687ba3a..37386797d6a58d3e82086ef547a78d05033f41ab 100644 +index f5f26dc65df1cb2e85d503399aed0767a55b9947..fb0d00191180003d9b52e59d53a572cd14ad6ea4 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -305,7 +305,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem +@@ -308,7 +308,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem if (!manager_) return; manager_->GetURLLoaderFactory()->CreateLoaderAndStart( diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index a78b9b0a55bf..aa5898493ed6 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 5c04d83478f454bbeb5ac83c7a988c950d4174a1..af2836cf65631aa521b8ab9db48db3e790b9c6b8 100644 +index c62487f605cb87f1177ae6bdab75a90c26d1fe22..24c85f6022a694ffa5406092b6ee042bc9703423 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1300,6 +1300,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1301,6 +1301,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -11,7 +11,7 @@ index 5c04d83478f454bbeb5ac83c7a988c950d4174a1..af2836cf65631aa521b8ab9db48db3e7 #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) screen_ai::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -@@ -1680,6 +1682,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1681,6 +1683,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif registry->RegisterTimePref(prefs::kDIPSTimerLastUpdate, base::Time()); diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 9d75ebcb612f..eca10ecd2d11 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 928d40e7295313f7feb1348cdf08e19481eb497f..358aee53de8c5e6804d699403b46ed4b69c677c3 100644 +index bea31921070c5dbc1a1268ef1b9c59b818b8602c..e22fd53213e4211f3e772dcf51abf88fb145e5b8 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -496,4 +496,5 @@ build_webui("build") { +@@ -497,4 +497,5 @@ build_webui("build") { "lazy_load.rollup.js|lazy_load.js", ] } diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 9d95c21ce04a..3ff1db6c2a94 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 24a1cc0deea4164d76d33081a95fa9ed7b06a5f6..5119a16a11464166800b7ca73db7640008b385b7 100644 +index 5a3e6752d38c67a09203c12fa7acc46908b55228..aefc3413b0eeaca720235cdc0f5d1f7da3e8388b 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -40,6 +40,7 @@ diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch index 31b6b6b60b5d..42d5ec650fbc 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts -index 001f438e666ea61c4038a49566c897b8274e2132..c3eff8c17737197a4657f8150b6b399ec234bcda 100644 +index 2e13c777517eae71cbf8da2b4e0d0f4ac3e066bf..f9d60fb20e02f9d224e09ee85461fcc1543e6320 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts @@ -54,7 +54,7 @@ export interface SecureDnsSetting { diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index 6a9683eba316..3d90a46e3368 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index 98f4685d18f921c666c02db0fc46ad4db73bbd25..39c5b0e61f7a11050362f92af2bffc1aff6bbfe4 100644 +index 19d49e4fbd20e166976b2f3bb51c1f748dbe79ff..452ac05c1819d290daa78993561b33954a89ff9f 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; @@ -10,7 +10,7 @@ index 98f4685d18f921c666c02db0fc46ad4db73bbd25..39c5b0e61f7a11050362f92af2bffc1a /** * Add all of the child routes that originate from the privacy route, * regardless of whether the privacy section under basic or advanced. -@@ -252,6 +253,7 @@ function createBrowserSettingsRoutes(): Partial { +@@ -255,6 +256,7 @@ function createBrowserSettingsRoutes(): Partial { loadTimeData.getString('performancePageTitle')); } } diff --git a/patches/chrome-browser-resources-settings-settings_routes.ts.patch b/patches/chrome-browser-resources-settings-settings_routes.ts.patch index f8b7e6ac164d..1320c3a73f93 100644 --- a/patches/chrome-browser-resources-settings-settings_routes.ts.patch +++ b/patches/chrome-browser-resources-settings-settings_routes.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts -index fc0ce321326d92d8268510f743c0812f981dc303..9330a79ad067b74e447dbccbf43ba1e870f594df 100644 +index 021b9c141285c1d79cd1c2507dc71207b9ee14fc..926bd99e567ff2ec14582ee226cd77a7d58a2fec 100644 --- a/chrome/browser/resources/settings/settings_routes.ts +++ b/chrome/browser/resources/settings/settings_routes.ts -@@ -93,4 +93,5 @@ export interface SettingsRoutes { +@@ -94,4 +94,5 @@ export interface SettingsRoutes { SYNC_ADVANCED: Route; SYSTEM: Route; TRIGGERED_RESET_DIALOG: Route; diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index c4880815f2d7..c9a0b20b2e80 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index cd3121ad89976a83c8a33ae76e6f6c272a7100c1..ac5825d3c7e9456a00ccbb30617f261a85a706b2 100644 +index 9594631e8053cd88e19dacf7c43b22b202125ae7..3e0ed58402a3abce9470ad073978ae6af0d99d44 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 5add9363d5d2..0b627123a57c 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index d0204a157a2405f6db95d70df3c454479cca15f1..8b8ebfbab7e4d05fd0687f0b3b6aaf1a905f1360 100644 +index 524b8097f004740be12bfabdfbb9ccf2fc16d195..b865f3bed235013e9772b2a8480cbd57b49313df 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -666,6 +666,7 @@ static_library("ui") { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 248badedc7c5..47fee3313e8b 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index c90b57ee26b3d2b33328b57e649ff29d856f1748..d69dd10205f48b2ee020f366e63a529ef8866c37 100644 +index ef73d44c9f567e495719909ffab6c7c701d9874b..d734a3e414875982e78d61a11b35b2351a2d9c4e 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3268,6 +3268,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3270,6 +3270,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 1a51e5bd9fd4..ac0a3f8ad5f9 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 315f61dde5a3bdb5ad75799bc7a2a3adce898476..6ff120b52dbe8e2c7ae789b09ccc870b3763ec33 100644 +index 7bc61c34b2ae3c1d6632cb4a753db8b94ff1eb1e..be9ed9415b3134679d974112704aaaa971b1ea94 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -173,6 +173,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { +@@ -175,6 +175,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { // PPAPI_BROKER has been deprecated. The content setting is not used or // called from UI, so we don't need a representation JS string. {ContentSettingsType::DEPRECATED_PPAPI_BROKER, nullptr}, @@ -10,7 +10,7 @@ index 315f61dde5a3bdb5ad75799bc7a2a3adce898476..6ff120b52dbe8e2c7ae789b09ccc870b }; static_assert(std::size(kContentSettingsTypeGroupNames) == -@@ -361,6 +362,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -363,6 +364,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch index 509d32c012f7..6b97a0f1a2be 100644 --- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -index 266e031765833a75101fdb369f567bc51bdd5c5e..8af6daf3ada78d45d42fe9b0ae8274af2754ffb8 100644 +index 9e6069f6e1f540d10a393c2c9d7c2f8fabbdb9f8..df18a1a4d738d3ad458d393168a162642a0e10f3 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -@@ -776,6 +776,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -742,6 +742,7 @@ base::FilePath GetChromeAppsFolder() { if (path.empty()) return path; diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 03c0dee61c8b..36101e69bd75 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 572ca887693b2cfbcabf9d02193dcc11d294c3ae..1f367a1a87fecc7784acd964236dd95c7abd4345 100644 +index cf0364c49408d337f6919be0a1cbe185db6f9503..a78bf6a819aa4260b08861533e75c9f43c517f83 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch index e0a765becf07..1e7bc0bccd33 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -index da8164afe9fac05c7742b50d7d2fe8ae35da646c..8105834589d104b98609114d12068605e070a6bc 100644 +index ac5c71ffb62eec1988e820b500cbb78ce6702bc9..89932eab0b83d7653b4ea7dc88b48647df71f19a 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -48,7 +48,7 @@ public class SiteSettingsCategory { +@@ -47,7 +47,7 @@ public class SiteSettingsCategory { Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY, Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE, Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA, @@ -11,7 +11,7 @@ index da8164afe9fac05c7742b50d7d2fe8ae35da646c..8105834589d104b98609114d12068605 @Retention(RetentionPolicy.SOURCE) public @interface Type { // All updates here must also be reflected in {@link #preferenceKey(int) -@@ -81,10 +81,11 @@ public class SiteSettingsCategory { +@@ -80,10 +80,11 @@ public class SiteSettingsCategory { int FEDERATED_IDENTITY_API = 25; int THIRD_PARTY_COOKIES = 26; int SITE_DATA = 27; diff --git a/patches/components-crash-core-browser-resources-crashes.ts.patch b/patches/components-crash-core-browser-resources-crashes.ts.patch index e17e5a3f6e94..17eca49e2088 100644 --- a/patches/components-crash-core-browser-resources-crashes.ts.patch +++ b/patches/components-crash-core-browser-resources-crashes.ts.patch @@ -1,5 +1,5 @@ diff --git a/components/crash/core/browser/resources/crashes.ts b/components/crash/core/browser/resources/crashes.ts -index 591214145a8025abfa7a6478851f935530148521..7c99c663a630f7e6d82f0191efcc9f22663a3042 100644 +index 591214145a8025abfa7a6478851f935530148521..14f6e897b6cc8477e2e4290b9a64405f88364bb4 100644 --- a/components/crash/core/browser/resources/crashes.ts +++ b/components/crash/core/browser/resources/crashes.ts @@ -141,7 +141,7 @@ function updateCrashList({ diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index b5d4d12c42df..f3ce819c9066 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 870c0b0e547b9c2b39cf69256e5baddad04e294f..32394ff34e04b428b90c2fb91457eec37b8e6eba 100644 +index 8154d9295737fa9c248d0fb86440f405273bfde4..7345e75bed08364d209fae1959edc3792d0e599f 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -317,6 +317,7 @@ static_library("browser") { diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 04780a6ca39a..660965d383b9 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 61e94879d2bee957b650b84107d822d4337dcbff..80f08e0b5d38178af606f0af1b1572a51cfa79f2 100644 +index 70243395694ba74a69a63249fc50e578d5f6d2fe..b358da1e833983626554c9eecb3702d7a6cd8b08 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -456,6 +456,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -487,6 +487,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, (*text == display_text_ || *text == url_for_editing_)) { *url_from_text = controller()->GetLocationBarModel()->GetURL(); *write_url = true; diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index 3cf1f78119f7..2574d5b84332 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index cb1203338385824c8556866de92a3bca9ba0c36f..2e48a1c989d4ccc7985797a7e8da8612145658b5 100644 +index ad1fad7f690226e28682de4a84fafd529a311152..87544a7b13603a7b9efc2a4a9586eeeae9b7ec4f 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc @@ -1858,6 +1858,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index dcbb87a0073c..98e645a66fef 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index 6d82421aa0f52afc7e5e41a3e90e46f82cc95207..e98466ec2f0d8c493c1c95ef733607ba5fc11924 100644 +index 1dd49aa221bbfcbf89645efcbf67e761fedbb7bb..0d3e9ec5ab3cbeef3967daaaa7cc45da1bdc1143 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc @@ -243,6 +243,7 @@ LikelyFormFilling SendFillInformationToRenderer( diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 0b5c235334cc..285d5c057766 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 53a860a7e2ed6b63d1405cfbe44257663b14946c..b90f9bee08503525d7e2ae1a25a5a346af5d8c60 100644 +index 74d072df0292e8ee2a4fa58dac446758cb59cc68..1f38f0efc1b666dcbd5d23875e23232fdad8c9e0 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc @@ -3439,16 +3439,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 803305d0436a..99bfa9e7bc04 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 6530ee791f7eb6d2f236152bb310399458f500eb..35e7d7d42b54ffd0cc2924768ecde39fff6a4dee 100644 +index 7de98e33360dfa2ab91f2f94ae106addd476114c..fe800d472ea33d87b40a88f52cd298c315f16d82 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2910,6 +2910,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2922,6 +2922,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 6530ee791f7eb6d2f236152bb310399458f500eb..35e7d7d42b54ffd0cc2924768ecde39f common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4396,6 +4397,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4408,6 +4409,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 905c4fb487ab..5e82f72fb7d3 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index cb64cc0b5e7cb776bb7585871223ee5b444ba98c..2081d5d49528a83c94eb2ff871722505db5956a2 100644 +index 0176c0d3a43bbc49c2b2e492ef8d91b36875fecf..ce238f49e7993436c7a30bccf614bf5e0168ca11 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4450,6 +4450,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4458,6 +4458,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index adadb11d5883..8077ebc6eab2 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index cd278b96695bae7f8421d3760dabdb0dd9720533..ac606ef1c69aeccefb076f249636f0d4cbbfb3a0 100644 +index a887ad26ddad387acf144fd1e9fd89e6b4e9ceb0..f243710541be8fdede085a7d10ecd09e9f4cd6cd 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -925,6 +925,7 @@ void RenderThreadImpl::InitializeRenderer( diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index ba07f70fa322..c6c335682955 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index 5ab49cf27ee1b2171c660880111c287dbcf8f0d5..f8cfcb42e541f4cab875d1c03978a94605b8b960 100644 +index f3bdc2025a0febce845b09bcf8b8b811d10a4b05..578620d841c0a4aa96a5d044d03c30c4a9673db2 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1385,6 +1385,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1388,6 +1388,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch index f5c750276061..846d7814e4c2 100644 --- a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc -index fff958596321ed5b96935c07a78b5b6fdfd1e40c..e1cda0a4a87fd115d711b831723678226fb8db5d 100644 +index 6289781d7fbc84af4366428968bea32d24cf8a35..13d0bf277f640188e52f0e04c5a6526dc7c5d990 100644 --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc @@ -479,6 +479,7 @@ bool EventTarget::AddEventListenerInternal( @@ -10,7 +10,7 @@ index fff958596321ed5b96935c07a78b5b6fdfd1e40c..e1cda0a4a87fd115d711b83172367822 if (options->hasSignal()) { // Instead of passing the entire |options| here, which could create a // circular reference due to |options| holding a Member, just -@@ -612,6 +613,7 @@ bool EventTarget::RemoveEventListenerInternal( +@@ -614,6 +615,7 @@ bool EventTarget::RemoveEventListenerInternal( &index_of_removed_listener, ®istered_listener)) return false; diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index 836e5dc73435..a2dae6fd080b 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 65fc337efa292a0e9623682ba61dd0032140060d..7e859769747786b33a348f63e73ec89e713d96f8 100644 +index 11a2294eba6323e1354271fb97c9edb58ee5ac5d..23c5f091d02afb47d68df5c019f9468e0520d127 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1848,6 +1848,7 @@ component("platform") { +@@ -1849,6 +1849,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 3f8959620da2..30fc6b4d6395 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index 11bbc9e2917aea17c3bd456c57f1c57088cc39ce..24eb18260eb4ae2e26be1fe5993c300b728fc1ff 100644 +index 3d77a407eb119bcf35360b63e8983234348694db..d2cb0d3cb7eefdf0a9f1da52e6c44ff277178646 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -2258,6 +2258,7 @@ void CollectAncestorRoles( +@@ -2264,6 +2264,7 @@ void CollectAncestorRoles( if (!_node) return nil; diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index 707721f5a569..9d2a41e005af 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index b240bbf296ece6a3c9bcf3be82a1d4dc0fdba921..f788753b91d676643890badd7b28b128fb4bba44 100644 +index 724a595a719612389a0d32d235c7757f2683cc24..6e0713f1e7ec5a6d30a5b14c24eb7543219e08a6 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn -@@ -105,6 +105,7 @@ generate_grd("build_grd") { +@@ -103,6 +103,7 @@ generate_grd("build_grd") { "$root_gen_dir/ui/webui/resources/cr_components/color_change_listener/resources.grdp", ] } @@ -10,7 +10,7 @@ index b240bbf296ece6a3c9bcf3be82a1d4dc0fdba921..f788753b91d676643890badd7b28b128 } if (is_chromeos_ash) { -@@ -232,6 +233,7 @@ ts_library("library") { +@@ -230,6 +231,7 @@ ts_library("library") { ":generate_definitions", ":preprocess", ] diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index fe0a6f9c7a74..fdd48a2bc5ba 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/BUILD.gn b/BUILD.gn -index bbdd39038dbf505488d51bb09afd41ef424b1d75..7fb78118488943ccb010991bf7cc00ed97374263 100644 +index c81ce84b91119eae98688d3da9bede622af743d8..363878a5caffd489ae5e0d3b7e78fa02c71a8fd1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -629,6 +629,7 @@ config("internal_config_base") { @@ -10,7 +10,7 @@ index bbdd39038dbf505488d51bb09afd41ef424b1d75..7fb78118488943ccb010991bf7cc00ed } config("internal_config") { -@@ -2656,6 +2657,7 @@ v8_header_set("v8_headers") { +@@ -2657,6 +2658,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] From ec6361b1211b55dee0d71d073c9f0d1aba1d8c2a Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 14:54:12 +0000 Subject: [PATCH 050/146] Updated strings for Chromium 110.0.5464.2. --- app/generated_resources.grd | 21 +++-- app/generated_resources_override.grd | 4 + app/password_manager_ui_strings.grdp | 3 + app/settings_strings.grdp | 6 ++ .../strings/android_chrome_strings.grd | 12 +++ components/arc_strings.grdp | 2 +- components/autofill_payments_strings.grdp | 6 ++ components/omnibox_pedal_ui_strings.grdp | 90 ++++++++++++++++++- .../omnibox_pedal_ui_strings_override.grdp | 19 ++++ components/omnibox_strings.grdp | 76 ---------------- components/omnibox_strings_override.grdp | 20 ----- 11 files changed, 155 insertions(+), 104 deletions(-) diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 8ea4c102eaf3..3dc6c7482538 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -2536,6 +2536,16 @@ are declared in tools/grit/grit_rule.gni. + + + Back to recent downloads + + + + + Back to Recent Downloads + + @@ -6319,6 +6329,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Doodle Link + + Appearance + Background @@ -6801,11 +6814,6 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - {NUM_BOOKMARKS, plural, =1 {1 bookmark} other {# bookmarks}} - - @@ -6929,6 +6937,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Bookmark things you want to come back to later + + {NUM_BOOKMARKS, plural, =1 {1 bookmark} other {# bookmarks}} + diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index a6c3a958728f..bdad29c667de 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -339,6 +339,10 @@ are declared in tools/grit/grit_rule.gni. + + + + diff --git a/app/password_manager_ui_strings.grdp b/app/password_manager_ui_strings.grdp index 100b6411e95f..35d056d531f0 100644 --- a/app/password_manager_ui_strings.grdp +++ b/app/password_manager_ui_strings.grdp @@ -150,4 +150,7 @@ Hide password + + Signed in with + diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index d2c0de9e55eb..6d49899a0227 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -1818,6 +1818,12 @@ Mauris interdum lectus vitae lacinia + + Nunc gravida condimentum consectetur + + + Vivamus nibh turpis, varius quis nisi vel, porta laoreet tellus. Mauris porta imperdiet venenatis + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 56d5244ba44d..c5854e65c329 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -1307,6 +1307,18 @@ Private state tokens improve privacy on the web and can’t be used to find out Integer faucibus metus + + Donec fringilla justo vel ligula finibus, ut rutrum lectus vestibulum. Suspendisse vestibulum lorem lacinia nulla consequat auctor. + + + Donec commodo sem non augue blandit, ullamcorper aliquam enim fermentum + + + Diam maecenas sed + + + Integer faucibus metus + Quisque eu auctor purus, id tempus nulla. Pellentesque porta orci purus. Donec dictum, <link1>justo nec ultricies semper</link1>, <link2>eros mauris varius nibh</link2>, sit amet molestie quam arcu id urna. Donec vulputate dui ut lorem egestas, ac sollicitudin metus fermentum. diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index 7e6c2cd95d05..efd103a7cb73 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -79,7 +79,7 @@ App launching throbber - Starting + Starting $1PlayStore Updating Android System diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index e919984c8017..0915e3e8c190 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -771,5 +771,11 @@ Add card + + + + Manage payment methods + + diff --git a/components/omnibox_pedal_ui_strings.grdp b/components/omnibox_pedal_ui_strings.grdp index f716c6c7a93a..65fb64a3fbd5 100644 --- a/components/omnibox_pedal_ui_strings.grdp +++ b/components/omnibox_pedal_ui_strings.grdp @@ -464,12 +464,98 @@ Set Brave as default browser - Set Brave as the system's default browser in iOS settings + Set Brave as the system's default browser - $1The Chromium Projects http://www.chromium.org bookmark, Press tab then Enter to set Brave as the system's default browser in iOS settings + $1The Chromium Projects http://www.chromium.org bookmark, Press tab then Enter to set Brave as the system's default browser + Set Brave as default browser button, press Enter to set Brave as the system's default browser + + + + + + Run Brave Safety Check + + + + Open Private tab + + + + Open a new Private tab to browse privately + + + + $1The Chromium Projects http://www.chromium.org bookmark, press Tab then Enter to open a new Private tab to browse privately + + + + Open Private tab button, press Enter to open a new Private tab to browse privately + + + + + + + Clear Browsing Data + + + + Set Brave as Default Browser + + + + Set Brave as the system's default browser in iOS settings + + + + $1The Chromium Projects http://www.chromium.org bookmark, Press tab then Enter to set Brave as the system's default browser in iOS settings + + + Set Brave as default browser button, press Enter to set Brave as the system's default browser in iOS settings + + + + Manage Payment Methods + + + + Open Private Tab + + + + Run Brave Safety Check + + + + Manage Settings + + + + View Your Brave History + + + + Play Brave Dino Game + + + + + Open a new Private tab to browse privately + + + + Manage Passwords + diff --git a/components/omnibox_pedal_ui_strings_override.grdp b/components/omnibox_pedal_ui_strings_override.grdp index 3622ba20c9b0..7c9bd0eeb7ad 100644 --- a/components/omnibox_pedal_ui_strings_override.grdp +++ b/components/omnibox_pedal_ui_strings_override.grdp @@ -30,4 +30,23 @@ Close Private windows button, press Enter to close all Private windows that are currently open + + Open Private tab + + + Open a new Private tab to browse privately + + + $1The Chromium Projects http://www.chromium.org bookmark, press Tab then Enter to open a new Private tab to browse privately + + + Open Private tab button, press Enter to open a new Private tab to browse privately + + + + Open Private Tab + + + Open a new Private tab to browse privately + diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index 22c4a06e9175..903580f056b5 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp @@ -5,82 +5,6 @@ referencing .grdp file or translation console pipeline breaks. --> - - - - Run Brave Safety Check - - - - Open Private tab - - - - Open a new Private tab to browse privately - - - - $1The Chromium Projects http://www.chromium.org bookmark, press Tab then Enter to open a new Private tab to browse privately - - - - Open Private tab button, press Enter to open a new Private tab to browse privately - - - - - - Clear Browsing Data - - - - Set Brave as Default Browser - - - - Manage Payment Methods - - - - Open Private Tab - - - - Run Brave Safety Check - - - - Manage Settings - - - - View Your Brave History - - - - Play Brave Dino Game - - - - - Open a new Private tab to browse privately - - - - - Manage Passwords - - $1Brave Search diff --git a/components/omnibox_strings_override.grdp b/components/omnibox_strings_override.grdp index d6d5978b7757..30391569ac4b 100644 --- a/components/omnibox_strings_override.grdp +++ b/components/omnibox_strings_override.grdp @@ -2,26 +2,6 @@ - - Open Private tab - - - Open a new Private tab to browse privately - - - $1The Chromium Projects http://www.chromium.org bookmark, press Tab then Enter to open a new Private tab to browse privately - - - Open Private tab button, press Enter to open a new Private tab to browse privately - - - - Open Private Tab - - - Open a new Private tab to browse privately - - From bc550a3e1a1208c9401a7fe626330ebba31cd66e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 17:00:47 +0000 Subject: [PATCH 051/146] base::PostTaskAndReplyWithResult removed upstream Chromium change: https://chromium.googlesource.com/chromium/src/+/582e6ce06c344a0a0b5ad5bdf1b7150283cd6c36 commit 582e6ce06c344a0a0b5ad5bdf1b7150283cd6c36 Author: Sean Maher Date: Wed Dec 7 01:02:11 2022 +0000 task posting v3: remove task_runner_util{.h,_unittest.cc} This is the final phase of the PostTaskAndReply refactor, the removal of the old API. Bug: 1026641 --- .../brave_wallet/blockchain_images_source.cc | 1 - .../ethereum_remote_client_service.cc | 1 - browser/extensions/api/ipfs_api.cc | 1 - browser/ipfs/import/ipfs_import_controller.cc | 5 ++--- .../browser/named_third_party_registry.cc | 1 - .../browser/rewards_service_impl.cc | 20 ++++++++----------- .../ad_block_subscription_download_manager.cc | 1 - .../domain_block_navigation_throttle.cc | 1 - .../browser/wallet_data_files_installer.cc | 1 - .../browser/greaselion_download_service.cc | 5 ++--- .../browser/greaselion_service_impl.cc | 5 ++--- components/ipfs/brave_ipfs_client_updater.cc | 6 ++---- .../ipfs/import/ipfs_import_worker_base.cc | 1 - .../ipfs/import/ipfs_link_import_worker.cc | 1 - components/ipfs/ipfs_service.cc | 5 ++--- .../browser/ntp_background_images_service.cc | 1 - .../playlist/browser/playlist_data_source.cc | 1 - .../browser/playlist_media_file_downloader.cc | 1 - .../speedreader_rewriter_service.cc | 5 ++--- components/tor/brave_tor_client_updater.cc | 6 ++---- .../browser/url_sanitizer_service.cc | 1 - ios/browser/api/ads/brave_ads.mm | 5 ++--- ios/browser/api/ledger/brave_ledger.mm | 1 - 23 files changed, 24 insertions(+), 52 deletions(-) diff --git a/browser/brave_wallet/blockchain_images_source.cc b/browser/brave_wallet/blockchain_images_source.cc index f76b31474616..86df73713bc5 100644 --- a/browser/brave_wallet/blockchain_images_source.cc +++ b/browser/brave_wallet/blockchain_images_source.cc @@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" diff --git a/browser/ethereum_remote_client/ethereum_remote_client_service.cc b/browser/ethereum_remote_client/ethereum_remote_client_service.cc index 7b756957c73d..f5db3ec25b81 100644 --- a/browser/ethereum_remote_client/ethereum_remote_client_service.cc +++ b/browser/ethereum_remote_client/ethereum_remote_client_service.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/browser/ethereum_remote_client/ethereum_remote_client_constants.h" #include "brave/browser/ethereum_remote_client/ethereum_remote_client_delegate.h" diff --git a/browser/extensions/api/ipfs_api.cc b/browser/extensions/api/ipfs_api.cc index 15ddd881c6ad..521743fe23c2 100644 --- a/browser/extensions/api/ipfs_api.cc +++ b/browser/extensions/api/ipfs_api.cc @@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/json/json_writer.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/browser/ipfs/ipfs_service_factory.h" diff --git a/browser/ipfs/import/ipfs_import_controller.cc b/browser/ipfs/import/ipfs_import_controller.cc index d7a9f6b58764..0c9e28382394 100644 --- a/browser/ipfs/import/ipfs_import_controller.cc +++ b/browser/ipfs/import/ipfs_import_controller.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/browser/ipfs/import/save_package_observer.h" #include "brave/browser/ipfs/ipfs_service_factory.h" @@ -171,8 +170,8 @@ void IpfsImportController::ImportCurrentPageToIpfs() { } web_contents_->Stop(); - base::PostTaskAndReplyWithResult( - file_task_runner_.get(), FROM_HERE, + file_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&CreateTempDownloadDirectory, GetDirectoryNameForWebPageImport(web_contents_->GetURL())), base::BindOnce(&IpfsImportController::SaveWebPage, diff --git a/components/brave_perf_predictor/browser/named_third_party_registry.cc b/components/brave_perf_predictor/browser/named_third_party_registry.cc index 7f454f1a9046..04ad7b5db96f 100644 --- a/components/brave_perf_predictor/browser/named_third_party_registry.cc +++ b/components/brave_perf_predictor/browser/named_third_party_registry.cc @@ -14,7 +14,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/components/brave_perf_predictor/browser/bandwidth_linreg_parameters.h" diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index fec5f6218cd3..809a96afaacd 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -33,7 +33,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "bat/ledger/global_constants.h" @@ -1030,10 +1029,9 @@ void RewardsServiceImpl::OnReconcileComplete( void RewardsServiceImpl::LoadLedgerState( ledger::client::OnLoadCallback callback) { - base::PostTaskAndReplyWithResult(file_task_runner_.get(), FROM_HERE, - base::BindOnce(&LoadStateOnFileTaskRunner, ledger_state_path_), - base::BindOnce(&RewardsServiceImpl::OnLedgerStateLoaded, - AsWeakPtr(), + file_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&LoadStateOnFileTaskRunner, ledger_state_path_), + base::BindOnce(&RewardsServiceImpl::OnLedgerStateLoaded, AsWeakPtr(), std::move(callback))); } @@ -1060,10 +1058,9 @@ void RewardsServiceImpl::OnLedgerStateLoaded( void RewardsServiceImpl::LoadPublisherState( ledger::client::OnLoadCallback callback) { - base::PostTaskAndReplyWithResult(file_task_runner_.get(), FROM_HERE, - base::BindOnce(&LoadOnFileTaskRunner, publisher_state_path_), - base::BindOnce(&RewardsServiceImpl::OnPublisherStateLoaded, - AsWeakPtr(), + file_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&LoadOnFileTaskRunner, publisher_state_path_), + base::BindOnce(&RewardsServiceImpl::OnPublisherStateLoaded, AsWeakPtr(), std::move(callback))); } @@ -1538,9 +1535,8 @@ void RewardsServiceImpl::OnDiagnosticLogDeletedForCompleteReset( publisher_info_db_path_, publisher_list_path_, }; - base::PostTaskAndReplyWithResult( - file_task_runner_.get(), FROM_HERE, - base::BindOnce(&DeleteFilesOnFileTaskRunner, paths), + file_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&DeleteFilesOnFileTaskRunner, paths), base::BindOnce(&RewardsServiceImpl::OnFilesDeletedForCompleteReset, AsWeakPtr(), std::move(callback))); } diff --git a/components/brave_shields/browser/ad_block_subscription_download_manager.cc b/components/brave_shields/browser/ad_block_subscription_download_manager.cc index c7606b6b4ad9..5f12610736aa 100644 --- a/components/brave_shields/browser/ad_block_subscription_download_manager.cc +++ b/components/brave_shields/browser/ad_block_subscription_download_manager.cc @@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" -#include "base/task/task_runner_util.h" #include "brave/components/brave_shields/browser/ad_block_service_helper.h" #include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" diff --git a/components/brave_shields/browser/domain_block_navigation_throttle.cc b/components/brave_shields/browser/domain_block_navigation_throttle.cc index fdbd39a4c423..d63ebf5f29a4 100644 --- a/components/brave_shields/browser/domain_block_navigation_throttle.cc +++ b/components/brave_shields/browser/domain_block_navigation_throttle.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" -#include "base/task/task_runner_util.h" #include "base/threading/thread_task_runner_handle.h" #include "brave/components/brave_shields/browser/ad_block_service.h" #include "brave/components/brave_shields/browser/domain_block_controller_client.h" diff --git a/components/brave_wallet/browser/wallet_data_files_installer.cc b/components/brave_wallet/browser/wallet_data_files_installer.cc index d34f2b9d3c67..a0590a647afb 100644 --- a/components/brave_wallet/browser/wallet_data_files_installer.cc +++ b/components/brave_wallet/browser/wallet_data_files_installer.cc @@ -15,7 +15,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h" diff --git a/components/greaselion/browser/greaselion_download_service.cc b/components/greaselion/browser/greaselion_download_service.cc index ba94e9d9b7bf..1858c7de53e4 100644 --- a/components/greaselion/browser/greaselion_download_service.cc +++ b/components/greaselion/browser/greaselion_download_service.cc @@ -18,7 +18,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "brave/components/brave_component_updater/browser/dat_file_util.h" @@ -265,8 +264,8 @@ void GreaselionDownloadService::OnDevModeLocalFileChanged(bool error) { void GreaselionDownloadService::LoadDirectlyFromResourcePath() { base::FilePath dat_file_path = resource_dir_.AppendASCII(kGreaselionConfigFile); - base::PostTaskAndReplyWithResult( - GetTaskRunner().get(), FROM_HERE, + GetTaskRunner()->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&brave_component_updater::GetDATFileAsString, dat_file_path), base::BindOnce(&GreaselionDownloadService::OnDATFileDataReady, diff --git a/components/greaselion/browser/greaselion_service_impl.cc b/components/greaselion/browser/greaselion_service_impl.cc index 93e4f4e2f40c..c4c72a74b125 100644 --- a/components/greaselion/browser/greaselion_service_impl.cc +++ b/components/greaselion/browser/greaselion_service_impl.cc @@ -25,7 +25,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/task_runner_util.h" #include "base/values.h" #include "base/version.h" #include "brave/components/brave_component_updater/browser/features.h" @@ -323,8 +322,8 @@ void GreaselionServiceImpl::CreateAndInstallExtensions() { // Convert script file to component extension. This must run on extension // file task runner, which was passed in in the constructor. GreaselionRule rule_copy(*rule); - base::PostTaskAndReplyWithResult( - task_runner_.get(), FROM_HERE, + task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&ConvertGreaselionRuleToExtensionOnTaskRunner, rule_copy, install_directory_), base::BindOnce(&GreaselionServiceImpl::PostConvert, diff --git a/components/ipfs/brave_ipfs_client_updater.cc b/components/ipfs/brave_ipfs_client_updater.cc index 57c11c3d7d1a..c39b371e7202 100644 --- a/components/ipfs/brave_ipfs_client_updater.cc +++ b/components/ipfs/brave_ipfs_client_updater.cc @@ -10,7 +10,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/task/task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/ipfs_utils.h" #include "components/component_updater/component_updater_service.h" @@ -111,9 +110,8 @@ void BraveIpfsClientUpdater::OnEvent(Events event, const std::string& id) { void BraveIpfsClientUpdater::OnComponentReady(const std::string& component_id, const base::FilePath& install_dir, const std::string& manifest) { - base::PostTaskAndReplyWithResult( - GetTaskRunner().get(), FROM_HERE, - base::BindOnce(&InitExecutablePath, install_dir), + GetTaskRunner()->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&InitExecutablePath, install_dir), base::BindOnce(&BraveIpfsClientUpdater::SetExecutablePath, weak_ptr_factory_.GetWeakPtr())); } diff --git a/components/ipfs/import/ipfs_import_worker_base.cc b/components/ipfs/import/ipfs_import_worker_base.cc index 0515b5f83bbd..79f7100a486d 100644 --- a/components/ipfs/import/ipfs_import_worker_base.cc +++ b/components/ipfs/import/ipfs_import_worker_base.cc @@ -15,7 +15,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "brave/components/ipfs/ipfs_constants.h" diff --git a/components/ipfs/import/ipfs_link_import_worker.cc b/components/ipfs/import/ipfs_link_import_worker.cc index bc3fdef512e3..771e43d7bf4c 100644 --- a/components/ipfs/import/ipfs_link_import_worker.cc +++ b/components/ipfs/import/ipfs_link_import_worker.cc @@ -7,7 +7,6 @@ #include -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/ipfs_network_utils.h" #include "content/public/browser/browser_thread.h" diff --git a/components/ipfs/ipfs_service.cc b/components/ipfs/ipfs_service.cc index 92fdbf8e6259..e7a38390b968 100644 --- a/components/ipfs/ipfs_service.cc +++ b/components/ipfs/ipfs_service.cc @@ -16,7 +16,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/blob_context_getter_factory.h" #include "brave/components/ipfs/buildflags/buildflags.h" @@ -667,8 +666,8 @@ void IpfsService::ShutdownDaemon(BoolCallback callback) { } void IpfsService::GetConfig(GetConfigCallback callback) { - base::PostTaskAndReplyWithResult( - file_task_runner_.get(), FROM_HERE, + file_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&LoadConfigFileOnFileTaskRunner, GetConfigFilePath()), base::BindOnce(&IpfsService::OnConfigLoaded, weak_factory_.GetWeakPtr(), std::move(callback))); diff --git a/components/ntp_background_images/browser/ntp_background_images_service.cc b/components/ntp_background_images/browser/ntp_background_images_service.cc index ac2eafadf365..0784b7867795 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.cc +++ b/components/ntp_background_images/browser/ntp_background_images_service.cc @@ -16,7 +16,6 @@ #include "base/json/json_reader.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h" #include "brave/components/brave_referrals/browser/brave_referrals_service.h" diff --git a/components/playlist/browser/playlist_data_source.cc b/components/playlist/browser/playlist_data_source.cc index a29866749cb9..4e6a1e34dd18 100644 --- a/components/playlist/browser/playlist_data_source.cc +++ b/components/playlist/browser/playlist_data_source.cc @@ -14,7 +14,6 @@ #include "base/location.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "brave/components/playlist/browser/playlist_service.h" diff --git a/components/playlist/browser/playlist_media_file_downloader.cc b/components/playlist/browser/playlist_media_file_downloader.cc index 3b39eec17e90..553ddd174f6a 100644 --- a/components/playlist/browser/playlist_media_file_downloader.cc +++ b/components/playlist/browser/playlist_media_file_downloader.cc @@ -15,7 +15,6 @@ #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/playlist/browser/playlist_constants.h" #include "brave/components/playlist/browser/playlist_types.h" diff --git a/components/speedreader/speedreader_rewriter_service.cc b/components/speedreader/speedreader_rewriter_service.cc index d8d110685cb6..a7d63f3361d1 100644 --- a/components/speedreader/speedreader_rewriter_service.cc +++ b/components/speedreader/speedreader_rewriter_service.cc @@ -19,7 +19,6 @@ #include "base/strings/stringprintf.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/speedreader/common/features.h" #include "brave/components/speedreader/common/url_readable_hints.h" @@ -116,8 +115,8 @@ SpeedreaderRewriterService::SpeedreaderRewriterService() // Manually trigger the initial stylesheet load OnFileChanged(stylesheet_override_path_, false); - base::PostTaskAndReplyWithResult( - watch_task_runner_.get(), FROM_HERE, + watch_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce( &CreateAndStartFilePathWatcher, stylesheet_override_path_, base::BindPostTask( diff --git a/components/tor/brave_tor_client_updater.cc b/components/tor/brave_tor_client_updater.cc index 752b30b1c567..f9e112bb701d 100644 --- a/components/tor/brave_tor_client_updater.cc +++ b/components/tor/brave_tor_client_updater.cc @@ -15,7 +15,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/task/task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/tor/pref_names.h" #include "brave/components/tor/tor_switches.h" @@ -190,9 +189,8 @@ base::FilePath BraveTorClientUpdater::GetTorWatchPath() const { void BraveTorClientUpdater::OnComponentReady(const std::string& component_id, const base::FilePath& install_dir, const std::string& manifest) { - base::PostTaskAndReplyWithResult( - GetTaskRunner().get(), FROM_HERE, - base::BindOnce(&InitTorPath, install_dir), + GetTaskRunner()->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&InitTorPath, install_dir), base::BindOnce(&BraveTorClientUpdater::SetTorPath, weak_ptr_factory_.GetWeakPtr())); } diff --git a/components/url_sanitizer/browser/url_sanitizer_service.cc b/components/url_sanitizer/browser/url_sanitizer_service.cc index 15b37abaf9ad..25566d375620 100644 --- a/components/url_sanitizer/browser/url_sanitizer_service.cc +++ b/components/url_sanitizer/browser/url_sanitizer_service.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "extensions/common/url_pattern.h" diff --git a/ios/browser/api/ads/brave_ads.mm b/ios/browser/api/ads/brave_ads.mm index 95beba651760..189ec4f45fa9 100644 --- a/ios/browser/api/ads/brave_ads.mm +++ b/ios/browser/api/ads/brave_ads.mm @@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "base/task/sequenced_task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h" @@ -1329,8 +1328,8 @@ - (void)setAutoDetectedAdsSubdivisionTargetingCode: - (void)runDBTransaction:(ads::mojom::DBTransactionInfoPtr)transaction callback:(ads::RunDBTransactionCallback)completion { __weak BraveAds* weakSelf = self; - base::PostTaskAndReplyWithResult( - databaseQueue.get(), FROM_HERE, + databaseQueue->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&RunDBTransactionOnTaskRunner, std::move(transaction), adsDatabase), base::BindOnce( diff --git a/ios/browser/api/ledger/brave_ledger.mm b/ios/browser/api/ledger/brave_ledger.mm index 70926378ce4f..63ed0e0c679c 100644 --- a/ios/browser/api/ledger/brave_ledger.mm +++ b/ios/browser/api/ledger/brave_ledger.mm @@ -14,7 +14,6 @@ #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "base/task/sequenced_task_runner.h" -#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequence_bound.h" #include "base/time/time.h" From af78f2e0df104dd5c14d135476b6df50f2b4ebd9 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 9 Dec 2022 17:02:06 +0000 Subject: [PATCH 052/146] Realbox merged into //components/omnibox/ Chromium change: https://chromium.googlesource.com/chromium/src/+/ba2c1458f088be59f9e1b939deb9ecfcf0aefb70 commit ba2c1458f088be59f9e1b939deb9ecfcf0aefb70 Author: Moe Ahmadi Date: Wed Dec 7 04:18:24 2022 +0000 [realbox] Moves realbox.mojom to //components/omnibox/ Merges //chrome/browser/ui/webui/realbox/realbox.mojom with //components/omnibox/browser/omnibox.mojom There are no changes to the contents of realbox.mojom. This refactoring is meant to allow sharing the mojom definition with the cross platform code and WebUI surfaces other than the NTP realbox. Bug: 1396174 --- browser/ui/bookmark/BUILD.gn | 2 +- browser/ui/sidebar/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ui/bookmark/BUILD.gn b/browser/ui/bookmark/BUILD.gn index b78e7c50a004..2530365a92aa 100644 --- a/browser/ui/bookmark/BUILD.gn +++ b/browser/ui/bookmark/BUILD.gn @@ -36,7 +36,7 @@ source_set("bookmark") { "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", "//chrome/browser/new_tab_page/modules/recipes:mojo_bindings", "//chrome/browser/ui/webui/new_tab_page:mojo_bindings", - "//chrome/browser/ui/webui/realbox:mojo_bindings", + "//components/omnibox/browser:mojo_bindings", "//ui/webui/resources/js/browser_command:mojo_bindings", ] } diff --git a/browser/ui/sidebar/BUILD.gn b/browser/ui/sidebar/BUILD.gn index dc9951481a80..d9047f0d21d3 100644 --- a/browser/ui/sidebar/BUILD.gn +++ b/browser/ui/sidebar/BUILD.gn @@ -59,7 +59,7 @@ source_set("sidebar") { "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", "//chrome/browser/new_tab_page/modules/recipes:mojo_bindings", "//chrome/browser/ui/webui/new_tab_page:mojo_bindings", - "//chrome/browser/ui/webui/realbox:mojo_bindings", + "//components/omnibox/browser:mojo_bindings", ] } } From ffc9b56c1a337bf2e028b68a5208e5406fc6a78b Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 9 Dec 2022 11:47:54 -0500 Subject: [PATCH 053/146] Types used with base::Unretained() must be completely defined on Windows Chromium change: https://source.chromium.org/chromium/chromium/src/+/9f71112e5159d90f9e3ed12386eaf50f2d93bf8c commit 9f71112e5159d90f9e3ed12386eaf50f2d93bf8c Author: Daniel Cheng Date: Wed Nov 30 20:29:16 2022 +0000 Require types used with base::Unretained() to be completely defined on Windows. LIke Linux, this initially only applies to non-test code since that provides the highest value for the amount of work required. Bug: 1392872 --- .../normal_window_search_engine_provider_service.cc | 1 + .../ui/views/permissions/permission_prompt_bubble_view.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/browser/search_engines/normal_window_search_engine_provider_service.cc b/browser/search_engines/normal_window_search_engine_provider_service.cc index 8edb1c60b54c..558e1ac1c457 100644 --- a/browser/search_engines/normal_window_search_engine_provider_service.cc +++ b/browser/search_engines/normal_window_search_engine_provider_service.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "brave/browser/search_engines/search_engine_provider_util.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/search_engines/template_url_service.h" diff --git a/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc b/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc index c17c3a5e2ebf..d7b1cba1da07 100644 --- a/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc +++ b/chromium_src/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc @@ -12,6 +12,7 @@ #include "brave/components/l10n/common/localization_util.h" #include "brave/components/permissions/permission_lifetime_utils.h" #include "brave/grit/brave_generated_resources.h" +#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/common/webui_url_constants.h" From a6cd7501f391cd08869a203b8b9f9c94abbfe83b Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 9 Dec 2022 11:55:03 -0500 Subject: [PATCH 054/146] Remove obsolete import of util.js now that it's been removed Chromium change: https://source.chromium.org/chromium/chromium/src/+/10a055f7cddc7543f637a76776bb816619d053c3 commit 10a055f7cddc7543f637a76776bb816619d053c3 Author: Rebekah Potter Date: Tue Nov 29 23:32:39 2022 +0000 WebUI: Remove $ from Android Closure UIs and make util Ash-only Bug: 1316438 --- .../resources/settings/brave_sync_page/brave_sync_subpage.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts b/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts index da409f6c8943..4d565304c0c9 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts @@ -5,8 +5,6 @@ // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck -import 'chrome://resources/js/util.js'; - import 'chrome://resources/cr_elements/cr_button/cr_button.js'; import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; import 'chrome://resources/cr_elements/icons.html.js'; From 15b14b638a76deb1b95bc279dd116e2283599920 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sun, 11 Dec 2022 13:15:44 -0500 Subject: [PATCH 055/146] Replace GetActiveUserProfile with GetLastUsedProfile on non-Android platforms Chromium change: https://source.chromium.org/chromium/chromium/src/+/ff5e9018abf5aa1ebd77f849de918c5757d3a07b commit ff5e9018abf5aa1ebd77f849de918c5757d3a07b Author: David Roger Date: Mon Dec 5 13:16:50 2022 +0000 Reland "Remove calls of GetActiveUserProfile() on desktop in /chrome/browser/profiles" This is a reland of commit 0da08f4f4fc7029b140e926d9e383ef9f9b54082 The CL was reverted because a test did not compile on Win64. This version fixes the compilation error in chrome_cleaner_reboot_dialog_controller_impl_browsertest_win.cc Original change's description: > Remove calls of GetActiveUserProfile() on desktop in /chrome/browser/profiles > > `ProfileManager::GetActiveUserProfile()` is mainly meaningful on ChromeOS > devices. It's OK to use it on Android as well (it's not ideal, but should be > harmless). On desktop platforms however, this should not be used, as it may > create a new profile, which is very unexpected for the user. > > This CL was uploaded by git cl split. > > R=msarda@chromium.org > > Bug: 1264436 > Change-Id: I96f548e25329fa4692de20c70162f3dff230fc82 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4041384 > Reviewed-by: Mihai Sardarescu > Commit-Queue: David Roger > Cr-Commit-Position: refs/heads/main@{#1078098} Bug: 1264436 --- .../ethereum_remote_client_unittest.cc | 9 ++++---- .../brave_profile_manager_browsertest.cc | 10 ++++----- browser/profiles/profile_util_unittest.cc | 14 +++++------- .../tor/tor_profile_manager_browsertest.cc | 22 +++++++++---------- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/browser/extensions/ethereum_remote_client_unittest.cc b/browser/extensions/ethereum_remote_client_unittest.cc index 6f86b1aa5f18..367bda65fce1 100644 --- a/browser/extensions/ethereum_remote_client_unittest.cc +++ b/browser/extensions/ethereum_remote_client_unittest.cc @@ -39,7 +39,7 @@ class BraveWalletUnitTest : public testing::Test { } PrefService* GetPrefs() { - return ProfileManager::GetActiveUserProfile()->GetPrefs(); + return ProfileManager::GetLastUsedProfile()->GetPrefs(); } content::BrowserTaskEnvironment task_environment_; @@ -131,8 +131,7 @@ TEST_F(BraveWalletUnitTest, TestLoadFromPrefs) { std::string cipher_seed; std::string nonce; ASSERT_TRUE(EthereumRemoteClientService::LoadFromPrefs( - ProfileManager::GetActiveUserProfile()->GetPrefs(), &cipher_seed, - &nonce)); + ProfileManager::GetLastUsedProfile()->GetPrefs(), &cipher_seed, &nonce)); constexpr std::array expected_nonce = { 200, 153, 224, 40, 58, 249, 156, 33, 152, 207, 177, 12}; @@ -156,7 +155,7 @@ TEST_F(BraveWalletUnitTest, TestSaveToPrefs) { 213, 68, 187, 103, 16, 138, 166, 0, 6, 128, 179, 64, 55, 160, 219, 8, 222, 231, 48, 93, 132, 131, 178, 177}; EthereumRemoteClientService::SaveToPrefs( - ProfileManager::GetActiveUserProfile()->GetPrefs(), + ProfileManager::GetLastUsedProfile()->GetPrefs(), std::string(cipher_seed.begin(), cipher_seed.end()), std::string(nonce.begin(), nonce.end())); @@ -166,7 +165,7 @@ TEST_F(BraveWalletUnitTest, TestSaveToPrefs) { } TEST_F(BraveWalletUnitTest, MaybeLoadCryptoWalletsExtension) { - auto* profile = ProfileManager::GetActiveUserProfile(); + auto* profile = ProfileManager::GetLastUsedProfile(); std::unique_ptr service( new EthereumRemoteClientService( profile, std::make_unique())); diff --git a/browser/profiles/brave_profile_manager_browsertest.cc b/browser/profiles/brave_profile_manager_browsertest.cc index 6d7b3b7717d2..127f40344b6b 100644 --- a/browser/profiles/brave_profile_manager_browsertest.cc +++ b/browser/profiles/brave_profile_manager_browsertest.cc @@ -1,7 +1,7 @@ -// Copyright 2019 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include @@ -140,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, ExcludeServicesInOTRAndGuestProfiles) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* profile = ProfileManager::GetActiveUserProfile(); + Profile* profile = ProfileManager::GetLastUsedProfile(); Profile* otr_profile = profile->GetPrimaryOTRProfile(/*create_if_needed=*/true); diff --git a/browser/profiles/profile_util_unittest.cc b/browser/profiles/profile_util_unittest.cc index b1062e90d384..ac9784c46dac 100644 --- a/browser/profiles/profile_util_unittest.cc +++ b/browser/profiles/profile_util_unittest.cc @@ -1,7 +1,7 @@ -// Copyright 2019 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +/* Copyright (c) 2019 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/browser/profiles/profile_util.h" @@ -29,11 +29,9 @@ class BraveProfileUtilTest : public testing::Test { ASSERT_TRUE(testing_profile_manager_.SetUp(temp_dir_.GetPath())); } - Profile* GetProfile() { return ProfileManager::GetActiveUserProfile(); } + Profile* GetProfile() { return ProfileManager::GetLastUsedProfile(); } - PrefService* GetPrefs() { - return ProfileManager::GetActiveUserProfile()->GetPrefs(); - } + PrefService* GetPrefs() { return GetProfile()->GetPrefs(); } content::BrowserTaskEnvironment task_environment_; TestingProfileManager testing_profile_manager_; diff --git a/browser/tor/tor_profile_manager_browsertest.cc b/browser/tor/tor_profile_manager_browsertest.cc index da153256f7db..3dce2ceab010 100644 --- a/browser/tor/tor_profile_manager_browsertest.cc +++ b/browser/tor/tor_profile_manager_browsertest.cc @@ -1,7 +1,7 @@ -// Copyright 2020 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" #include "base/process/launch.h" @@ -134,7 +134,7 @@ IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, SwitchToTorProfileShareBookmarks) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* parent_profile = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile = ProfileManager::GetLastUsedProfile(); // Add a bookmark in parent profile. const std::u16string title(u"Test"); @@ -184,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, SwitchToTorProfileExcludeServices) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* parent_profile = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile = ProfileManager::GetLastUsedProfile(); Profile* tor_profile = SwitchToTorProfile(parent_profile, GetTorLauncherFactory()); @@ -206,7 +206,7 @@ IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, SwitchToTorProfileInheritPrefs) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* parent_profile = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile = ProfileManager::GetLastUsedProfile(); // Set ShowBookmarkBar preference in the parent profile. PrefService* parent_prefs = parent_profile->GetPrefs(); @@ -234,7 +234,7 @@ IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* parent_profile = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile = ProfileManager::GetLastUsedProfile(); HostContentSettingsMap* parent_content_settings = HostContentSettingsMapFactory::GetForProfile(parent_profile); @@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, CloseLastTorWindow) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* parent_profile = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile = ProfileManager::GetLastUsedProfile(); EXPECT_EQ(BrowserList::GetInstance()->size(), 1u); Profile* tor_profile = SwitchToTorProfile(parent_profile, GetTorLauncherFactory()); @@ -298,7 +298,7 @@ IN_PROC_BROWSER_TEST_F(TorProfileManagerTest, CloseAllTorWindows) { ASSERT_TRUE(profile_manager); BrowserList* browser_list = BrowserList::GetInstance(); - Profile* parent_profile1 = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile1 = ProfileManager::GetLastUsedProfile(); ASSERT_NE(CreateIncognitoBrowser(parent_profile1), nullptr); ASSERT_EQ(browser_list->size(), 2u); @@ -369,7 +369,7 @@ class TorProfileManagerExtensionTest : public extensions::ExtensionBrowserTest { IN_PROC_BROWSER_TEST_F(TorProfileManagerExtensionTest, SwitchToTorProfileIncognitoEnabled) { - Profile* parent_profile = ProfileManager::GetActiveUserProfile(); + Profile* parent_profile = ProfileManager::GetLastUsedProfile(); ASSERT_TRUE(parent_profile); // Install an extension in parent profile and enable in incognito. From 4c54c161df7815f6abdc01f102e112476d7174d3 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sun, 11 Dec 2022 13:20:32 -0500 Subject: [PATCH 056/146] Initialize component updater URL feature after feature list initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium change: https://source.chromium.org/chromium/chromium/src/+/adb1c6128d5ac682478cda00c694174a6faf7413 commit adb1c6128d5ac682478cda00c694174a6faf7413 Author: François Doray Date: Wed Nov 16 22:57:38 2022 +0000 Fail immediately on feature state access without a FeatureList. Since https://crrev.com/c/4006674, registering a FeatureList in a process that previously accessed the state of a feature DCHECKs. Because the DCHECK is delayed until FeatureList registration, the error log isn't as actionnable as it could be. This CL adds FeatureList::FailOnFeatureAccessWithoutFeatureList(), which makes feature state access without a FeatureList is registered fail instantly. FailOnFeatureAccessWithoutFeatureList() is called from ContentMain(). Extra details: - Failing instantly on feature access without a FeatureList can't be the default, because this is tolerated in processes that never register a FeatureList. - We keep track of feature access without a FeatureList even if FeatureList::FailOnFeatureAccessWithoutFeatureList() hasn't been called, because: - FeatureList::FailOnFeatureAccessWithoutFeatureList() may be called later. - We want to catch early accesses in a myriad of test/utility processes that register a FeatureList but don't call FeatureList::FailOnFeatureAccessWithoutFeatureList(). Adding this call a myriad of processes wouldn't be practical or future-proof. Bug: 1358639 --- app/brave_main_delegate.cc | 12 ++++++++++++ app/brave_main_delegate.h | 4 ++-- chromium_src/chrome/app/chrome_main_delegate.cc | 6 ------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 52bac84900ad..0179d799090d 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -144,3 +144,15 @@ void BraveMainDelegate::PreSandboxStartup() { brave::InitializeResourceBundle(); } } + +absl::optional BraveMainDelegate::PostEarlyInitialization( + ChromeMainDelegate::InvokedIn invoked_in) { + auto result = ChromeMainDelegate::PostEarlyInitialization(invoked_in); + BraveCommandLineHelper command_line(base::CommandLine::ForCurrentProcess()); + std::string update_url = GetUpdateURLHost(); + if (!update_url.empty()) { + std::string source = "url-source=" + update_url; + command_line.AppendSwitchASCII(switches::kComponentUpdater, source.c_str()); + } + return result; +} diff --git a/app/brave_main_delegate.h b/app/brave_main_delegate.h index e7b0783dd9b6..0adc8fe4b8e6 100644 --- a/app/brave_main_delegate.h +++ b/app/brave_main_delegate.h @@ -6,8 +6,6 @@ #ifndef BRAVE_APP_BRAVE_MAIN_DELEGATE_H_ #define BRAVE_APP_BRAVE_MAIN_DELEGATE_H_ -#include - #include "build/build_config.h" #include "chrome/app/chrome_main_delegate.h" @@ -29,6 +27,8 @@ class BraveMainDelegate : public ChromeMainDelegate { content::ContentRendererClient* CreateContentRendererClient() override; content::ContentUtilityClient* CreateContentUtilityClient() override; void PreSandboxStartup() override; + absl::optional PostEarlyInitialization( + ChromeMainDelegate::InvokedIn invoked_in) override; }; #endif // BRAVE_APP_BRAVE_MAIN_DELEGATE_H_ diff --git a/chromium_src/chrome/app/chrome_main_delegate.cc b/chromium_src/chrome/app/chrome_main_delegate.cc index 146a1e93995b..1f1e3cdb7233 100644 --- a/chromium_src/chrome/app/chrome_main_delegate.cc +++ b/chromium_src/chrome/app/chrome_main_delegate.cc @@ -63,12 +63,6 @@ absl::optional ChromeMainDelegate::BasicStartupComplete() { command_line.AppendSwitch(switches::kDisableDomainReliability); command_line.AppendSwitch(switches::kEnableDomDistiller); - std::string update_url = GetUpdateURLHost(); - if (!update_url.empty()) { - std::string source = "url-source=" + update_url; - command_line.AppendSwitchASCII(switches::kComponentUpdater, source.c_str()); - } - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( embedder_support::kOriginTrialPublicKey)) { command_line.AppendSwitchASCII(embedder_support::kOriginTrialPublicKey, From 858c2729c3ebda670a230d954b41bfc3af1f1181 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sun, 11 Dec 2022 13:30:49 -0500 Subject: [PATCH 057/146] Adapt to GetActiveIndex now returning an absl::optional Chromium change: https://source.chromium.org/chromium/chromium/src/+/b9d161a0e7f80243e7ef6ab0195e4e3a707ae939 commit b9d161a0e7f80243e7ef6ab0195e4e3a707ae939 Author: Taylor Bergquist Date: Thu Dec 1 01:50:34 2022 +0000 Replace kNoTab with absl::optional throughout TabStrip view-side classes. I did not change TabStripModel nor TabStripController, which still speak kNoTab themselves. TabStrip still has to deal with kNoTab when it talks to its TabStripController. Several other changes came along with this, e.g. some fixes to discovered bugs: - TabStrip::GetModelIndexOf now returns nullopt if the tab is in the TabStrip's viewmodel, but at an index that's not in the model. This happens transiently during tab removal, especially when removing multiple tabs at once, e.g. when closing a tab group. - Fixed a bug where CompoundTabContainer::GetModelIndexOf didn't check for kNoTab when looking in the unpinned container. It now correctly returns nullopt when the slot_view can't be found in either container. Previously it would do math is if the unpinned container's index was valid, even if it was kNoTab i.e. -1. This was t> - Fixed a bug with consecutiveness detection during initialization of header drags, where tab group headers, with an index of -1, were only consecutive if the actual tabs were at index 0. - Changed hover card interactive ui tests, which were impacted by the change to TabStrip::GetModelIndexOf because they were adding tabs directly to the TabStrip view that weren't present in the model. Change-Id: I10302414a5fa6007a2c32c45014c635d5e8bb35d --- browser/ui/views/tabs/brave_tab_hover_browsertest.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/ui/views/tabs/brave_tab_hover_browsertest.cc b/browser/ui/views/tabs/brave_tab_hover_browsertest.cc index 248f2b01073d..87519353262e 100644 --- a/browser/ui/views/tabs/brave_tab_hover_browsertest.cc +++ b/browser/ui/views/tabs/brave_tab_hover_browsertest.cc @@ -59,7 +59,10 @@ class BraveTabHoverTest : public InProcessBrowserTest { return browser_view->tabstrip(); } - Tab* active_tab() { return tabstrip()->tab_at(tabstrip()->GetActiveIndex()); } + Tab* active_tab() { + TabStripModel* tab_strip_model = browser()->tab_strip_model(); + return tabstrip()->tab_at(tab_strip_model->active_index()); + } void HoverOverTab(Tab* tab) { // Note: As stated in |tab_hover_card_bubble_view_browsertest.cc| we don't @@ -84,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(BraveTabHoverTest, TabRendererData data; data.visible_url = GURL("https://example.com"); data.title = u"Hello World"; - tabstrip()->SetTabData(tabstrip()->GetActiveIndex(), data); + tabstrip()->SetTabData(browser()->tab_strip_model()->active_index(), data); EXPECT_EQ(u"Hello World", active_tab()->data().title); browser()->profile()->GetPrefs()->SetInteger(brave_tabs::kTabHoverMode, @@ -109,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(BraveTabHoverTest, ThumbnailHelperIsAlwaysAttached) { data.visible_url = GURL("https://card.com"); data.title = u"Hello World"; tabstrip()->AddTabAt(0, data); - EXPECT_EQ(0, tabstrip()->GetActiveIndex()); + EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); EXPECT_EQ(data.visible_url, active_tab()->data().visible_url); EXPECT_NE(nullptr, content::WebContentsUserData::FromWebContents( @@ -120,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(BraveTabHoverTest, ThumbnailHelperIsAlwaysAttached) { data.visible_url = GURL("https://card-with-preview.com"); data.title = u"Foo Bar"; tabstrip()->AddTabAt(0, data); - EXPECT_EQ(0, tabstrip()->GetActiveIndex()); + EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); EXPECT_EQ(data.visible_url, active_tab()->data().visible_url); EXPECT_NE(nullptr, content::WebContentsUserData::FromWebContents( From e8ea9ed7f62d53808357c0e74ade0e096bd3b9ad Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sun, 11 Dec 2022 13:36:14 -0500 Subject: [PATCH 058/146] Make Settings WebUI pages compliant with TrustedTypes Spec here: https://chromium.googlesource.com/chromium/src/+/master/docs/trusted_types_on_webui.md Chromium change: https://source.chromium.org/chromium/chromium/src/+/e9a7dd47cf4c616f0cfb8fae15acd8014231610f commit e9a7dd47cf4c616f0cfb8fae15acd8014231610f Author: dpapad Date: Wed Nov 16 22:02:56 2022 +0000 Settings: Enable TrustedTypes CSP checks, part 1. This is a subset of the original CL at crrev.com/c/4010818 which was reverted. In this part, updating Settings to be TrustedTypes compliant, but not enabling TrustedTypes checks yet, since there is still a problem with cr_lottie.ts usage of Worker that is not TrustedTypes compliant (crbug.com/1385477), causing > TrustedTypes checks will be enabled in a follow-up when the Worker issue is addressed. Bug: 1098690,1385477 --- .../brave_overrides/appearance_page.ts | 106 +++-- .../clear_browsing_data_dialog.ts | 39 +- .../personalization_options.ts | 12 +- .../settings/brave_overrides/privacy_page.ts | 427 ++++++++++++++---- .../settings/brave_overrides/search_page.ts | 10 +- .../settings/brave_overrides/site_details.ts | 135 ++++-- .../brave_overrides/site_settings_page.ts | 25 +- 7 files changed, 575 insertions(+), 179 deletions(-) diff --git a/browser/resources/settings/brave_overrides/appearance_page.ts b/browser/resources/settings/brave_overrides/appearance_page.ts index c4701dc42944..e6d4052b42f9 100644 --- a/browser/resources/settings/brave_overrides/appearance_page.ts +++ b/browser/resources/settings/brave_overrides/appearance_page.ts @@ -9,6 +9,7 @@ import {RegisterPolymerTemplateModifications} from 'chrome://resources/polymer_o import {I18nBehavior} from 'chrome://resources/i18n_behavior.js' import {Router} from '../router.js' import {loadTimeData} from '../i18n_setup.js' +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' import '../brave_appearance_page/super_referral.js' import '../brave_appearance_page/brave_theme.js' @@ -30,9 +31,12 @@ RegisterPolymerTemplateModifications({ useDefaultButtonTemplate.setAttribute("restamp", "true") } theme.setAttribute("class", "settings-row hr") - theme.insertAdjacentHTML('beforebegin', ` - - `) + theme.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + + + `) } const r = Router.getInstance().routes_ // Super-referral @@ -60,15 +64,19 @@ RegisterPolymerTemplateModifications({ if (!bookmarkBarToggle) { console.error(`[Brave Settings Overrides] Couldn't find bookmark bar toggle`) } else { - bookmarkBarToggle.insertAdjacentHTML('beforebegin', ` - - - `) + bookmarkBarToggle.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + + + `) - bookmarkBarToggle.insertAdjacentHTML('afterend', ` - - - `) + bookmarkBarToggle.insertAdjacentHTML( + 'afterend', + getTrustedHTML` + + + `) // Remove Chromium bookmark toggle becasue it is replaced by // settings-brave-appearance-bookmark-bar bookmarkBarToggle.remove() @@ -77,24 +85,47 @@ RegisterPolymerTemplateModifications({ if (!zoomLevel || !zoomLevel.parentNode) { console.error(`[Brave Settings Overrides] Couldn't find zoomLevel`) } else { - zoomLevel.parentNode.insertAdjacentHTML('afterend', ` - - - `) - const isSpeedreaderEnabled = loadTimeData.getBoolean('isSpeedreaderFeatureEnabled') - if (isSpeedreaderEnabled) { - zoomLevel.parentNode.insertAdjacentHTML('afterend', ` + zoomLevel.parentNode.insertAdjacentHTML( + 'afterend', + getTrustedHTML` + id="mru-cycling" + pref="{{prefs.brave.mru_cycling_enabled}}" - `) + `) + const mruCyclingToggle = templateContent.getElementById('mru-cycling') + if (!mruCyclingToggle) { + console.error( + '[Brave Settings Overrides] Couldn\'t find MRU cycling toggle') + } else { + mruCyclingToggle.setAttribute( + 'label', I18nBehavior.i18n('mruCyclingSettingLabel')) + } + const isSpeedreaderEnabled = + loadTimeData.getBoolean('isSpeedreaderFeatureEnabled') + if (isSpeedreaderEnabled) { + zoomLevel.parentNode.insertAdjacentHTML( + 'afterend', + getTrustedHTML` + + `) + const speedreaderToggle = templateContent.getElementById('speedreader') + if (!speedreaderToggle) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Speedreader toggle') + } else { + speedreaderToggle.setAttribute( + 'label', I18nBehavior.i18n('speedreaderSettingLabel')) + speedreaderToggle.setAttribute( + 'sub-label', I18nBehavior.i18n('speedreaderSettingSubLabel')) + speedreaderToggle.setAttribute( + 'learn-more-url', I18nBehavior.i18n('speedreaderLearnMoreURL')) + } } } @@ -112,16 +143,19 @@ RegisterPolymerTemplateModifications({ if (!pages) { console.error(`[Brave Settings Overrides] Couldn't find appearance_page #pages`) } else { - pages.insertAdjacentHTML('beforeend', ` - - `) + pages.insertAdjacentHTML( + 'beforeend', + getTrustedHTML` + + `) } }, }) diff --git a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts index f8d57d3fb44d..f28226ad6615 100644 --- a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts +++ b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.ts @@ -9,6 +9,7 @@ import {html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min. import {BraveSettingsClearBrowsingDataDialogElement} from '../brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.js' import {RegisterPolymerComponentReplacement, RegisterPolymerTemplateModifications, RegisterStyleOverride} from 'chrome://resources/polymer_overriding.js' import {loadTimeData} from '../i18n_setup.js' +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' RegisterStyleOverride( 'settings-clear-browsing-data-dialog', @@ -37,8 +38,12 @@ RegisterPolymerTemplateModifications({ } tabsElement.insertAdjacentHTML( 'beforeend', - `` - ) + getTrustedHTML` + + `) // Append Save button. const confirmButtonElement = templateContent.querySelector('#clearBrowsingDataConfirm') @@ -48,10 +53,20 @@ RegisterPolymerTemplateModifications({ } confirmButtonElement.insertAdjacentHTML( 'afterend', - `` - ) + getTrustedHTML` + + `) + const saveButton = + templateContent.getElementById('saveOnExitSettingsConfirm') + if (!saveButton) { + console.error('[Brave Settings Overrides] Couldn\'t find save button') + } else { + saveButton.textContent = loadTimeData.getString('save') + } // Append rewards reset data link const body = templateContent.querySelector('[slot="body"]') @@ -61,6 +76,16 @@ RegisterPolymerTemplateModifications({ } body.insertAdjacentHTML( 'beforeend', - `${loadTimeData.getString('resetRewardsData')}`) + getTrustedHTML` + + `) + const rewardsResetLink = + templateContent.getElementById('rewards-reset-data') + if (!rewardsResetLink) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Rewards reset link') + } else { + rewardsResetLink.textContent = loadTimeData.getString('resetRewardsData') + } } }) diff --git a/browser/resources/settings/brave_overrides/personalization_options.ts b/browser/resources/settings/brave_overrides/personalization_options.ts index 768a4f59a032..bc89e8a11606 100644 --- a/browser/resources/settings/brave_overrides/personalization_options.ts +++ b/browser/resources/settings/brave_overrides/personalization_options.ts @@ -3,9 +3,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -// @ts-nocheck TODO(petemill): Define types and remove ts-nocheck - import {RegisterPolymerTemplateModifications} from 'chrome://resources/polymer_overriding.js' +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' import '../brave_privacy_page/brave_personalization_options.js' @@ -15,9 +14,12 @@ RegisterPolymerTemplateModifications({ if (!metricsReportingControl) { console.error(`[Brave Settings Overrides] Couldn't find metricsReportingControl`) } else { - metricsReportingControl.insertAdjacentHTML('beforebegin', ` - - `) + metricsReportingControl.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + + + `) } }, }) diff --git a/browser/resources/settings/brave_overrides/privacy_page.ts b/browser/resources/settings/brave_overrides/privacy_page.ts index 007be3dca482..1001c2992071 100644 --- a/browser/resources/settings/brave_overrides/privacy_page.ts +++ b/browser/resources/settings/brave_overrides/privacy_page.ts @@ -7,7 +7,309 @@ import {RegisterPolymerTemplateModifications} from 'chrome://resources/polymer_overriding.js' import {I18nBehavior} from 'chrome://resources/i18n_behavior.js' -import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' + +function InsertGoogleSignInSubpage ( + templateContent: DocumentFragment, + pages: Element) +{ + pages.insertAdjacentHTML( + 'beforeend', + getTrustedHTML` + + `) + const googleSignInTemplate = templateContent. + querySelector('[route-path="/content/googleSignIn"]') + if (!googleSignInTemplate) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Google signin template') + } else { + const googleSignInSubpage = + googleSignInTemplate.content.querySelector('settings-subpage') + if (!googleSignInSubpage) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Google signin subpage') + } else { + googleSignInSubpage.setAttribute('page-title', + I18nBehavior.i18n('siteSettingsCategoryGoogleSignIn')) + const googleSignInDefault = + googleSignInTemplate.content.getElementById('googleSignInDefault') + if (!googleSignInDefault) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Google signin default') + } else { + googleSignInDefault.setAttribute( + 'toggle-off-label', + I18nBehavior.i18n('siteSettingsGoogleSignInBlock')) + googleSignInDefault.setAttribute( + 'toggle-on-label', + I18nBehavior.i18n('siteSettingsGoogleSignInAllow')) + } + const googleSignInExceptions = + googleSignInTemplate.content.getElementById('googleSignInExceptions') + if (!googleSignInExceptions) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Google signin exceptions') + } else { + googleSignInExceptions.setAttribute( + 'block-header', + I18nBehavior.i18n('siteSettingsGoogleSignInBlock')) + googleSignInExceptions.setAttribute( + 'allow-header', + I18nBehavior.i18n('siteSettingsGoogleSignInAllow')) + } + } + } +} + +function InsertAutoplaySubpage ( + templateContent: DocumentFragment, + pages: Element) +{ + pages.insertAdjacentHTML( + 'beforeend', + getTrustedHTML` + `) + const autoplayTemplate = templateContent. + querySelector('[route-path="/content/autoplay"]') + if (!autoplayTemplate) { + console.error( + '[Brave Settings Overrides] Couldn\'t find autoplay template') + } else { + const autoplaySubpage = + autoplayTemplate.content.querySelector('settings-subpage') + if (!autoplaySubpage) { + console.error( + '[Brave Settings Overrides] Couldn\'t find autoplay subpage') + } else { + autoplaySubpage.setAttribute('page-title', + I18nBehavior.i18n('siteSettingsCategoryAutoplay')) + const autoplayDefault = + autoplayTemplate.content.getElementById('autoplayDefault') + if (!autoplayDefault) { + console.error( + '[Brave Settings Overrides] Couldn\'t find autoplay default') + } else { + autoplayDefault.setAttribute( + 'toggle-off-label', + I18nBehavior.i18n('siteSettingsAutoplayBlock')) + autoplayDefault.setAttribute( + 'toggle-on-label', + I18nBehavior.i18n('siteSettingsAutoplayAllow')) + } + const autoplayExceptions = + autoplayTemplate.content.getElementById('autoplayExceptions') + if (!autoplayExceptions) { + console.error( + '[Brave Settings Overrides] Couldn\'t find autoplay exceptions') + } else { + autoplayExceptions.setAttribute( + 'block-header', + I18nBehavior.i18n('siteSettingsBlock')) + autoplayExceptions.setAttribute( + 'allow-header', + I18nBehavior.i18n('siteSettingsAllow')) + } + } + } +} + +function InsertEthereumSubpage ( + templateContent: DocumentFragment, + pages: Element) +{ + pages.insertAdjacentHTML( + 'beforeend', + getTrustedHTML` + `) + const ethereumTemplate = templateContent. + querySelector('[route-path="/content/ethereum"]') + if (!ethereumTemplate) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Ethereum template') + } else { + const ethereumSubpage = + ethereumTemplate.content.querySelector('settings-subpage') + if (!ethereumSubpage) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Ethereum subpage') + } else { + ethereumSubpage.setAttribute('page-title', + I18nBehavior.i18n('siteSettingsCategoryEthereum')) + const ethereumDefault = + ethereumTemplate.content.getElementById('ethereumDefault') + if (!ethereumDefault) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Ethereum default') + } else { + ethereumDefault.setAttribute( + 'toggle-off-label', + I18nBehavior.i18n('siteSettingsEthereumBlock')) + ethereumDefault.setAttribute( + 'toggle-on-label', + I18nBehavior.i18n('siteSettingsEthereumAsk')) + } + const ethereumExceptions = + ethereumTemplate.content.getElementById('ethereumExceptions') + if (!ethereumExceptions) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Ethereum exceptions') + } else { + ethereumExceptions.setAttribute( + 'block-header', + I18nBehavior.i18n('siteSettingsBlock')) + ethereumExceptions.setAttribute( + 'allow-header', + I18nBehavior.i18n('siteSettingsAllow')) + } + } + } +} + +function InsertSolanaSubpage ( + templateContent: DocumentFragment, + pages: Element) +{ + pages.insertAdjacentHTML( + 'beforeend', + getTrustedHTML` + `) + const solanaTemplate = templateContent. + querySelector('[route-path="/content/solana"]') + if (!solanaTemplate) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Solana template') + } else { + const solanaSubpage = + solanaTemplate.content.querySelector('settings-subpage') + if (!solanaSubpage) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Solana subpage') + } else { + solanaSubpage.setAttribute('page-title', + I18nBehavior.i18n('siteSettingsCategorySolana')) + const solanaDefault = + solanaTemplate.content.getElementById('solanaDefault') + if (!solanaDefault) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Solana default') + } else { + solanaDefault.setAttribute( + 'toggle-off-label', + I18nBehavior.i18n('siteSettingsSolanaBlock')) + solanaDefault.setAttribute( + 'toggle-on-label', + I18nBehavior.i18n('siteSettingsSolanaAsk')) + } + const solanaExceptions = + solanaTemplate.content.getElementById('solanaExceptions') + if (!solanaExceptions) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Solana exceptions') + } else { + solanaExceptions.setAttribute( + 'block-header', + I18nBehavior.i18n('siteSettingsBlock')) + solanaExceptions.setAttribute( + 'allow-header', + I18nBehavior.i18n('siteSettingsAllow')) + } + } + } +} + +function InsertShieldsSubpage ( + templateContent: DocumentFragment, + pages: Element) +{ + pages.insertAdjacentHTML( + 'beforeend', + getTrustedHTML` + `) + const shieldsTemplate = templateContent. + querySelector('[route-path="/content/braveShields"]') + if (!shieldsTemplate) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Shields template') + } else { + const shieldsSubpage = + shieldsTemplate.content.querySelector('settings-subpage') + if (!shieldsSubpage) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Shields subpage') + } else { + shieldsSubpage.setAttribute('page-title', + I18nBehavior.i18n('siteSettingsShieldsStatus')) + const shieldsExceptions = + shieldsTemplate.content.getElementById('shieldsExceptions') + if (!shieldsExceptions) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Shields exceptions') + } else { + shieldsExceptions.setAttribute( + 'block-header', + I18nBehavior.i18n('siteSettingsShieldsDown')) + shieldsExceptions.setAttribute( + 'allow-header', + I18nBehavior.i18n('siteSettingsShieldsUp')) + } + } + } +} RegisterPolymerTemplateModifications({ 'settings-privacy-page': (templateContent) => { @@ -15,25 +317,6 @@ RegisterPolymerTemplateModifications({ if (!pages) { console.error(`[Brave Settings Overrides] Couldn't find privacy_page #pages`) } else { - const isGoogleSignInFeatureEnabled = loadTimeData.getBoolean('isGoogleSignInFeatureEnabled') - if (isGoogleSignInFeatureEnabled) { - pages.insertAdjacentHTML('beforeend', ` - - `) - } if (!loadTimeData.getBoolean('isIdleDetectionFeatureEnabled')) { const idleDetection = templateContent.querySelector('[route-path="/content/idleDetection"]') if (!idleDetection) { @@ -42,88 +325,58 @@ RegisterPolymerTemplateModifications({ idleDetection.content.firstElementChild.hidden = true } } - pages.insertAdjacentHTML('beforeend', ` - - `) + const isGoogleSignInFeatureEnabled = + loadTimeData.getBoolean('isGoogleSignInFeatureEnabled') + if (isGoogleSignInFeatureEnabled) { + InsertGoogleSignInSubpage(templateContent, pages) + } + InsertAutoplaySubpage(templateContent, pages) const isNativeBraveWalletEnabled = loadTimeData.getBoolean('isNativeBraveWalletFeatureEnabled') if (isNativeBraveWalletEnabled) { - pages.insertAdjacentHTML('beforeend', ` - - `) - pages.insertAdjacentHTML('beforeend', ` - - `) + InsertEthereumSubpage(templateContent, pages) + InsertSolanaSubpage(templateContent, pages) } - pages.insertAdjacentHTML('beforeend', ` - - `) + InsertShieldsSubpage(templateContent, pages) } if (!loadTimeData.getBoolean('isPrivacySandboxRestricted')) { - const privacySandboxTemplate = templateContent.querySelector(`template[if*='isPrivacySandboxRestricted_']`) - if (!privacySandboxTemplate) { - console.error('[Brave Settings Overrides] Could not find template with if*=isPrivacySandboxRestricted_ on privacy page.') + const privacySandboxSettings3Template = templateContent. + querySelector(`template[if*='isPrivacySandboxSettings3Enabled_']`) + if (!privacySandboxSettings3Template) { + console.error( + '[Brave Settings Overrides] Could not find template with ' + + 'if*=isPrivacySandboxSettings3Enabled_ on privacy page.') } else { - const privacySandboxLinkRow = privacySandboxTemplate.content.getElementById('privacySandboxLinkRow') + const privacySandboxLinkRow = privacySandboxSettings3Template.content. + getElementById('privacySandboxLinkRow') if (!privacySandboxLinkRow) { console.error('[Brave Settings Overrides] Could not find privacySandboxLinkRow id on privacy page.') } else { privacySandboxLinkRow.setAttribute('hidden', 'true') } - const privacySandboxLink = privacySandboxTemplate.content.getElementById('privacySandboxLink') + const privacySandboxLink = privacySandboxSettings3Template.content. + getElementById('privacySandboxLink') if (!privacySandboxLink) { console.error('[Brave Settings Overrides] Could not find privacySandboxLink id on privacy page.') } else { - privacySandboxTemplate.setAttribute('hidden', 'true') + privacySandboxSettings3Template.setAttribute('hidden', 'true') + } + } + const privacySandboxSettings4Template = templateContent. + querySelector(`template[if*='isPrivacySandboxSettings4Enabled_']`) + if (!privacySandboxSettings4Template) { + console.error( + '[Brave Settings Overrides] Could not find template with ' + + 'if*=isPrivacySandboxSettings4Enabled_ on privacy page.') + } else { + const privacySandboxLinkRow = privacySandboxSettings4Template.content. + getElementById('privacySandboxLinkRow') + if (!privacySandboxLinkRow) { + console.error( + '[Brave Settings Overrides] Could not find privacySandboxLinkRow ' + + 'id on privacy page.') + } else { + privacySandboxLinkRow.setAttribute('hidden', 'true') } } } diff --git a/browser/resources/settings/brave_overrides/search_page.ts b/browser/resources/settings/brave_overrides/search_page.ts index ee006b683290..df75c338fe28 100644 --- a/browser/resources/settings/brave_overrides/search_page.ts +++ b/browser/resources/settings/brave_overrides/search_page.ts @@ -4,6 +4,7 @@ // you can obtain one at https://mozilla.org/MPL/2.0/. import {RegisterPolymerTemplateModifications} from 'chrome://resources/polymer_overriding.js' +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' import '../brave_search_engines_page/brave_search_engines_page.js' @@ -13,9 +14,12 @@ RegisterPolymerTemplateModifications({ if (!enginesSubpageTrigger) { console.error(`[Brave Settings Overrides] Couldn't find enginesSubpageTrigger`) } else { - enginesSubpageTrigger.insertAdjacentHTML('beforebegin', ` - - `) + enginesSubpageTrigger.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + + + `) } } }) diff --git a/browser/resources/settings/brave_overrides/site_details.ts b/browser/resources/settings/brave_overrides/site_details.ts index f635a5676c77..e06498355f70 100644 --- a/browser/resources/settings/brave_overrides/site_details.ts +++ b/browser/resources/settings/brave_overrides/site_details.ts @@ -7,7 +7,8 @@ import {RegisterPolymerTemplateModifications} from 'chrome://resources/polymer_overriding.js' import {I18nBehavior} from 'chrome://resources/i18n_behavior.js' -import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' RegisterPolymerTemplateModifications({ 'site-details': (templateContent) => { @@ -29,54 +30,118 @@ RegisterPolymerTemplateModifications({ if (!firstPermissionItem) { console.error(`[Brave Settings Overrides] Couldn't find first permission item`) } else { - firstPermissionItem.insertAdjacentHTML('beforebegin', ` - - - `) - const isGoogleSignInFeatureEnabled = loadTimeData.getBoolean('isGoogleSignInFeatureEnabled') - if (isGoogleSignInFeatureEnabled) { - firstPermissionItem.insertAdjacentHTML('beforebegin', ` + firstPermissionItem.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + category="[[contentSettingsTypesEnum_.AUTOPLAY]]" + icon="cr:extension"> `) + const autoplaySettings = templateContent. + querySelector('div.list-frame > site-details-permission:nth-child(1)') + if (!autoplaySettings) { + console.error( + '[Brave Settings Overrides] Couldn\'t find autoplay settings') + } else { + autoplaySettings.setAttribute( + 'label', I18nBehavior.i18n('siteSettingsAutoplay')) + } + const isGoogleSignInFeatureEnabled = + loadTimeData.getBoolean('isGoogleSignInFeatureEnabled') + if (isGoogleSignInFeatureEnabled) { + firstPermissionItem.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + + + `) + } + const googleSignInSettings = templateContent. + querySelector('div.list-frame > site-details-permission:nth-child(2)') + if (!googleSignInSettings) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Google signin settings') + } else { + googleSignInSettings.setAttribute( + 'label', I18nBehavior.i18n('siteSettingsGoogleSignIn')) } const isNativeBraveWalletEnabled = loadTimeData.getBoolean('isNativeBraveWalletFeatureEnabled') if (isNativeBraveWalletEnabled) { - firstPermissionItem.insertAdjacentHTML('beforebegin', ` - - - `) - firstPermissionItem.insertAdjacentHTML('beforebegin', ` - + + `) + const ethereumSettings = templateContent. + querySelector('div.list-frame > site-details-permission:nth-child(3)') + if (!ethereumSettings) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Ethereum settings') + } else { + ethereumSettings.setAttribute( + 'label', I18nBehavior.i18n('siteSettingsEthereum')) + } + firstPermissionItem.insertAdjacentHTML( + 'beforebegin', + getTrustedHTML` + - - `) + icon="cr:extension"> + + `) + const solanaSettings = templateContent. + querySelector('div.list-frame > site-details-permission:nth-child(4)') + if (!solanaSettings) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Solana settings') + } else { + solanaSettings.setAttribute( + 'label', I18nBehavior.i18n('siteSettingsSolana')) + } } } const usageSection = templateContent.querySelector('div#usage') if (!usageSection) { console.error(`[Brave Settings Overrides] Couldn't find usageSection item`) } else { - usageSection.insertAdjacentHTML('afterend', ` -

-
-

${I18nBehavior.i18n('siteSettingsShields')}

+ usageSection.insertAdjacentHTML( + 'afterend', + getTrustedHTML` +
+
+

+
+
+ + +
-
- - -
-
- `) + `) + const shieldsHeader = + templateContent.querySelector('div#shieldsHeader h2') + if (!shieldsHeader) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Shields header') + } else { + shieldsHeader.textContent = I18nBehavior.i18n('siteSettingsShields') + } + const shieldsSettings = templateContent.querySelector( + 'div#shields div.list-frame > site-details-permission:nth-child(1)') + if (!shieldsSettings) { + console.error( + '[Brave Settings Overrides] Couldn\'t find Shields settings') + } else { + shieldsSettings.setAttribute( + 'label', I18nBehavior.i18n('siteSettingsShieldsStatus')) + } } - }, + } }) diff --git a/browser/resources/settings/brave_overrides/site_settings_page.ts b/browser/resources/settings/brave_overrides/site_settings_page.ts index de30aaa3562f..2a372a534dea 100644 --- a/browser/resources/settings/brave_overrides/site_settings_page.ts +++ b/browser/resources/settings/brave_overrides/site_settings_page.ts @@ -7,7 +7,8 @@ import {RegisterPolymerComponentReplacement, RegisterPolymerTemplateModifications} from 'chrome://resources/polymer_overriding.js' import {ContentSettingsTypes} from '../site_settings/constants.js' -import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; +import {getTrustedHTML} from 'chrome://resources/js/static_types.js' import {I18nBehavior} from 'chrome://resources/i18n_behavior.js'; import {SettingsSiteSettingsPageElement} from '../site_settings_page/site_settings_page.js' import {routes} from '../route.js' @@ -27,13 +28,25 @@ RegisterPolymerTemplateModifications({ console.error('[Brave Settings Overrides] Could not find all sites list') return } - allSites.insertAdjacentHTML('afterend', ` -

${I18nBehavior.i18n('siteSettingsShields')}

- +

+
+ - - `) + + `) + const siteSettingsShieldsTitle = + templateContent.getElementById('siteSettingsShields') + if (!siteSettingsShieldsTitle) { + console.error('[Brave Settings Overrides] Couldn\'t find shields title') + } else { + siteSettingsShieldsTitle.textcontent = + I18nBehavior.i18n('siteSettingsShields') + } } }) From 1084f72643116fc4976671a238ed1654a006bad3 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sun, 11 Dec 2022 13:43:09 -0500 Subject: [PATCH 059/146] Remove obsolete checks for FilterFledgeAllowedParties Chromium change: https://source.chromium.org/chromium/chromium/src/+/d40b7fc29a9b93d6e29c8d5a1533e37039a2fa88 commit d40b7fc29a9b93d6e29c8d5a1533e37039a2fa88 Author: Rohit Agarwal Date: Wed Nov 30 13:02:22 2022 +0000 Privacy Sandbox Settings: Access control updates for Fledge This CL updates access control functions for fledge in M1 to respect the new preference and site data exceptions. Bug: 1378703 --- .../privacy_sandbox_settings_unittest.cc | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc index f16aa13b9977..8e0199dda350 100644 --- a/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc +++ b/chromium_src/components/privacy_sandbox/privacy_sandbox_settings_unittest.cc @@ -117,11 +117,6 @@ TEST_F(PrivacySandboxSettingsTest, PreferenceOverridesDefaultContentSetting) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); // An allow exception should not override the preference value. privacy_sandbox_test_util::SetupTestState( @@ -154,11 +149,6 @@ TEST_F(PrivacySandboxSettingsTest, PreferenceOverridesDefaultContentSetting) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); } TEST_F(PrivacySandboxSettingsTest, CookieBlockExceptionsNeverApply) { @@ -192,11 +182,6 @@ TEST_F(PrivacySandboxSettingsTest, CookieBlockExceptionsNeverApply) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); // User created exceptions should not apply if a managed default coookie // setting exists. What the managed default setting actually is should *not* @@ -231,11 +216,6 @@ TEST_F(PrivacySandboxSettingsTest, CookieBlockExceptionsNeverApply) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); // Managed content setting exceptions. privacy_sandbox_test_util::SetupTestState( @@ -280,11 +260,6 @@ TEST_F(PrivacySandboxSettingsTest, CookieBlockExceptionsNeverApply) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); // A less specific block exception. privacy_sandbox_test_util::SetupTestState( @@ -342,11 +317,6 @@ TEST_F(PrivacySandboxSettingsTest, CookieBlockExceptionsNeverApply) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://another-test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); // Exceptions which specify a wildcard top frame origin. privacy_sandbox_test_util::SetupTestState( @@ -377,11 +347,6 @@ TEST_F(PrivacySandboxSettingsTest, CookieBlockExceptionsNeverApply) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com"), - GURL("https://another-embedded.com")})); } TEST_F(PrivacySandboxSettingsTest, IsFledgeAllowed) { @@ -398,10 +363,6 @@ TEST_F(PrivacySandboxSettingsTest, IsFledgeAllowed) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com")})); // FLEDGE should be disabled if all cookies are blocked. privacy_sandbox_test_util::SetupTestState( @@ -416,10 +377,6 @@ TEST_F(PrivacySandboxSettingsTest, IsFledgeAllowed) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com")})); // FLEDGE should be disabled if the privacy sandbox is disabled, regardless // of other cookie settings. @@ -439,10 +396,6 @@ TEST_F(PrivacySandboxSettingsTest, IsFledgeAllowed) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com")})); // The managed cookie content setting should not override a disabled privacy // sandbox setting. @@ -458,10 +411,6 @@ TEST_F(PrivacySandboxSettingsTest, IsFledgeAllowed) { EXPECT_FALSE(privacy_sandbox_settings()->IsFledgeAllowed( url::Origin::Create(GURL("https://test.com")), url::Origin::Create(GURL("https://embedded.com")))); - EXPECT_EQ(std::vector{}, - privacy_sandbox_settings()->FilterFledgeAllowedParties( - url::Origin::Create(GURL("https://test.com")), - {GURL("https://embedded.com")})); } TEST_F(PrivacySandboxSettingsTest, IsPrivacySandboxEnabled) { From 53afc726e62548426ef8ff57bdfd22c01fbf6d0f Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 12 Dec 2022 09:22:35 -0500 Subject: [PATCH 060/146] [Android] isIsolatedSplitInstalled no longer takes context argument Chromium change: https://source.chromium.org/chromium/chromium/src/+/cbc10dc889c8503d2d494f91290d12ca58bc7aa9 commit cbc10dc889c8503d2d494f91290d12ca58bc7aa9 Author: Andrew Grieve Date: Thu Nov 17 01:48:23 2022 +0000 Android: Improve ergonomics of BundleUtils methods By not requiring Context to be passed, and by removing outlining via ApiHelperForO. Bug: 846456 --- .../chrome/browser/base/SplitCompatJobIntentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java b/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java index 3d264b8388c5..3ac1e4df0e3c 100644 --- a/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java +++ b/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java @@ -33,7 +33,7 @@ public SplitCompatJobIntentService(String serviceClassName, String splitName) { @Override protected void attachBaseContext(Context context) { // Make sure specified split is installed, otherwise fall back to chrome split. - if (mSplitName != null && BundleUtils.isIsolatedSplitInstalled(context, mSplitName)) { + if (mSplitName != null && BundleUtils.isIsolatedSplitInstalled(mSplitName)) { context = BundleUtils.createIsolatedSplitContext(context, mSplitName); } else { context = SplitCompatApplication.createChromeContext(context); From 5ddbf7dfd9b9704e2784c3026d579b58f2c0844a Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 12 Dec 2022 09:47:22 -0500 Subject: [PATCH 061/146] [Android] Replace org.chromium.base.{Predicate,BooleanSupplier} with Java's Chromium change: https://source.chromium.org/chromium/chromium/src/+/f9ec79d1297b85283c16ff8693d7f694227ee89b commit f9ec79d1297b85283c16ff8693d7f694227ee89b Author: Victor Hugo Vianna Silva Date: Tue Nov 15 17:26:01 2022 +0000 Replace org.chromium.base.{Predicate,BooleanSupplier} with Java's Unblocked my the min Sdk being bumped to 24. Bug: 1034012 --- .../chromium/chrome/browser/crypto_wallet/util/JavaUtils.java | 3 +-- .../org/chromium/chrome/browser/crypto_wallet/util/Utils.java | 2 +- .../chrome/browser/omnibox/BraveLocationBarCoordinator.java | 3 ++- .../chrome/browser/omnibox/BraveLocationBarMediator.java | 3 ++- .../toolbar/top/BraveTabSwitcherModeTTCoordinator.java | 3 ++- .../chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java | 2 +- .../browser/toolbar/top/BraveTopToolbarCoordinator.java | 2 +- .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 4 +++- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java index 549a23df6ad8..93de8dec3b92 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java @@ -5,11 +5,10 @@ package org.chromium.chrome.browser.crypto_wallet.util; -import org.chromium.base.Predicate; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; public class JavaUtils { public static List safeVal(List list) { diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java index fbe26d2086da..8998d775f704 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java @@ -62,7 +62,6 @@ import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -import org.chromium.base.Predicate; import org.chromium.brave_wallet.mojom.AccountInfo; import org.chromium.brave_wallet.mojom.AssetPriceTimeframe; import org.chromium.brave_wallet.mojom.AssetRatioService; @@ -127,6 +126,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.ExecutorService; +import java.util.function.Predicate; public class Utils { public static int ONBOARDING_FIRST_PAGE_ACTION = 1; diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java index 29a838e0dd4d..e0f49cf885ca 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java @@ -13,7 +13,6 @@ import org.chromium.base.Callback; import org.chromium.base.jank_tracker.JankTracker; -import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.back_press.BackPressManager; @@ -36,6 +35,8 @@ import org.chromium.ui.base.WindowDelegate; import org.chromium.ui.modaldialog.ModalDialogManager; +import java.util.function.BooleanSupplier; + public class BraveLocationBarCoordinator extends LocationBarCoordinator { private LocationBarMediator mLocationBarMediator; private View mQRButton; diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java index 7702c40fa062..b7991297ea10 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java @@ -15,7 +15,6 @@ import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.BraveReflectionUtil; -import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.OneshotSupplierImpl; @@ -30,6 +29,8 @@ import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.permissions.PermissionCallback; +import java.util.function.BooleanSupplier; + public class BraveLocationBarMediator extends LocationBarMediator { private WindowAndroid mWindowAndroid; private LocationBarLayout mLocationBarLayout; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java index 743f9f982405..62075dac02f8 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java @@ -7,9 +7,10 @@ import android.view.ViewStub; -import org.chromium.base.supplier.BooleanSupplier; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import java.util.function.BooleanSupplier; + class BraveTabSwitcherModeTTCoordinator extends TabSwitcherModeTTCoordinator { private TabSwitcherModeTopToolbar mActiveTabSwitcherToolbar; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index c8c4d952a37b..fd70b7335bff 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -57,7 +57,6 @@ import org.chromium.base.Log; import org.chromium.base.MathUtils; import org.chromium.base.ThreadUtils; -import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.task.AsyncTask; import org.chromium.base.task.PostTask; @@ -154,6 +153,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.function.BooleanSupplier; public abstract class BraveToolbarLayoutImpl extends ToolbarLayout implements BraveToolbarLayout, OnClickListener, View.OnLongClickListener, diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 06ba4e75d62f..a2e3ff88d30e 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -10,7 +10,6 @@ import android.view.ViewStub; import org.chromium.base.Callback; -import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; @@ -37,6 +36,7 @@ import org.chromium.ui.resources.ResourceManager; import java.util.List; +import java.util.function.BooleanSupplier; public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { private TabSwitcherModeTTCoordinator mTabSwitcherModeCoordinator; diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index d9862913200e..545820965421 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -27,11 +27,11 @@ import org.chromium.base.Callback; import org.chromium.base.jank_tracker.JankTracker; -import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.base.test.util.Batch; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; @@ -125,12 +125,14 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; +import java.util.function.BooleanSupplier; /** * Tests to check whether classes, methods and fields exist for bytecode manipulation. * See classes from 'brave/build/android/bytecode/java/org/brave/bytecode' folder. * Classes, methods and fields should be whitelisted in 'brave/android/java/apk_for_test.flags'. */ +@Batch(Batch.PER_CLASS) @RunWith(ChromeJUnit4ClassRunner.class) public class BytecodeTest { @Test From e0cc414f47f69c51a76e16621aae25456eb6ded1 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 12 Dec 2022 10:22:56 -0500 Subject: [PATCH 062/146] [Android] APICompatibilityUtils.setAccessibilityTraversalBefore removed Chromium change: https://source.chromium.org/chromium/chromium/src/+/b10db9ecd15f578c91321ed035858f692a5b5561 commit b10db9ecd15f578c91321ed035858f692a5b5561 Author: Patrick Noland Date: Tue Nov 15 19:07:20 2022 +0000 Clean up APICompatibilityUtils for N as min SDK This removes a variety of unneeded API level checks. Trivial cases (1-2 references, ~one line of code) are removed and inlined at the call site. Bug: 1376253 --- .../chromium/chrome/browser/toolbar/BraveToolbarManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 15fc4fbbbecd..6d3d6dc80a4a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -15,7 +15,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; import org.chromium.base.CallbackController; import org.chromium.base.jank_tracker.JankTracker; @@ -292,8 +291,7 @@ public void initializeWithNative(LayoutManagerImpl layoutManager, newTabClickHandler, mWindowAndroid, mTabCountProvider, mIncognitoStateProvider, mActivity.findViewById(R.id.control_container), closeAllTabsAction); - ApiCompatibilityUtils.setAccessibilityTraversalBefore( - mLocationBar.getContainerView(), R.id.bottom_toolbar); + mLocationBar.getContainerView().setAccessibilityTraversalBefore(R.id.bottom_toolbar); } } From de50db52bed55093f03d96aa94cd2e45c2197094 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 13 Dec 2022 09:42:20 -0500 Subject: [PATCH 063/146] New sync model type added for power bookmarks Chromium change: https://source.chromium.org/chromium/chromium/src/+/b14e0817f302ac4eda701e19bedfe8f97c1100e3 commit b14e0817f302ac4eda701e19bedfe8f97c1100e3 Author: Yuheng Huang Date: Tue Dec 6 06:43:19 2022 +0000 Power Bookmarks: Add new sync model type This CL adds a new sync model type for power bookmarks. It uses the existing UserSelectableType::kBookmarks to control its on/off state. Bug: 1392502 --- chromium_src/components/sync/base/model_type_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/components/sync/base/model_type_unittest.cc b/chromium_src/components/sync/base/model_type_unittest.cc index 4d139f1ceb24..ba69ece16aa7 100644 --- a/chromium_src/components/sync/base/model_type_unittest.cc +++ b/chromium_src/components/sync/base/model_type_unittest.cc @@ -14,7 +14,7 @@ TEST_F(ModelTypeTest, EncryptableUserTypes) { // This test is supposed to fail when sync types are increased/decreased TEST_F(ModelTypeTest, ModelTypeCounts) { - EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 56); + EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 57); } } // namespace From 207d691dfb35dd4142b7d54bc0a16b81a0249730 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 13 Dec 2022 10:24:55 -0500 Subject: [PATCH 064/146] Expect THIN SPACE (U+202F) for the space before AM/PM in date formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium change: https://source.chromium.org/chromium/chromium/src/+/4e30468e9b3563d7b45e7ade7a1256f69e6967d8 commit 4e30468e9b3563d7b45e7ade7a1256f69e6967d8 Author: Frank Tang Date: Sat Nov 19 01:38:03 2022 +0000 Migrating ICU from 71 to 72 ICU72 release note https://icu.unicode.org/download/72 CLDR42 release note https://cldr.unicode.org/index/downloads/cldr-42 Unicode15 release note https://blog.unicode.org/2022/09/announcing-unicode-standard-version-150.html Changing test expectation: 1. Use THIN SPACE (U+202F) for the space before "AM/PM" in date formatting. 2. Bidi control code around some dash in date format output. Change the space around – \u2013 U+2013 "En Dash" from ASCII SPACE to \u20> 3. @ is now consider part of a word. ICU 72 migration diary https://docs.google.com/document/d/1bzme4zR_swaqMoJIYLL9wwk-rsjdAdjGrU073h0TJbo Ref about 2009 https://www.compart.com/en/unicode/U+2009 Ref about 202f https://www.compart.com/en/unicode/U+202f Size Impact due to increase of more unicode characters and localized patterns: - Fuchsia web_engine +16384 bytes compressed - Fuchsia chrome_fuchsia +24576 bytes compressed - Android Normalized APK Size: +107854 bytes Bug: 1371208 --- .../ads/internal/diagnostics/diagnostic_manager_unittest.cc | 4 ++-- .../entries/catalog_last_updated_diagnostic_entry_unittest.cc | 2 +- .../entries/last_unidle_time_diagnostic_entry_unittest.cc | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/diagnostic_manager_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/diagnostic_manager_unittest.cc index 9eb8738aa352..cae59728a0d0 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/diagnostic_manager_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/diagnostic_manager_unittest.cc @@ -67,11 +67,11 @@ TEST_F(BatAdsDiagnosticManagerTest, DiagnosticManager) { }, { "name": "Catalog last updated", - "value": "Wednesday, November 18, 1970 at 12:34:56 PM" + "value": "Wednesday, November 18, 1970 at 12:34:56\u202fPM" }, { "name": "Last unidle time", - "value": "Monday, July 8, 1996 at 9:25:00 AM" + "value": "Monday, July 8, 1996 at 9:25:00\u202fAM" } ])~"); ASSERT_TRUE(expected_list.is_list()); diff --git a/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/catalog_last_updated_diagnostic_entry_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/catalog_last_updated_diagnostic_entry_unittest.cc index 14c44bd99e6f..7cb52bc5df75 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/catalog_last_updated_diagnostic_entry_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/catalog_last_updated_diagnostic_entry_unittest.cc @@ -31,7 +31,7 @@ TEST_F(BatAdsCatalogLastUpdatedDiagnosticEntryTest, CatalogLastUpdated) { EXPECT_EQ(DiagnosticEntryType::kCatalogLastUpdated, diagnostic_entry.GetType()); EXPECT_EQ("Catalog last updated", diagnostic_entry.GetName()); - EXPECT_EQ("Wednesday, November 18, 1970 at 12:34:56 PM", + EXPECT_EQ("Wednesday, November 18, 1970 at 12:34:56\u202fPM", diagnostic_entry.GetValue()); } diff --git a/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/last_unidle_time_diagnostic_entry_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/last_unidle_time_diagnostic_entry_unittest.cc index 4beb61118090..aead9d4920ff 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/last_unidle_time_diagnostic_entry_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/diagnostics/entries/last_unidle_time_diagnostic_entry_unittest.cc @@ -28,7 +28,8 @@ TEST_F(BatAdsLastUnIdleTimeDiagnosticEntryTest, LastUnIdleTime) { // Assert EXPECT_EQ(DiagnosticEntryType::kLastUnIdleTime, diagnostic_entry.GetType()); EXPECT_EQ("Last unidle time", diagnostic_entry.GetName()); - EXPECT_EQ("Monday, July 8, 1996 at 12:34:56 PM", diagnostic_entry.GetValue()); + EXPECT_EQ("Monday, July 8, 1996 at 12:34:56\u202fPM", + diagnostic_entry.GetValue()); } TEST_F(BatAdsLastUnIdleTimeDiagnosticEntryTest, WasNeverUnIdle) { From 2ea7edb6c371b950291b3d36379a016c233bddba Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 14 Dec 2022 17:56:29 +0000 Subject: [PATCH 065/146] Support updater on official builds Chromium change: https://chromium.googlesource.com/chromium/src/+/ce2a2d3c5e7a7401f4d6d86afdbb8030c79bd8a4 commit ce2a2d3c5e7a7401f4d6d86afdbb8030c79bd8a4 Author: Thiago Perrotta Date: Wed Nov 16 16:47:54 2022 +0000 Disable upgrade notifications for Chrome for Testing. Chrome for Testing binaries should have a fixed version and never update, therefore upgrade notifications are not applicable to it. Design document: https://goo.gle/chrome-for-testing#bookmark=id.13k53phkvm0y Bug: 1336611 --- build/commands/lib/config.js | 2 ++ ...er-upgrade_detector-upgrade_detector_impl.cc.patch | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index e55d3dfd9d17..24b66da92c78 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -327,6 +327,8 @@ Config.prototype.buildArgs = function () { sparkle_eddsa_public_key: this.sparkleEdDSAPublicKey, use_goma: this.use_goma, use_libfuzzer: this.use_libfuzzer, + enable_updater: this.isOfficialBuild(), + enable_update_notifications: this.isOfficialBuild(), ...this.extraGnArgs, } diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch deleted file mode 100644 index 0f0b9862cd68..000000000000 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -index 3e6b2000510aea83c4844e7f6dfb13bebd345902..0c3c591fdcbc7ae1d64169a934d9fd9f853d8a6d 100644 ---- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -@@ -476,7 +476,7 @@ void UpgradeDetectorImpl::Init() { - --#if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS) -+#if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS) || defined(OFFICIAL_BUILD) - - // On macOS, only enable upgrade notifications if the updater (Keystone) is - // present. From 9679d9631614bd72bc8e86898c997702a1df95e8 Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 14 Dec 2022 12:28:48 -0500 Subject: [PATCH 066/146] Retrieving device type through device form factor Chromium change: https://chromium.googlesource.com/chromium/src/+/6e70c0991251ee05d583758bd90fba1d08ae419a commit 6e70c0991251ee05d583758bd90fba1d08ae419a Author: Jood Hajeer Date: Fri Nov 18 10:14:39 2022 +0000 Clean up unused deviceType in ForeignSessionHelper and iOS code. Clean up unused deviceType in ForeignSessionHelper. Clean up unused device_type in iOS code. Bug: 1358151 --- build/commands/lib/config.js | 3 + build/rust/BUILD.gn | 7 +- ios/browser/api/opentabs/brave_opentabs_api.h | 23 +-- .../api/opentabs/brave_opentabs_api.mm | 166 +++++++++++------- 4 files changed, 118 insertions(+), 81 deletions(-) diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index 24b66da92c78..5e66b2a61a22 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -521,6 +521,9 @@ Config.prototype.buildArgs = function () { if (this.targetEnvironment) { args.target_environment = this.targetEnvironment } + if (this.targetArch == 'x64' && this.isDebug()) { + args.use_lld = false + } args.enable_dsyms = true args.enable_stripping = !this.isComponentBuild() // Component builds are not supported for iOS: diff --git a/build/rust/BUILD.gn b/build/rust/BUILD.gn index 72fb9f57350f..44c2a7c8fe55 100644 --- a/build/rust/BUILD.gn +++ b/build/rust/BUILD.gn @@ -1,3 +1,8 @@ +# Copyright (c) 2022 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + import("//brave/build/cargo.gni") if (is_mac) { @@ -19,7 +24,7 @@ config("strip_rust_symbols") { # Too many personalities workaround. Will be fixed in llvm see # https://reviews.llvm.org/D135728 if (!is_component_build && !use_lld) { - ldflags = [ "-Wl,-no_compact_unwind" ] + ldflags += [ "-Wl,-no_compact_unwind" ] } } } diff --git a/ios/browser/api/opentabs/brave_opentabs_api.h b/ios/browser/api/opentabs/brave_opentabs_api.h index 8e7ff872e8cd..3de77150603c 100644 --- a/ios/browser/api/opentabs/brave_opentabs_api.h +++ b/ios/browser/api/opentabs/brave_opentabs_api.h @@ -10,16 +10,12 @@ NS_ASSUME_NONNULL_BEGIN -typedef NSInteger SyncDeviceType NS_TYPED_ENUM; +typedef NSInteger SyncDeviceFormFactor NS_TYPED_ENUM; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeUnset; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeWin; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeMac; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeLinux; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeCros; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeOther; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypePhone; -OBJC_EXPORT SyncDeviceType const SyncDeviceTypeTablet; +OBJC_EXPORT SyncDeviceFormFactor const SyncDeviceFormFactorUnknown; +OBJC_EXPORT SyncDeviceFormFactor const SyncDeviceFormFactorDesktop; +OBJC_EXPORT SyncDeviceFormFactor const SyncDeviceFormFactorPhone; +OBJC_EXPORT SyncDeviceFormFactor const SyncDeviceFormFactorTablet; @protocol OpenTabsSessionStateObserver; @protocol OpenTabsSessionStateListener; @@ -55,20 +51,19 @@ OBJC_EXPORT @property(nonatomic, nullable, copy) NSString* name; @property(nonatomic, copy) NSString* sessionTag; @property(nonatomic, nullable, copy) NSDate* modifiedTime; -@property(nonatomic) SyncDeviceType deviceType; -@property(nonatomic, strong) NSArray* tabs; +@property(nonatomic) SyncDeviceFormFactor deviceFormFactor; +@property(nonatomic, strong, readonly) NSArray* tabs; /// Open Tab Constructor used with OpenTabSessionAPI /// @param name - This is the name of the device for the distant session /// @param sessionTag - Uniquely identifies the distant session /// @param modifiedTime - The time last distant session is modified -/// @param deviceType - The type of synced device for the distant session +/// @param deviceFormFactor - The type of synced device for the distant session /// @param tabs - The open tabs synced with the particular session - (instancetype)initWithName:(nullable NSString*)name sessionTag:(NSString*)sessionTag dateCreated:(nullable NSDate*)modifiedTime - deviceType:(SyncDeviceType)deviceType - tabs:(NSArray*)tabs; + deviceFormFactor:(SyncDeviceFormFactor)deviceFormFactor; @end NS_SWIFT_NAME(BraveOpenTabsAPI) diff --git a/ios/browser/api/opentabs/brave_opentabs_api.mm b/ios/browser/api/opentabs/brave_opentabs_api.mm index 6575a8ddf2ab..3db7347b5227 100644 --- a/ios/browser/api/opentabs/brave_opentabs_api.mm +++ b/ios/browser/api/opentabs/brave_opentabs_api.mm @@ -8,7 +8,9 @@ #include "brave/ios/browser/api/opentabs/opentabs_session_listener_ios.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "components/sync/driver/sync_service.h" +#include "components/sync_device_info/device_info.h" #include "components/sync_sessions/open_tabs_ui_delegate.h" #include "components/sync_sessions/session_sync_service.h" #include "ios/chrome/browser/ui/recent_tabs/synced_sessions.h" @@ -18,22 +20,14 @@ #error "This file requires ARC support." #endif -SyncDeviceType const SyncDeviceTypeUnset = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_UNSET); -SyncDeviceType const SyncDeviceTypeWin = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_WIN); -SyncDeviceType const SyncDeviceTypeMac = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_MAC); -SyncDeviceType const SyncDeviceTypeLinux = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_LINUX); -SyncDeviceType const SyncDeviceTypeCros = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_CROS); -SyncDeviceType const SyncDeviceTypeOther = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_OTHER); -SyncDeviceType const SyncDeviceTypePhone = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_PHONE); -SyncDeviceType const SyncDeviceTypeTablet = static_cast( - sync_pb::SyncEnums::DeviceType::SyncEnums_DeviceType_TYPE_TABLET); +SyncDeviceFormFactor const SyncDeviceFormFactorUnknown = + static_cast(syncer::DeviceInfo::FormFactor::kUnknown); +SyncDeviceFormFactor const SyncDeviceFormFactorDesktop = + static_cast(syncer::DeviceInfo::FormFactor::kDesktop); +SyncDeviceFormFactor const SyncDeviceFormFactorPhone = + static_cast(syncer::DeviceInfo::FormFactor::kPhone); +SyncDeviceFormFactor const SyncDeviceFormFactorTablet = + static_cast(syncer::DeviceInfo::FormFactor::kTablet); #pragma mark - IOSOpenDistantTab @@ -79,19 +73,22 @@ - (void)updateOpenDistantTab:(NSURL*)url title:(NSString*)title { #pragma mark - IOSOpenDistantSession +@interface IOSOpenDistantSession () +@property(nonatomic, strong) NSArray* tabs; +@end + @implementation IOSOpenDistantSession - (instancetype)initWithName:(nullable NSString*)name sessionTag:(NSString*)sessionTag dateCreated:(nullable NSDate*)modifiedTime - deviceType:(SyncDeviceType)deviceType - tabs:(NSArray*)tabs { + deviceFormFactor:(SyncDeviceFormFactor)deviceFormFactor { if ((self = [super init])) { self.name = name; self.sessionTag = sessionTag; self.modifiedTime = modifiedTime; - self.deviceType = deviceType; - self.tabs = tabs; + self.deviceFormFactor = deviceFormFactor; + self.tabs = [[NSMutableArray alloc] init]; } return self; @@ -102,11 +99,11 @@ - (id)copyWithZone:(NSZone*)zone { [[[self class] allocWithZone:zone] init]; if (openDistantSession) { - openDistantSession.name = self.name; - openDistantSession.sessionTag = self.sessionTag; - openDistantSession.modifiedTime = self.modifiedTime; - openDistantSession.deviceType = self.deviceType; - openDistantSession.tabs = self.tabs; + openDistantSession.name = [self.name copy]; + openDistantSession.sessionTag = [self.sessionTag copy]; + openDistantSession.modifiedTime = [self.modifiedTime copy]; + openDistantSession.deviceFormFactor = self.deviceFormFactor; + openDistantSession.tabs = [self.tabs copy]; } return openDistantSession; @@ -116,6 +113,41 @@ - (void)updateOpenDistantSessionModified:(NSDate*)modifiedTime { [self setModifiedTime:modifiedTime]; } +// Helper to extract the relevant content from a SessionTab and add it to a +// DistantSession. +- (void)addTab:(const sessions::SessionTab&)session_tab + sessionTag:(const std::string&)session_tag { + if (session_tab.navigations.size() > 0) { + // Retrieve tab index + int index = session_tab.current_navigation_index; + if (index < 0) { + index = 0; + } + + if (index > static_cast(session_tab.navigations.size()) - 1) { + index = session_tab.navigations.size() - 1; + } + + // Retrieve tab title and url + const sessions::SerializedNavigationEntry* navigation = + &session_tab.navigations[index]; + std::string tab_title = base::UTF16ToUTF8(navigation->title()); + GURL virtual_url = navigation->virtual_url(); + + if (tab_title.empty()) { + tab_title = navigation->virtual_url().spec(); + } + + // Store the tab + IOSOpenDistantTab* distant_tab = [[IOSOpenDistantTab alloc] + initWithURL:net::NSURLWithGURL(virtual_url) + title:base::SysUTF8ToNSString(tab_title) + tabId:session_tab.tab_id.id() + sessionTag:base::SysUTF8ToNSString(session_tag)]; + [(NSMutableArray*)_tabs addObject:distant_tab]; + } +} + @end #pragma mark - BraveOpenTabsAPI @@ -158,52 +190,54 @@ - (void)removeObserver:(id)observer { } - (NSArray*)getSyncedSessions { - // Getting SyncedSessions from SessionSyncService - auto syncedSessions = - std::make_unique(session_sync_service_); - - NSMutableArray* distantSessionList = - [[NSMutableArray alloc] init]; - - // Traversing Sync Sessions to fetch list of Distant Sessions - for (size_t sessionIndex = 0; - sessionIndex < syncedSessions->GetSessionCount(); sessionIndex++) { - const synced_sessions::DistantSession* session = - syncedSessions->GetSession(sessionIndex); - - // Create a DistantTab List information for each Distant Session - NSArray* distantTabs = - [self onDistantTabResults:session->tabs]; - - IOSOpenDistantSession* distantSession = [[IOSOpenDistantSession alloc] - initWithName:base::SysUTF8ToNSString(session->name) - sessionTag:base::SysUTF8ToNSString(session->tag) - dateCreated:session->modified_time.ToNSDate() - deviceType:static_cast(session->device_type) - tabs:distantTabs]; - [distantSessionList addObject:distantSession]; - } + // Taken from: ios/chrome/browser/ui/recent_tabs/synced_sessions.mm + // but modified to allow us to retrieve `device_type` via + // GetDeviceFormFactor() - return [distantSessionList copy]; -} - -- (NSArray*)onDistantTabResults: - (const std::vector>&) - distantTabList { - NSMutableArray* distantTabs = + NSMutableArray* sessions_list = [[NSMutableArray alloc] init]; - for (const auto& tab : distantTabList) { - IOSOpenDistantTab* distantTab = [[IOSOpenDistantTab alloc] - initWithURL:net::NSURLWithGURL(tab->virtual_url) - title:base::SysUTF16ToNSString(tab->title) - tabId:tab->tab_id.id() - sessionTag:base::SysUTF8ToNSString(tab->session_tag)]; - - [distantTabs addObject:distantTab]; + DCHECK(session_sync_service_); + // Reload Sync open tab sessions. + sync_sessions::OpenTabsUIDelegate* open_tabs_delegate = + session_sync_service_->GetOpenTabsUIDelegate(); + if (open_tabs_delegate) { + // Iterating through all remote sessions, then retrieving the tabs to + // display to the user. + std::vector sessions; + open_tabs_delegate->GetAllForeignSessions(&sessions); + + for (const auto* session : sessions) { + // Create a distant session + IOSOpenDistantSession* distant_session = [[IOSOpenDistantSession alloc] + initWithName:base::SysUTF8ToNSString(session->session_name) + sessionTag:base::SysUTF8ToNSString(session->session_tag) + dateCreated:session->modified_time.ToNSDate() + deviceFormFactor:static_cast( + session->GetDeviceFormFactor())]; + + // Add tabs to the distant session + std::vector open_tabs; + open_tabs_delegate->GetForeignSessionTabs(session->session_tag, + &open_tabs); + for (const sessions::SessionTab* session_tab : open_tabs) { + [distant_session addTab:*session_tab sessionTag:session->session_tag]; + } + + // Don't display sessions with no tabs. + if (![distant_session.tabs count]) { + [sessions_list addObject:distant_session]; + } + } + + // Sort Sessions by Time + [sessions_list sortedArrayUsingComparator:^NSComparisonResult( + IOSOpenDistantSession* a, IOSOpenDistantSession* b) { + return [[a modifiedTime] compare:[b modifiedTime]]; + }]; } - return [distantTabs copy]; + return [sessions_list copy]; } - (void)deleteSyncedSession:(NSString*)sessionTag { From e5c53a028f513acdc55bdb539cd44dd4506825a0 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 14 Dec 2022 15:07:37 +0000 Subject: [PATCH 067/146] ExtractFaviconURL takes a base::Value::List Chromium change: https://chromium.googlesource.com/chromium/src/+/e28187bd4cfe942517fc40fa65d567dad0eab2be commit e28187bd4cfe942517fc40fa65d567dad0eab2be Author: Matt Menke Date: Tue Nov 29 16:02:39 2022 +0000 Migrate ios/web/favicon/favicon_util.h to newer base::Value APIs. Replace its use of deprecated APIs (Value::ConstListView, Value::Append(), Value::SetKey()) with non-deprecated ones (Value::List, Value::List::Append(), Value::Dict::Set()). Bug: 1338341 --- ios/browser/api/favicon/favicon_driver.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/browser/api/favicon/favicon_driver.mm b/ios/browser/api/favicon/favicon_driver.mm index f028cff513ec..433d4ea05b0f 100644 --- a/ios/browser/api/favicon/favicon_driver.mm +++ b/ios/browser/api/favicon/favicon_driver.mm @@ -146,8 +146,8 @@ - (void)webView:(WKWebView*)webView const GURL message_request_url = message.request_url().value(); std::vector urls; - if (!ExtractFaviconURL(message.body()->GetListDeprecated(), - message_request_url, &urls)) { + if (!ExtractFaviconURL(message.body()->GetList(), message_request_url, + &urls)) { return; } From e4f6934b2eaba52c8fc29d43add2fc0042338d16 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 14 Dec 2022 15:08:49 +0000 Subject: [PATCH 068/146] LookalikeUrlMatchType::kSiteEngagement to kSkeletonMatchSiteEngagement Chromium change: https://chromium.googlesource.com/chromium/src/+/2253bc21a62d870da233fbee34f1aba43ff28251 commit 2253bc21a62d870da233fbee34f1aba43ff28251 Author: Mustafa Emre Acer Date: Tue Nov 22 00:46:10 2022 +0000 Lookalikes: Rename a lookalike match type enum Bug: 1386300 --- ios/browser/api/url/url_spoof_checker.h | 2 +- ios/browser/api/url/url_spoof_checker.mm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ios/browser/api/url/url_spoof_checker.h b/ios/browser/api/url/url_spoof_checker.h index d60707c8bf4d..2f4949ac0290 100644 --- a/ios/browser/api/url/url_spoof_checker.h +++ b/ios/browser/api/url/url_spoof_checker.h @@ -26,7 +26,7 @@ typedef NSInteger BraveSpoofCheckerLookalikeURLMatchType NS_TYPED_ENUM OBJC_EXPORT BraveSpoofCheckerLookalikeURLMatchType const BraveSpoofCheckerLookalikeURLMatchTypeNone; OBJC_EXPORT BraveSpoofCheckerLookalikeURLMatchType const - BraveSpoofCheckerLookalikeURLMatchTypeSiteEngagement; + BraveSpoofCheckerLookalikeURLMatchTypeSkeletonMatchSiteEngagement; OBJC_EXPORT BraveSpoofCheckerLookalikeURLMatchType const BraveSpoofCheckerLookalikeURLMatchTypeEditDistance; OBJC_EXPORT BraveSpoofCheckerLookalikeURLMatchType const diff --git a/ios/browser/api/url/url_spoof_checker.mm b/ios/browser/api/url/url_spoof_checker.mm index f570dec2754c..e5ba8716c90b 100644 --- a/ios/browser/api/url/url_spoof_checker.mm +++ b/ios/browser/api/url/url_spoof_checker.mm @@ -40,8 +40,9 @@ BraveSpoofCheckerLookalikeURLMatchTypeNone = static_cast(LookalikeUrlMatchType::kNone); BraveSpoofCheckerLookalikeURLMatchType const - BraveSpoofCheckerLookalikeURLMatchTypeSiteEngagement = - static_cast(LookalikeUrlMatchType::kSiteEngagement); + BraveSpoofCheckerLookalikeURLMatchTypeSkeletonMatchSiteEngagement = + static_cast( + LookalikeUrlMatchType::kSkeletonMatchSiteEngagement); BraveSpoofCheckerLookalikeURLMatchType const BraveSpoofCheckerLookalikeURLMatchTypeEditDistance = static_cast(LookalikeUrlMatchType::kEditDistance); From 669463021b589e0fdf1afe115b82d28ab31e7849 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 14 Dec 2022 19:15:00 +0000 Subject: [PATCH 069/146] Ignoring unreacheable code for ios svg Unfortunately there's some unreachable code in upstream skia, which is causing a failure on the iOS build. A fix will be submitted upstream, but in the meantime we should just disable the warning for this specific target including skia files directly. --- ios/browser/svg/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ios/browser/svg/BUILD.gn b/ios/browser/svg/BUILD.gn index e3043341f8bd..baa69dde94b1 100644 --- a/ios/browser/svg/BUILD.gn +++ b/ios/browser/svg/BUILD.gn @@ -6,7 +6,10 @@ import("//third_party/skia/modules/svg/svg.gni") source_set("svg") { - cflags_cc = [ "-Wno-extra-semi" ] + cflags_cc = [ + "-Wno-extra-semi", + "-Wno-unreachable-code-aggressive", + ] configs += [ "//build/config/compiler:enable_arc" ] From 82e7d786ef746ed2a29b425f70f25d92bff03286 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 05:08:28 +0000 Subject: [PATCH 070/146] Update from Chromium 110.0.5464.2 to Chromium 110.0.5476.3. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76a9a9a76851..6ffcf1ca63c8 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5464.2", + "tag": "110.0.5476.3", "repository": { "url": "https://github.com/chromium/chromium" } From 85bc246d5a2a475b18211087ab1789e42f7cc710 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 05:53:18 +0000 Subject: [PATCH 071/146] Conflict-resolved patches from Chromium 110.0.5464.2 to Chromium 110.0.5476.3. --- patches/chrome-VERSION.patch | 6 ++-- patches/chrome-android-java_sources.gni.patch | 14 ++++----- ...cy_page-personalization_options.html.patch | 29 +++++++++---------- ...-browser-resources-settings-route.ts.patch | 12 ++++---- ...background_service-proto-entry.proto.patch | 6 ++-- ...kground_service-proto_conversions.cc.patch | 10 +++---- ...public-background_service-clients.cc.patch | 8 ++--- ...-public-background_service-clients.h.patch | 6 ++-- ...net-http-transport_security_state.cc.patch | 6 ++-- patches/ui-webui-resources-BUILD.gn.patch | 10 +++---- 10 files changed, 53 insertions(+), 54 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index a12e1f6e01a7..31f8295fae73 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 153a1f6db9c596ffebc69f00c56950fabd732096..9b25ffed33ab7a81fa8f6774e1b6351e83cb1482 100644 +index 7cb2bf247bc8dd97dfe58c5749a5969d17f93e26..27da1238ca47fda5a3a0d37c1ad075b0775ed3eb 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 --BUILD=5464 --PATCH=2 +-BUILD=5476 +-PATCH=3 +MINOR=1 +BUILD=49 +PATCH=59 diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch index f1f197b2923e..9513f4370f72 100644 --- a/patches/chrome-android-java_sources.gni.patch +++ b/patches/chrome-android-java_sources.gni.patch @@ -1,12 +1,12 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni -index f641e3648151503d0dadb1ad3476a64f70f530eb..00f3197f30cc4232371ac7e9d9194625a5c5f12b 100644 +index 3c71a40ccc6cab2de1f3f26d655a86ae9b68bc8a..e2a3f775e5e2d409af9e576b95c5b53a10498632 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -26,6 +26,7 @@ import("//components/offline_pages/buildflags/features.gni") - import("//device/vr/buildflags/buildflags.gni") - - chrome_java_sources += public_autofill_assistant_java_sources -+chrome_java_sources += brave_java_sources - +@@ -27,6 +27,7 @@ import("//device/vr/buildflags/buildflags.gni") if (enable_vr) { chrome_java_sources += [ "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java" ] + } ++chrome_java_sources += brave_java_sources + + # Only used for testing, should not be shipped to end users. + if (enable_offline_pages_harness) { diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch index 5aa5e1dcd5f6..1cdacc5c67f7 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html -index 5c5dea3eb6c0b8ede27a972927a2214e1e356343..8af6a8fd4202653dddcf02c0b409f43a094d1344 100644 +index aad9cef9ec72a3535af7264b748be053b7ac8422..eede11d9c54bf2a2f954629358ea6f3aad8f122d 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html @@ -13,6 +13,7 @@ @@ -18,32 +18,31 @@ index 5c5dea3eb6c0b8ede27a972927a2214e1e356343..8af6a8fd4202653dddcf02c0b409f43a +@@ -43,6 +45,7 @@ + on-click="onMetricsReportingLinkClick_" external> + + - + - + + + + @@ -51,7 +50,7 @@ index 5c5dea3eb6c0b8ede27a972927a2214e1e356343..8af6a8fd4202653dddcf02c0b409f43a diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index 3d90a46e3368..dbcbaf4c140b 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,20 +1,20 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index 19d49e4fbd20e166976b2f3bb51c1f748dbe79ff..452ac05c1819d290daa78993561b33954a89ff9f 100644 +index fe29bca524ba0d36497fe3813f9cdf8ecc9bc389..bf7b164c8f6cabf013eb0c1e7b29ea3ee62e0ffe 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; - import {Route, Router} from './router.js'; - import {SettingsRoutes} from './settings_routes.js'; +@@ -8,6 +8,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; + import {pageVisibility} from './page_visibility.js'; + import {Route, Router, SettingsRoutes} from './router.js'; +import addBraveRoutes from './brave_routes.js' /** * Add all of the child routes that originate from the privacy route, * regardless of whether the privacy section under basic or advanced. -@@ -255,6 +256,7 @@ function createBrowserSettingsRoutes(): Partial { +@@ -255,6 +256,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes { loadTimeData.getString('performancePageTitle')); } } + addBraveRoutes(r); - return r; + return r as unknown as SettingsRoutes; } diff --git a/patches/components-download-internal-background_service-proto-entry.proto.patch b/patches/components-download-internal-background_service-proto-entry.proto.patch index ee81a006ed4b..0ecefe8f4cc2 100644 --- a/patches/components-download-internal-background_service-proto-entry.proto.patch +++ b/patches/components-download-internal-background_service-proto-entry.proto.patch @@ -1,11 +1,11 @@ diff --git a/components/download/internal/background_service/proto/entry.proto b/components/download/internal/background_service/proto/entry.proto -index 955323219619ada808758048c9d423905f25a8eb..82e51550903349bdb6aab3da6063d989e368d914 100644 +index 629efd9757163f4bf532c200a6a7b414ff40ac67..96e6f2b9852edf9719f2b3d0836cc1ea70b52cf3 100644 --- a/components/download/internal/background_service/proto/entry.proto +++ b/components/download/internal/background_service/proto/entry.proto -@@ -27,6 +27,7 @@ enum DownloadClient { +@@ -28,6 +28,7 @@ enum DownloadClient { // New clients should be added above here. - BOUNDARY = 10; + BOUNDARY = 11; + CUSTOM_LIST_SUBSCRIPTIONS = 256; } diff --git a/patches/components-download-internal-background_service-proto_conversions.cc.patch b/patches/components-download-internal-background_service-proto_conversions.cc.patch index 22ac09dc226a..0bf80aa1a7fe 100644 --- a/patches/components-download-internal-background_service-proto_conversions.cc.patch +++ b/patches/components-download-internal-background_service-proto_conversions.cc.patch @@ -1,17 +1,17 @@ diff --git a/components/download/internal/background_service/proto_conversions.cc b/components/download/internal/background_service/proto_conversions.cc -index be74ae46d79fc94962e720069fc37ba9af3ff48a..a25695be644346eeab64eda68a0febf5fa7823e3 100644 +index c776acb211ed2de3939f06860018e9d16f4babbc..4cd4e1f3c86724d40f44fb043903baa66fab3618 100644 --- a/components/download/internal/background_service/proto_conversions.cc +++ b/components/download/internal/background_service/proto_conversions.cc -@@ -77,6 +77,7 @@ protodb::DownloadClient ProtoConversions::DownloadClientToProto( - return protodb::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; +@@ -79,6 +79,7 @@ protodb::DownloadClient ProtoConversions::DownloadClientToProto( + return protodb::DownloadClient::BRUSCHETTA; case DownloadClient::BOUNDARY: return protodb::DownloadClient::BOUNDARY; + BRAVE_DOWNLOAD_CLIENT_TO_PROTO } NOTREACHED(); -@@ -108,6 +109,7 @@ DownloadClient ProtoConversions::DownloadClientFromProto( - return DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; +@@ -112,6 +113,7 @@ DownloadClient ProtoConversions::DownloadClientFromProto( + return DownloadClient::BRUSCHETTA; case protodb::DownloadClient::BOUNDARY: return DownloadClient::BOUNDARY; + BRAVE_DOWNLOAD_CLIENT_FROM_PROTO diff --git a/patches/components-download-public-background_service-clients.cc.patch b/patches/components-download-public-background_service-clients.cc.patch index 3b4f18b7f76e..2de1901f266c 100644 --- a/patches/components-download-public-background_service-clients.cc.patch +++ b/patches/components-download-public-background_service-clients.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/download/public/background_service/clients.cc b/components/download/public/background_service/clients.cc -index ad9780ad6a2cdef8266dbe46484a90259da12cc1..bf6be3be2d7dc6e78190828edf658eb7cda7d2bb 100644 +index ca9151e61761137094c550fdbe25e204fa2916e1..e7047b84199e9f962666cc7bdd2ea9c545f898ae 100644 --- a/components/download/public/background_service/clients.cc +++ b/components/download/public/background_service/clients.cc -@@ -26,6 +26,7 @@ std::string BackgroundDownloadClientToString(DownloadClient client) { - return "PluginVmImage"; - case DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS: +@@ -28,6 +28,7 @@ std::string BackgroundDownloadClientToString(DownloadClient client) { return "OptimizationGuidePredictionModels"; + case DownloadClient::BRUSCHETTA: + return "Bruschetta"; + BRAVE_BACKGROUND_DOWNLOAD_CLIENT_TO_STRING case DownloadClient::BOUNDARY: break; diff --git a/patches/components-download-public-background_service-clients.h.patch b/patches/components-download-public-background_service-clients.h.patch index 4dfc407b4bee..139889600f3e 100644 --- a/patches/components-download-public-background_service-clients.h.patch +++ b/patches/components-download-public-background_service-clients.h.patch @@ -1,11 +1,11 @@ diff --git a/components/download/public/background_service/clients.h b/components/download/public/background_service/clients.h -index 9943c8c5c2b230a427b13a9b32eeffeb42dae4bf..31a65ea21f9d4a15caf0ecfcd4b68e77005be39a 100644 +index d2547050c34bba5a336253860ac8a0d7e19b255f..baf131b6da0ef355543b7de50a931b494e6aae0e 100644 --- a/components/download/public/background_service/clients.h +++ b/components/download/public/background_service/clients.h -@@ -46,6 +46,7 @@ enum class DownloadClient { +@@ -48,6 +48,7 @@ enum class DownloadClient { // New clients should be added above here. - BOUNDARY = 7, + BOUNDARY = 8, + BRAVE_DOWNLOAD_CLIENT }; diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index 89072477ad9b..9696341430a2 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,11 +1,11 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index e04f41c18f12ea9c9b95bdbb8dd149e142728718..f099e718a640b9fa2b7f18de2e65ebe4aa1edf4d 100644 +index 059cce8d44b076a926dc95932db4875727133657..16f4f02bb911c4697ee3d9c0fc24f6a4becac145 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc -@@ -410,6 +410,7 @@ TransportSecurityState::TransportSecurityState( +@@ -382,6 +382,7 @@ TransportSecurityState::TransportSecurityState( + // others don't end up with pins that cannot be easily updated. #if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || BUILDFLAG(IS_IOS) enable_static_pins_ = false; - enable_static_expect_ct_ = false; + BRAVE_ENABLE_STATIC_PINS #endif // Check that there no invalid entries in the static HSTS bypass list. diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index 9d2a41e005af..618afbccf3cb 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index 724a595a719612389a0d32d235c7757f2683cc24..6e0713f1e7ec5a6d30a5b14c24eb7543219e08a6 100644 +index 0f6358f4aede9a874632ec92096d1cc339a572cf..2f13f6b730bf6cda0def7feb01b6c5d0ab365182 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn @@ -103,6 +103,7 @@ generate_grd("build_grd") { @@ -10,10 +10,10 @@ index 724a595a719612389a0d32d235c7757f2683cc24..6e0713f1e7ec5a6d30a5b14c24eb7543 } if (is_chromeos_ash) { -@@ -230,6 +231,7 @@ ts_library("library") { - ":generate_definitions", - ":preprocess", - ] +@@ -246,6 +247,7 @@ ts_library("library") { + if (is_chromeos_ash) { + extra_deps += [ ":copy_checked_in_dts_files" ] + } + import("//brave/ui/webui/resources/sources.gni") extra_deps += brave_ui_webui_resources_ts_extra_deps in_files += brave_local_files } From 59d27e9a150fbda00718b2c71731ae28a066a481 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 05:53:56 +0000 Subject: [PATCH 072/146] Update patches from Chromium 110.0.5464.2 to Chromium 110.0.5476.3. --- patches/base-BUILD.gn.patch | 4 +-- ...base-threading-thread_restrictions.h.patch | 4 +-- ...ld-config-android-internal_rules.gni.patch | 4 +-- patches/chrome-BUILD.gn.patch | 26 +++++++++---------- patches/chrome-android-BUILD.gn.patch | 18 ++++++------- ...rome-android-chrome_java_sources.gni.patch | 2 +- ...d-expectations-lint-suppressions.xml.patch | 4 +-- ...ome-android-java-AndroidManifest.xml.patch | 6 ++--- ...rivacy-settings-PrivacySettings.java.patch | 8 +++--- ...ed_mode-TabbedRootUiCoordinator.java.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 4 +-- patches/chrome-browser-about_flags.cc.patch | 4 +-- ...owser-download-download_item_model.h.patch | 2 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +-- ...-identity_get_auth_token_function.cc.patch | 4 +-- ...rowser-extensions-component_loader.h.patch | 8 +++--- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 ++--- .../chrome-browser-profiles-profile.cc.patch | 4 +-- ...ext_menu-render_view_context_menu.cc.patch | 4 +-- ...text_menu-render_view_context_menu.h.patch | 2 +- ...browser-resources-bookmarks-BUILD.gn.patch | 4 +-- ...ser-resources-bookmarks-bookmarks.ts.patch | 2 +- ...-browser-resources-settings-BUILD.gn.patch | 4 +-- ...vacy_page-personalization_options.ts.patch | 10 +++---- ...owser-resources-settings-settings.ts.patch | 2 +- ...ngs-settings_page-main_page_mixin.ts.patch | 2 +- ...-settings-site_settings-constants.ts.patch | 4 +-- patches/chrome-browser-ui-BUILD.gn.patch | 4 +-- ...rome-browser-ui-appmenu-AppMenu.java.patch | 4 +-- patches/chrome-browser-ui-browser.cc.patch | 2 +- ...rome-browser-ui-browser_navigator.cc.patch | 6 ++--- .../chrome-browser-ui-chrome_pages.cc.patch | 4 +-- .../chrome-browser-ui-color-BUILD.gn.patch | 2 +- ...rtup-startup_browser_creator_impl.cc.patch | 4 +-- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +-- ...verlay-video_overlay_window_views.cc.patch | 2 +- ...owser-ui-views-tabs-new_tab_button.h.patch | 2 +- .../chrome-browser-ui-views-tabs-tab.cc.patch | 4 +-- ...e-browser-ui-views-tabs-tab_strip.cc.patch | 2 +- ...ser-ui-views-tabs-tab_style_views.cc.patch | 10 +++---- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 2 +- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 4 +-- ...-chrome_web_ui_controller_factory.cc.patch | 4 +-- ...r-ui-webui-downloads-downloads_ui.cc.patch | 2 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +-- ...owser-ui-webui-history-history_ui.cc.patch | 2 +- ...ttings_localized_strings_provider.cc.patch | 4 +-- ...bui-settings-site_settings_helper.cc.patch | 2 +- ..._integration-web_app_shortcut_mac.mm.patch | 4 +-- ...extensions-api-developer_private.idl.patch | 4 +-- ...tensions-chrome_extensions_client.cc.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 2 +- ...rer-chrome_content_renderer_client.h.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 +-- ...me-test-data-webui-settings-BUILD.gn.patch | 4 +-- ...settings-SingleCategorySettings.java.patch | 2 +- ...er-page_specific_content_settings.cc.patch | 6 ++--- ...-content_settings_policy_provider.cc.patch | 2 +- ...nternal-common-download_item_impl.cc.patch | 2 +- ...nts-infobars-core-infobar_delegate.h.patch | 4 +-- .../components-omnibox-browser-BUILD.gn.patch | 4 +-- ...x-browser-autocomplete_controller.cc.patch | 4 +-- ...mnibox-browser-omnibox_edit_model.cc.patch | 2 +- patches/components-permissions-BUILD.gn.patch | 4 +-- ...ch_engines-default_search_manager.cc.patch | 2 +- ...nents-sync-protocol-proto_visitors.h.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +-- ...-renderer_host-navigation_request.cc.patch | 6 ++--- ...lic-browser-content_browser_client.h.patch | 4 +-- ...ontent-renderer-render_frame_impl.cc.patch | 4 +-- ...r-native_extension_bindings_system.h.patch | 4 +-- patches/net-BUILD.gn.patch | 4 +-- ...ices-network-cors-cors_url_loader.cc.patch | 4 +-- ...services-network-public-cpp-BUILD.gn.patch | 4 +-- ...er-bindings-generated_in_modules.gni.patch | 4 +-- ...renderer-bindings-idl_in_modules.gni.patch | 4 +-- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +-- ...cy-permissions_policy_features.json5.patch | 4 +-- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +-- ...modules-mediastream-media_devices.cc.patch | 4 +-- ...rty-blink-renderer-platform-BUILD.gn.patch | 4 +-- ...nds-chrome-desktop_browser_finder.py.patch | 4 +-- ..._schema_compiler-feature_compiler.py.patch | 2 +- ...metadata-histogram_suffixes_list.xml.patch | 2 +- ...y-platform-ax_platform_node_cocoa.mm.patch | 4 +-- ...ws-controls-button-md_text_button.cc.patch | 4 +-- ...s-cr_elements-cr_lottie-cr_lottie.ts.patch | 4 +-- patches/v8/BUILD.gn.patch | 4 +-- patches/v8/src-codegen-compiler.cc.patch | 4 +-- 90 files changed, 185 insertions(+), 185 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 80256d009e53..c0af95fa24da 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 8454ef6f29a69317b445de9d47cdf8c013141c1b..b0d13dda6e3dd4c2f1bdcbadcf643621f0e48147 100644 +index 904eaff4687de97a637f310498837b3be2e74ffa..7b1255defa4adde4eacbe5f9be91c861c7c8e1f8 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4304,6 +4304,7 @@ if (is_android) { +@@ -4309,6 +4309,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index 444f7c86b3ec..22ad13844b6c 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index f3295a465997b04e2345b31ea1bad42f66ab7400..daf0b32335d2cfa0818b3fd7c2805833df89f8b2 100644 +index e251578d1ec49dbc9f8855b405767e6df7117454..1fe65f964e3cf0ec1503e00548481b18cdaee279 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -688,6 +688,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -692,6 +692,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 3ca18a61d54a..256d13ca8451 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index a555059dce4cdc59a97ec1974c3a9ac8e965bf6d..a619851637fb797705b638827514cc46cee6644f 100644 +index 0fa567baa1a24e6a2441a8fc8fb403c059b66367..99bd0851e1f197b87bb15ac5048676264c4c156f 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -3801,6 +3801,7 @@ if (enable_java_templates) { +@@ -3799,6 +3799,7 @@ if (enable_java_templates) { } else { not_needed(invoker, [ "missing_classes_allowlist" ]) } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index cbe82049e57e..4cbff5296fec 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d60c3cda4f 100644 +index 2ef38efd9617c09dcdb68d972ce10ce9c70dfc14..10b6c93fb9e6ea3ffb05008f64c061d9fa3151c3 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -179,6 +179,7 @@ if (!is_android && !is_mac) { +@@ -182,6 +182,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 deps += [ ":chrome_dll", -@@ -475,11 +476,12 @@ if (is_win) { +@@ -478,11 +479,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -500,6 +502,7 @@ if (is_win) { +@@ -503,6 +505,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -572,7 +575,7 @@ if (is_win) { +@@ -575,7 +578,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 "-v", chrome_version_full, "-g", -@@ -646,6 +649,7 @@ if (is_win) { +@@ -649,6 +652,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 } } -@@ -687,9 +691,11 @@ if (is_win) { +@@ -690,9 +694,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 if (is_chrome_branded && include_branded_entitlements) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -714,6 +720,7 @@ if (is_win) { +@@ -717,6 +723,7 @@ if (is_win) { info_plist_target = invoker.info_plist_target } else { info_plist_target = ":chrome_helper_plist" @@ -69,7 +69,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 } extra_substitutions = [ -@@ -891,6 +898,7 @@ if (is_win) { +@@ -894,6 +901,7 @@ if (is_win) { sources += [ "//third_party/updater/chrome_mac_universal_prod/${updater_product_full_name}.app" ] } else { sources += [ "$root_out_dir/${updater_product_full_name}.app" ] @@ -77,7 +77,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 public_deps += [ "//chrome/updater/mac:browser_install_script", -@@ -1199,6 +1207,7 @@ if (is_win) { +@@ -1202,6 +1210,7 @@ if (is_win) { chrome_dylib_version, "-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir), ] @@ -85,7 +85,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1378,6 +1386,7 @@ if (is_win) { +@@ -1381,6 +1390,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -93,7 +93,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1448,7 +1457,7 @@ group("dependencies") { +@@ -1451,7 +1461,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -102,7 +102,7 @@ index 60aa17318c1dab2f2e3d2f084d3f566858f7588f..c79f2f5f1259bd046da7a3edc29851d6 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1502,6 +1511,7 @@ group("resources") { +@@ -1505,6 +1515,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index fdfdb983fa3a..f7b4bd853805 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a67379751c81f296 100644 +index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f85462bb99 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -239,6 +239,7 @@ if (current_toolchain == default_toolchain) { @@ -18,7 +18,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 } if (enable_vr) { -@@ -716,6 +718,7 @@ if (current_toolchain == default_toolchain) { +@@ -711,6 +713,7 @@ if (current_toolchain == default_toolchain) { ] deps += feed_deps @@ -26,7 +26,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -740,6 +743,7 @@ if (current_toolchain == default_toolchain) { +@@ -735,6 +738,7 @@ if (current_toolchain == default_toolchain) { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -34,7 +34,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -881,6 +885,7 @@ if (current_toolchain == default_toolchain) { +@@ -872,6 +876,7 @@ if (current_toolchain == default_toolchain) { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -42,7 +42,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2100,6 +2105,7 @@ if (current_toolchain == default_toolchain) { +@@ -2087,6 +2092,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -2348,6 +2354,7 @@ if (current_toolchain == default_toolchain) { +@@ -2335,6 +2341,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2554,6 +2561,7 @@ if (current_toolchain == default_toolchain) { +@@ -2540,6 +2547,7 @@ if (current_toolchain == default_toolchain) { shared_libraries = [ ":libchrome" ] version_name = chrome_version_name @@ -66,7 +66,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 } } -@@ -2697,6 +2705,7 @@ if (current_toolchain == default_toolchain) { +@@ -2681,6 +2689,7 @@ if (current_toolchain == default_toolchain) { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -74,7 +74,7 @@ index 6b74a7bd29a9c1d4b74513c4d964a454ea875515..cae62411c73c563dacbc8f87a6737975 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -2880,6 +2889,7 @@ if (current_toolchain == default_toolchain) { +@@ -2864,6 +2873,7 @@ if (current_toolchain == default_toolchain) { deps += [ "//weblayer/browser/java:upstream_java" ] } } diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index ff73f23757b2..c47d0726f84e 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 91ce3cbf8d620e5e73419cda161288c6134821c8..f59ecb4616aee1daab2fa5d28180651120f5f25a 100644 +index 631aa76e9a7d71da72aeb52ae8da86cd8b429fa9..eb5427541ca4d53666b6056d64ce151478571a48 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni @@ -1215,3 +1215,4 @@ chrome_java_sources = [ diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index f29eb0114f26..d7617b0db0ae 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index 1b9d298cdd79a76c29771b02f2d1daded7c8f79b..9f67d8c6e9f9d3c7242301526a4c9d74fb7c6798 100644 +index 9f4f1fc831d2b4beca3499eb4804129e7eb7a886..233195b029acc5897c2909389a73abc889cbe4be 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -304,4 +304,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md +@@ -300,4 +300,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index a3eafd2e8e01..bbc15b62d80b 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index f315d8b6d12bafeb27fb8e405d768d5ee4e0237e..13699795712560fb4bec1fcbd6cb3bcdfb3b679d 100644 +index 950ce56b3d24034cdbd795bf5231c2f4d94cc092..54b3067ec9e43fa2f47d739f8a07b5e44a2d3a44 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -95,7 +95,7 @@ index f315d8b6d12bafeb27fb8e405d768d5ee4e0237e..13699795712560fb4bec1fcbd6cb3bcd android:exported="true"> -@@ -1185,6 +1202,7 @@ by a child template that "extends" this file. +@@ -1183,6 +1200,7 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > @@ -103,7 +103,7 @@ index f315d8b6d12bafeb27fb8e405d768d5ee4e0237e..13699795712560fb4bec1fcbd6cb3bcd {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1263,6 +1281,7 @@ by a child template that "extends" this file. +@@ -1254,6 +1272,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index 53689cd0fc95..bf6079f5fa57 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,8 +1,8 @@ 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 -index b5bcd0611dab95babc13ddba8527dc5d5968fae0..ff0821ac2663bb3065fa4163fa29890548c7582c 100644 +index bf6987fe59c6dcb8709d706ed16da74d3f07dc93..e624a6d04f40f7fd501141257c9ec631c3d3e4b8 100644 --- 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 -@@ -49,7 +49,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -53,7 +53,7 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -11,7 +11,7 @@ index b5bcd0611dab95babc13ddba8527dc5d5968fae0..ff0821ac2663bb3065fa4163fa298905 private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -264,6 +264,7 @@ public class PrivacySettings +@@ -283,6 +283,7 @@ public class PrivacySettings @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index b5bcd0611dab95babc13ddba8527dc5d5968fae0..ff0821ac2663bb3065fa4163fa298905 MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(VectorDrawableCompat.create( -@@ -278,6 +279,6 @@ public class PrivacySettings +@@ -297,6 +298,6 @@ public class PrivacySettings null); return true; } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch index f127b5abd1d6..6958174dde96 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -index c95e0a59b113c733654dc3abfc1584d1edd4e506..a45dcdb301b6a91144cf077c4a54583c2c3a3f6e 100644 +index 10977b3adb4eefe79a05cddb86e47e7abf9bd671..f2a4d16aec12c19237789600a2bdb01269bdf66f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java @@ -689,7 +689,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 296316e81ae9..e051fc228e63 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index da8103900f3e3545316a8aecdb37e09b3ac83720..120231d6291e843d86dd57717b8028c5794a249e 100644 +index b1304547ae914cc01a3d76b6c5c855cf16f73def..6c458015f0ca4b8e38367a999b9c89b6d4119173 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2537,6 +2537,7 @@ static_library("browser") { +@@ -2526,6 +2526,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index b5a2ac70da2a..f9c07dcd9841 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 49c38a50214ee7ca39cf6091902b1e14178a1aa9..3199a0f2d30236ab4f5eff34fe84f85e316aa46f 100644 +index 95110ce260dbf627d9c6ea960dbcda50bd92e05a..abef5a972343f235bbd2468c598e7f2538709f5e 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3390,6 +3390,7 @@ const FeatureEntry::FeatureVariation kWebRtcApmDownmixMethodVariations[] = { +@@ -3343,6 +3343,7 @@ const FeatureEntry::FeatureVariation kWebRtcApmDownmixMethodVariations[] = { // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch index 458472a3759c..1579194906af 100644 --- a/patches/chrome-browser-download-download_item_model.h.patch +++ b/patches/chrome-browser-download-download_item_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h -index c6facc5e19d3b04be0d03ba46a0936bececed558..21fab3dbe59bf0a922b8794b994d7ec7229268da 100644 +index 1a58fe8b27f027734732eba66fcbb8407999c283..95dbd71f0e8db85f7ec5f22d970e74f86b572ba0 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h @@ -139,6 +139,7 @@ class DownloadItemModel : public DownloadUIModel, diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index b1fe3faec9f0..75728cf211fe 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index a7c6779e0424ed89f2aee73e2b0c6ffcad913e7c..63728377ea362fb820d1642a0ec0092000c5e934 100644 +index a796089bb7e64a7c965e89e2311387bc51f8308c..881c9716bbe1f56f429101a4ea45ed23e37765b9 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1367,6 +1367,7 @@ static_library("extensions") { +@@ -1366,6 +1366,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch b/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch index 5c613e56fa4c..376ebb499232 100644 --- a/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch +++ b/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -index 4c4fb190e9f47720bcb71935498d4b4155a924ce..8cf1805a5b0e1d334f82c36285d4c2cc433d5749 100644 +index 6c3c4f1cb8f15f1f498f3c38f42ef9b2a17f8c25..fe97c5b0cb4d17ce63b59309a5dba9621471eb3e 100644 --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc @@ -44,6 +44,13 @@ @@ -111,7 +111,7 @@ index 4c4fb190e9f47720bcb71935498d4b4155a924ce..8cf1805a5b0e1d334f82c36285d4c2cc void IdentityGetAuthTokenFunction::OnRefreshTokenUpdatedForAccount( const CoreAccountInfo& account_info) { if (account_listening_mode_ != AccountListeningMode::kListeningTokens) -@@ -729,6 +790,84 @@ void IdentityGetAuthTokenFunction::OnGaiaRemoteConsentFlowApproved( +@@ -730,6 +791,84 @@ void IdentityGetAuthTokenFunction::OnGaiaRemoteConsentFlowApproved( StartMintTokenFlow(IdentityMintRequestQueue::MINT_TYPE_NONINTERACTIVE); } diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch index e06e8491f364..c2dc2afc68e6 100644 --- a/patches/chrome-browser-extensions-component_loader.h.patch +++ b/patches/chrome-browser-extensions-component_loader.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h -index 39cd58279c4e61fc2f851b9f888f33f17c20b7d0..9ab36cac16a50768657779f9b2eb30912d8f4bbe 100644 +index 4baaa0c3328cf34d1148dcca9f38546394a53930..bedc8b30def639de607e5addf7421dd0952dc571 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h -@@ -85,7 +85,7 @@ class ComponentLoader { +@@ -84,7 +84,7 @@ class ComponentLoader { // the loader will skip loading component extensions that weren't supposed to // be loaded unless we are in signed user session (ChromeOS). For all other // platforms this |skip_session_components| is expected to be unset. @@ -11,7 +11,7 @@ index 39cd58279c4e61fc2f851b9f888f33f17c20b7d0..9ab36cac16a50768657779f9b2eb3091 // Similar to above but adds the default component extensions for kiosk mode. void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components); -@@ -131,6 +131,7 @@ class ComponentLoader { +@@ -130,6 +130,7 @@ class ComponentLoader { } private: @@ -19,7 +19,7 @@ index 39cd58279c4e61fc2f851b9f888f33f17c20b7d0..9ab36cac16a50768657779f9b2eb3091 FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest); // Information about a registered component extension. -@@ -177,6 +178,7 @@ class ComponentLoader { +@@ -175,6 +176,7 @@ class ComponentLoader { void AddDefaultComponentExtensionsWithBackgroundPagesForKioskMode(); #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index aa5898493ed6..701b8d99459e 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index c62487f605cb87f1177ae6bdab75a90c26d1fe22..24c85f6022a694ffa5406092b6ee042bc9703423 100644 +index 9a0e0445b992df159da545c8f4815e2d63c1f9ea..187ffefcf2d121db3daefdf0538f1dfca4e29808 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1301,6 +1301,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1302,6 +1302,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -11,7 +11,7 @@ index c62487f605cb87f1177ae6bdab75a90c26d1fe22..24c85f6022a694ffa5406092b6ee042b #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) screen_ai::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -@@ -1681,6 +1683,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1686,6 +1688,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif registry->RegisterTimePref(prefs::kDIPSTimerLastUpdate, base::Time()); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 3947cf346a4c..8965746d1e3c 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index c5939574f25149b9c8c5992a5be7ba1ae1978b08..a6d45aeb092951045212870414185687e55c30a6 100644 +index cb16500436e78c0a3ba4471438de5b5357ffd35c..3aaa04cebee7abc9b346359bf706bc58a5e24e18 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -104,6 +104,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { @@ -10,7 +10,7 @@ index c5939574f25149b9c8c5992a5be7ba1ae1978b08..a6d45aeb092951045212870414185687 base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix, base::CompareCase::SENSITIVE) || base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix, -@@ -303,7 +304,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -310,7 +311,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 88b9ab2aa6fb..04c50fb6641d 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 102603d423eaa259bfc2e657f53e105c10061ada..f37c6b1335b55c51ea546c25d16f8c78659db667 100644 +index 1907eb7b5c67797f736cf6fd0374ad1ff0a2d6e9..054f0d93bc88af9e95e2fe945d8ff9409f3c40c1 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1939,6 +1939,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1936,6 +1936,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 84037ce01054..3a963263f9eb 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 3199231012c450b5b8a6a2fd4d3f14b64968088b..072a5c8d657015db632d0c40e437a18c4140cbea 100644 +index 203daac4b57ce6f58529897746feeb8af0695433..5bbe688f010463039dfe5b298c16ba8a3c80257b 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -170,6 +170,7 @@ class RenderViewContextMenu diff --git a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch index 2eaeed5c3e9c..5984dc12e1cd 100644 --- a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch +++ b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/BUILD.gn b/chrome/browser/resources/bookmarks/BUILD.gn -index cc5ee55e73cc5224e77ed1bc1ed3cb84a4a2b7a2..80e0c7c07735705cbcae9177147041518df8baee 100644 +index 08be7188d3efd679921640670f7bd96a3324ec91..8887081b81519095dd9b828e7599b53c2d656603 100644 --- a/chrome/browser/resources/bookmarks/BUILD.gn +++ b/chrome/browser/resources/bookmarks/BUILD.gn -@@ -71,4 +71,5 @@ build_webui("build") { +@@ -72,4 +72,5 @@ build_webui("build") { optimize_webui_resource_paths_rewrites = [ "bookmarks.rollup.js|bookmarks.js" ] } diff --git a/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch b/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch index 942e5a1b96f1..ee0ee20b2af6 100644 --- a/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-bookmarks.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/bookmarks.ts b/chrome/browser/resources/bookmarks/bookmarks.ts -index e18d2f4269c72f8bfb1d46e16d443c4749836ae7..0ac13d17be6e694b3d7bdab6b19fff3397d48126 100644 +index 77a1b553ba84e8af23392ef68ae4bcef27aa91b4..6a529f06564f5174852ddb47547baccc49ce5fda 100644 --- a/chrome/browser/resources/bookmarks/bookmarks.ts +++ b/chrome/browser/resources/bookmarks/bookmarks.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index eca10ecd2d11..067b0ab5cf57 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index bea31921070c5dbc1a1268ef1b9c59b818b8602c..e22fd53213e4211f3e772dcf51abf88fb145e5b8 100644 +index 7c7d52832e314577ca2bdbdf2492501b3c6b965c..42a24226e26c1cf189dc1ee395512ac73f7d0d02 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -497,4 +497,5 @@ build_webui("build") { +@@ -479,4 +479,5 @@ build_webui("build") { "lazy_load.rollup.js|lazy_load.js", ] } diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch index 24f329665bc1..f4216ed827ee 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -index 1324da1f561b085d36d7c83caa993b34e637b462..df170f9577e4ab805eeebdbe0d1d20a2217b8bc8 100644 +index 0f869c257563db797663fb76b855bad3e22cf032..c31a8bfaffda5dc9d93ac847a02f3b1d2dd64df7 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -@@ -74,7 +74,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -69,7 +69,7 @@ export class SettingsPersonalizationOptionsElement extends syncStatus: Object, @@ -11,7 +11,7 @@ index 1324da1f561b085d36d7c83caa993b34e637b462..df170f9577e4ab805eeebdbe0d1d20a2 // TODO(dbeam): make a virtual.* pref namespace and set/get this normally // (but handled differently in C++). metricsReportingPref_: { -@@ -109,7 +109,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -104,7 +104,7 @@ export class SettingsPersonalizationOptionsElement extends pageVisibility: PrivacyPageVisibility; syncStatus: SyncStatus; @@ -20,7 +20,7 @@ index 1324da1f561b085d36d7c83caa993b34e637b462..df170f9577e4ab805eeebdbe0d1d20a2 private metricsReportingPref_: chrome.settingsPrivate.PrefObject; private showRestart_: boolean; // -@@ -148,7 +148,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -137,7 +137,7 @@ export class SettingsPersonalizationOptionsElement extends override ready() { super.ready(); @@ -29,7 +29,7 @@ index 1324da1f561b085d36d7c83caa993b34e637b462..df170f9577e4ab805eeebdbe0d1d20a2 const setMetricsReportingPref = (metricsReporting: MetricsReporting) => this.setMetricsReportingPref_(metricsReporting); this.addWebUiListener('metrics-reporting-change', setMetricsReportingPref); -@@ -182,7 +182,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -171,7 +171,7 @@ export class SettingsPersonalizationOptionsElement extends } // diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 845f0651487e..76e48dbb6b4f 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index db3501869457f3a66c32f4cbae4352f371fe1e5b..9287ed50e50327fcea4e8e98d92b7525001b47b2 100644 +index 21d4f4b83fa1dad332aaca179a7bada3beae5a90..65d0a2eff2140b442a6082622c8359ff40528e22 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch b/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch index 47e6168ec593..8e7048c9e7d8 100644 --- a/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch +++ b/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts -index e4a17d852d3d39c6371cc91ea6bfa61fbf4ca67d..05f397997c42faee5e1b58e630026c1fe32f87c2 100644 +index 36c490c99a90e87b2c61b2130590fbb1e6a32a32..b9491548c08dceaa4a9cffee8c88011026ee9fa9 100644 --- a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts +++ b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts @@ -38,7 +38,7 @@ guestTopLevelRoute = routes.PRIVACY; diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 0250e8a525b0..87e6cd244c4f 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index a3823a5fa155b06463bb63192cfc72a180ea33c7..b3e196cfcc1c616a3cafcf5e210b1542dfb6798e 100644 +index 459a76680a30ab20ea1164fcb234bff6456d0994..23ea008da34820aeaa3c373101a7fec8c7515778 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts -@@ -48,6 +48,7 @@ export enum ContentSettingsTypes { +@@ -50,6 +50,7 @@ export enum ContentSettingsTypes { // are used everywhere where ContentSettingsTypes is used in JS. PDF_DOCUMENTS = 'pdfDocuments', SITE_DATA = 'site-data', diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 0b627123a57c..9491a49a5e49 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 524b8097f004740be12bfabdfbb9ccf2fc16d195..b865f3bed235013e9772b2a8480cbd57b49313df 100644 +index 0430eeea606d7fb284f4e37b81fb7fc92ee0d2fa..882055299a4296b88ef48bbd9124fe36e999357f 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -666,6 +666,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 524b8097f004740be12bfabdfbb9ccf2fc16d195..b865f3bed235013e9772b2a8480cbd57 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3991,10 +3992,13 @@ static_library("ui") { +@@ -4005,10 +4006,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index 457f04390994..9a3376bc42a8 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index 0642111d423c5ab12a7bda74749e5f15378cc900..b81ccd72d75bbc0fe96cd435268ca2d01bd61f29 100644 +index fbbc57577be59a8bc7cd4045b622331214237600..76d23b34a5249898f3ac694acf5672b690cbe741 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -222,6 +222,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -220,6 +220,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler mPopup.setAnimationStyle( isMenuIconAtStart ? R.style.StartIconMenuAnim : R.style.EndIconMenuAnim); } diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 8d9ce01a4046..1ac377d7adc9 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 924ab1bc6dd5fd26e18e7b713d69a100c1693fed..e86c712d37a6878b052fd720c1191d049cc5d371 100644 +index c015e1d33e9799f0af495c097b1afea2523992c7..39cc43045094c62f9d568ee660bb179154787a12 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -448,6 +448,7 @@ Browser* Browser::Create(const CreateParams& params) { diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index b935ad83583e..ea4038e595c1 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index 87d213f687b980c487afac97e56f202890bc955a..dbd1b15b447e9432833b283739aee77f41467c84 100644 +index abe8e2d792d539c8f550e646820f266f57debf53..8716b4b9a94c409fe5783fd7e1487aa17fdb2aca 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc -@@ -594,6 +594,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -595,6 +595,7 @@ base::WeakPtr Navigate(NavigateParams* params) { // Block any navigation requests in locked fullscreen mode. return nullptr; } @@ -10,7 +10,7 @@ index 87d213f687b980c487afac97e56f202890bc955a..dbd1b15b447e9432833b283739aee77f // Open System Apps in their standalone window if necessary. // TODO(crbug.com/1096345): Remove this code after we integrate with intent -@@ -889,6 +890,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -890,6 +891,7 @@ base::WeakPtr Navigate(NavigateParams* params) { bool IsHostAllowedInIncognito(const GURL& url) { std::string scheme = url.scheme(); base::StringPiece host = url.host_piece(); diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index afdd85c63e6b..84e7613085c6 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index e02762a9640c118a286e17d3d49fc84104599523..85880132f40c93c05dd1d43a8a62f79322030a33 100644 +index f14b01024e03f0d0488e967b848255f0f2a1a5db..af4c27a4b150ad4424d212ab604c89991ee1e84a 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -342,7 +342,7 @@ void ShowSlow(Browser* browser) { +@@ -343,7 +343,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-color-BUILD.gn.patch b/patches/chrome-browser-ui-color-BUILD.gn.patch index 96ccf197644b..ed5048b227a5 100644 --- a/patches/chrome-browser-ui-color-BUILD.gn.patch +++ b/patches/chrome-browser-ui-color-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn -index faaaab13bf6987f63b265a4e3db71d3ce385df28..7d947a163ce90b277ced78e813cebbdcb1e81456 100644 +index be0fad67cb8b89f6e740b975000b0a6692412cb8..87b7e6cfe8f5047d11879fcee34c285aaac97aca 100644 --- a/chrome/browser/ui/color/BUILD.gn +++ b/chrome/browser/ui/color/BUILD.gn @@ -42,6 +42,7 @@ source_set("mixers") { diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 01a4e08ff611..95879582704f 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 6d143c95ad464e6d6817c710b90b48683dc7d038..37d89380ddb1ba977e8152ab0acf5f355edcbf14 100644 +index a8e60adf0377158c3465d4f8bb9b6e0d51c68f9a..8ac085723893ca735d651d7baf4f27b88404ea11 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -400,6 +400,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -412,6 +412,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #elif !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 3ca94692d20c..78cde8f88fc3 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 11d876a127ee92c33407a9f2d1d2b8654c37a62f..0b22db56200c34084c7112e664a9303ee96232e0 100644 +index d1f7fc57b3226f2caf3b709d127c777043504d3b..60183cf6e3c97cc4218d089cc1f18d34f0a25df2 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -660,4 +660,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -644,4 +644,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch index 39b894d4f11b..e3f820c5f9ba 100644 --- a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch +++ b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index d2d65a1073c8f9c43543b7127c2caa7ca0859982..79ba2d6f395907760bc88c017f32b2cdcd0b4d6c 100644 +index 4c83c6a6685490ce1899b119742fa25b6b9a50cd..4a9af5b0ee54f62d46758751f8710da02d183818 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -640,6 +640,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { diff --git a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch index 7e014b71730c..8a115c6db22a 100644 --- a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch +++ b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/new_tab_button.h b/chrome/browser/ui/views/tabs/new_tab_button.h -index 5a4dbddf4b0d2b9237a4401e98e87a156d8ee72a..84db2916df6af5f03e954ee7bd6db8f33e1bb173 100644 +index 7c2a308b7be819c5073a212dca45f537c359164b..b6dde7c8475860c78d61851b57e56d3494e14247 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.h +++ b/chrome/browser/ui/views/tabs/new_tab_button.h @@ -48,6 +48,7 @@ class NewTabButton : public views::ImageButton, diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index 3c90288febcf..856856aec5b6 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index 4e7a91bff0669d5f944a4b07dc62362a2f6fdf86..f07a30ff2a1ff857ad0984aa3b7ccfb36678df40 100644 +index 579a5c2301eb675124e3309487ac924d9e5bf2e0..0f3119efafcd63275fcb554a9433e022a9d4ccb8 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -390,6 +390,7 @@ void Tab::Layout() { @@ -10,7 +10,7 @@ index 4e7a91bff0669d5f944a4b07dc62362a2f6fdf86..f07a30ff2a1ff857ad0984aa3b7ccfb3 } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -1008,6 +1009,7 @@ void Tab::UpdateIconVisibility() { +@@ -1012,6 +1013,7 @@ void Tab::UpdateIconVisibility() { available_width -= favicon_width; showing_close_button_ = large_enough_for_close_button; diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index 4dabb0db79a7..3eb92b990cba 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index 8e1faaa3409abb5a83567071c783fb4cfb54e30b..886c787ce092b4a7f0dc571bae22d65329b91995 100644 +index c6390ac4f135445d324ff5f6dc6de8c2378e8daa..c1951064dd380085388df5df5ab8a8f6bb6d14e5 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -495,6 +495,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch index 956efa371a46..9a13b931e593 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc -index 88809500f4da967276bdda504a365c4ce470b118..3934ef75121f5f25dfff8ed9ba13e788aa9dba0c 100644 +index 50e89eae0d42068483673bce9bcf6b59dd72a2bf..0e988956ada64f408d4a13462a8c513be948c7b5 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -74,6 +74,7 @@ class GM2TabStyle : public TabStyleViews { +@@ -75,6 +75,7 @@ class GM2TabStyle : public TabStyleViews { void HideHover(HideHoverStyle style) override; private: @@ -10,7 +10,7 @@ index 88809500f4da967276bdda504a365c4ce470b118..3934ef75121f5f25dfff8ed9ba13e788 // Gets the bounds for the leading and trailing separators for a tab. SeparatorBounds GetSeparatorBounds(float scale) const; -@@ -285,6 +286,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type, +@@ -286,6 +287,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type, const ShapeModifier shape_modifier = GetShapeModifier(path_type); const bool extend_left_to_bottom = shape_modifier & kNoLowerLeftArc; const bool extend_right_to_bottom = shape_modifier & kNoLowerRightArc; @@ -18,7 +18,7 @@ index 88809500f4da967276bdda504a365c4ce470b118..3934ef75121f5f25dfff8ed9ba13e788 SkPath path; -@@ -561,7 +563,7 @@ TabStyle::SeparatorBounds GM2TabStyle::GetSeparatorBounds(float scale) const { +@@ -562,7 +564,7 @@ TabStyle::SeparatorBounds GM2TabStyle::GetSeparatorBounds(float scale) const { separator_bounds.leading = gfx::RectF(aligned_bounds.x() + corner_radius, aligned_bounds.y() + @@ -27,7 +27,7 @@ index 88809500f4da967276bdda504a365c4ce470b118..3934ef75121f5f25dfff8ed9ba13e788 separator_size.width(), separator_size.height()); separator_bounds.trailing = separator_bounds.leading; -@@ -911,12 +913,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const { +@@ -912,12 +914,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const { SK_AlphaOPAQUE)); }; diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 48e08f12b509..848fba9583db 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index b4d585985bf4c0b8b855651e10806b822afa9e1a..4c28eb1a19a61bd15ccb77408cc66eb9041e72aa 100644 +index ee4e67a702a0e6a7f6d4fef90fb7b40c7e405181..58378e0292c46b5bc7515297439752626088ba90 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -347,6 +347,7 @@ void ToolbarView::Init() { diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch index 93199e1218b7..27419e8086ac 100644 --- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -index 6bd71ecf31afe27120fb5122f6960ae2c9c95f50..5de2012e91ceb4efde5573f04f02746282d8e243 100644 +index 4babca918a75c21e99b3c6e7ba4262ac65f743f1..14b794591e3c8ee4a14283a4f0cdb62e9f26c570 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -@@ -129,6 +129,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { +@@ -128,6 +128,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { for (const auto& str : kStrings) AddLocalizedString(source, str.name, str.id); diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index b084473f0bc6..90c4f870c57a 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index fb8def53074e9da7539127f56fa687b4bfcd88e8..8eb9ab28087596a5f5496789b594e8e19618af8f 100644 +index 15a333b31a1d198932c27f1a203350e35ecb5d38..183936449cdbd6e386091e8a76b9374226d83f40 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1316,6 +1316,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1319,6 +1319,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch index 37d00a61b437..ab9dc133c3c8 100644 --- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc -index f96d0d06003e76b1340f53ae4403128302f49ab5..90ed13c5a36622d02dda6df9c97dd292c6ac63ed 100644 +index e888b31a53aa1533775bc2c5e4dde48011ecdad5..801e2716856fd579ea8b8e1c0dabb0b8ef553062 100644 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc @@ -59,6 +59,7 @@ namespace { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index ce251181e40d..2ddd2c56206a 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index fda9e4d94e25a523f5ac1eb502d8efff6fb889bc..56db004302835a0767da4a64f353cc40d16c5bdd 100644 +index 1179c4add3b721b68f7ae0fdca19f051e3c66e31..d9eedd74408e19f65a3dcf9f09632d3a967e4862 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -396,6 +396,7 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, +@@ -395,6 +395,7 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, "showAccessRequestsInToolbarLearnMoreLink", chrome_extension_constants::kShowAccessRequestsInToolbarHelpURL); diff --git a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch index 3cdea8d3739c..3f26a80be5d0 100644 --- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc -index d1b8413380e198a86e8bd285ee33749b3188270d..1b5f748552e0c12389fe4a11c5f99e0bf7ab592e 100644 +index b4cd6b1a899f2b4348516d01bcc537e446338edf..f71cfdd9557bcc8dcc98efa3dd2a52a1a0eb7e5b 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -64,6 +64,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 47fee3313e8b..23579378d751 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index ef73d44c9f567e495719909ffab6c7c701d9874b..d734a3e414875982e78d61a11b35b2351a2d9c4e 100644 +index 043354fe98a33b79721b05371e608b39a9bc9ac6..14d468f1272db8b3d1617572aad573ab1bebd924 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3270,6 +3270,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3395,6 +3395,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index ac0a3f8ad5f9..723f40c2d26f 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 7bc61c34b2ae3c1d6632cb4a753db8b94ff1eb1e..be9ed9415b3134679d974112704aaaa971b1ea94 100644 +index f73d0fcbbf8ab5da69ae470cdb7f77a4ad2a7603..52dbf1f2e944d49d1a96ea50fb4cfdb07b3edbea 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -175,6 +175,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch index 6b97a0f1a2be..98ef2eb00a7b 100644 --- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -index 9e6069f6e1f540d10a393c2c9d7c2f8fabbdb9f8..df18a1a4d738d3ad458d393168a162642a0e10f3 100644 +index 9585cbc35a90f299219059f5aaf02ab2e12183f3..744e8d8b9b94b8b8f52dae1bfccb02864a0f92a0 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -@@ -742,6 +742,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -743,6 +743,7 @@ base::FilePath GetChromeAppsFolder() { if (path.empty()) return path; diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 25cfd91a5e3d..32a4fe24c5b7 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index 4437805e02c5f141450426285d47679e4131c713..9395188e7082686d45e8f254dd834e1228b25dd4 100644 +index cf2d7e81ec1c0ef742138b54853775cf66b4e80b..c8df8c5a2ef8c4a09279b93f98d4362aeb750686 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -233,6 +233,7 @@ namespace developerPrivate { +@@ -234,6 +234,7 @@ namespace developerPrivate { DOMString iconUrl; DOMString id; AccessModifier incognitoAccess; diff --git a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch index 89e54711f7f2..5838928381f1 100644 --- a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch +++ b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc -index a97676ab75331515db44e38d1dd93166aded497a..629b57d6d33bab078fe66a041b54b34318397fe4 100644 +index 493161c29afc97feeb3f369fd65dd442024cd2f4..429f4ef2852a6712903a0561f5d21b9dd313bc6a 100644 --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc @@ -13,6 +13,7 @@ diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index d3b5f9910467..898b551bbbd5 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index abbcd33bbf7dfc29f2563508e368233efda86b24..31d94145a510b478b1e938671473753ff415a33c 100644 +index 3d08b706ec4a05412ecda8fb7226c70881d353bb..92a5ef9d596f762ac464995c726bfc3bad38d26e 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -575,7 +575,7 @@ void ChromeContentRendererClient::RenderFrameCreated( diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index 76da3086257a..d362faf79e82 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index d209ade50507aa6d1ebc95cbb8abd21458d698c7..acc6fc6803b604a09d507c9f314e7322fb5e32fd 100644 +index e0c1b41ec7003a5464dde28bd1d68ca5c531e63b..64476ae2ef8a8652aa59706e2b8d3635eeef1a99 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -231,6 +231,7 @@ class ChromeContentRendererClient diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 36101e69bd75..b9c55ec02418 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index cf0364c49408d337f6919be0a1cbe185db6f9503..a78bf6a819aa4260b08861533e75c9f43c517f83 100644 +index cb231e5c605089c2f4c6a8f81ba917ed67dc88b6..b2ae492401febbf7ca4b74653b9ed21aa0900f1f 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { @@ -10,7 +10,7 @@ index cf0364c49408d337f6919be0a1cbe185db6f9503..a78bf6a819aa4260b08861533e75c9f4 data_deps = [] if (enable_pdf) { -@@ -5262,7 +5263,7 @@ config("disable_thinlto_cache_flags") { +@@ -5267,7 +5268,7 @@ config("disable_thinlto_cache_flags") { } config("pdb_larger_than_4gb") { diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index dbe3488b0473..99a84a043eb8 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index 76c2ae713293661166633472c89f6e302f4444fa..47dc43d4cc16e97c938f419c3d5b4c67aeb26a09 100644 +index 3bdbb3270f8fb9101515e327648bcd450bf703fa..6c1074f18249519452871bbf2807f1e4d462802e 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -235,6 +235,7 @@ ts_library("build_ts") { +@@ -240,6 +240,7 @@ ts_library("build_ts") { definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index 434aad7e5990..b371521b75f2 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index a3849d56e716da27ef97fe073f07038955bb8f7a..749bc1cdd62014f21f52e88e7f7af195bb6a5a39 100644 +index b4ee4b2681b9b5a8fdf9e377dadcb8483f7ecfb6..d5e45ffe813129397eaa4e42c7c8ad81414f61b1 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java @@ -488,7 +488,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index 96532ae564e8..aa607e613040 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 483ffe22371d1c96c49f611c24a84868bc71f2fc..103ed4b820547db6eaf66e5b37438051807ecb60 100644 +index e2d4bb5bc1673dfc21e279371a9b2014902a9151..fb0a86a2e977cef9ac963f18a91116a1a4127e6c 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -565,6 +565,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -577,6 +577,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 483ffe22371d1c96c49f611c24a84868bc71f2fc..103ed4b820547db6eaf66e5b37438051 content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION) { const auto& it = content_settings_status_.find(content_type); -@@ -587,6 +588,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -599,6 +600,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::MEDIASTREAM_CAMERA && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch b/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch index f28286f3b437..975f20d1400c 100644 --- a/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc -index e2daa7902cb753818d397ae81a08203f6fe9925d..387e52558161b269d372750a4d184b3ea683c4c5 100644 +index 2624e1d7f3c53b5acb3bc4c4d2335819008f1abf..d6a80dd10fad91b313bb367b92fe97a0578a0464 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -34,6 +34,7 @@ struct PrefsForManagedContentSettingsMapEntry { diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index de170a433425..12ee89c08f0d 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index a843fd46ab7e7ad0aa2ef047a6858d79fafb4ed8..389135634913978ff6f1af64bc67e1f45220be67 100644 +index e86808a6941532ffdd06147d922badde20de91a5..be5eb8fa40e6f1824e116c109ce5f05ec4140963 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc @@ -1933,8 +1933,8 @@ void DownloadItemImpl::OnDownloadCompleting() { diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch index 0b8633b37901..e8026303f78b 100644 --- a/patches/components-infobars-core-infobar_delegate.h.patch +++ b/patches/components-infobars-core-infobar_delegate.h.patch @@ -1,8 +1,8 @@ diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h -index 871bf785bf863ade7cdaa279a8c85626deb209a7..b689d147d12d8a745fb5667e9f33e78bce24323d 100644 +index 6b66e5a7c998377465d6881b9c4bbd9f442d9b16..decd6a95ec4f4545db04e6b5a68fb6ee5512a768 100644 --- a/components/infobars/core/infobar_delegate.h +++ b/components/infobars/core/infobar_delegate.h -@@ -181,6 +181,7 @@ class InfoBarDelegate { +@@ -184,6 +184,7 @@ class InfoBarDelegate { AUTOFILL_VIRTUAL_CARD_ENROLLMENT_INFOBAR_DELEGATE_MOBILE = 110, TAILORED_SECURITY_SERVICE_INFOBAR_DELEGATE = 111, CHROME_FOR_TESTING_INFOBAR_DELEGATE = 112, diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index f3ce819c9066..4f7f3cfa7ebe 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 8154d9295737fa9c248d0fb86440f405273bfde4..7345e75bed08364d209fae1959edc3792d0e599f 100644 +index 42080bd6db3ca2dd7333a99b8e5deab3cae35e7d..e68e855428fd734ad1812fc81cb26a1772d63518 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -317,6 +317,7 @@ static_library("browser") { +@@ -318,6 +318,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index b4721cfa55d9..fa35757b8475 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 30dcfc8c8a045207171d5b6887bf82a55f5b8763..5f858eed720ba95057bb9f42cc2ea0df07a0723f 100644 +index 79b5379140e781d2befcf88d46c918945878763b..6a0835d204a2805b78bcee9505314a54cd1d315b 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -347,6 +347,7 @@ AutocompleteController::AutocompleteController( @@ -10,7 +10,7 @@ index 30dcfc8c8a045207171d5b6887bf82a55f5b8763..5f858eed720ba95057bb9f42cc2ea0df } // Providers run in the order they're added. Add `HistoryURLProvider` after // `SearchProvider` because: -@@ -953,6 +954,7 @@ void AutocompleteController::UpdateResult( +@@ -970,6 +971,7 @@ void AutocompleteController::UpdateResult( #if DCHECK_IS_ON() result_.Validate(); #endif // DCHECK_IS_ON() diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 660965d383b9..b7c84190ce90 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 70243395694ba74a69a63249fc50e578d5f6d2fe..b358da1e833983626554c9eecb3702d7a6cd8b08 100644 +index 714596287e06586b4c7fe05fed8fa5f1596ee1cc..5adaddabb378451511d2baa1941e2ec2578980bc 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -487,6 +487,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 743d34760009..6436ad8777fd 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 704d471a34e2429fa338a784d92c6297d765e506..8cec2694a1d9f1a19718e8f8fc802aa6577f2774 100644 +index d57c9c95230c01b801dc79dde142e2b7bca47c49..04eb56f8d7228efd105757bbf181608c61eb41f8 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -143,6 +143,7 @@ source_set("permissions") { +@@ -142,6 +142,7 @@ source_set("permissions") { "contexts/geolocation_permission_context_mac.h", ] } diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index 19c54f124c95..c27a168b2432 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index 31639aee98932c155c263369e692501abee7db9e..00eb63c5531a454c32b32454bdfc15a4a44b99c4 100644 +index 0b37f607039a980ca59f1afa5dc4e6e2fd9aec04..280224b94c0b71a952fe6cb8a77d0a0c297a336c 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc @@ -315,6 +315,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 0575c5ff4b73..4f1891e582f5 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 0456bbee1dba30e19bf2cf88110d271385e2142c..4a2eb281b5dd777d7e2fe916bbf2137102b8b7d1 100644 +index 3d3bb299f3f52815d2cd7e4c7ae1a683ba9ae71e..f961fc48c9225e8021371a7daff3118c6afafa90 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h @@ -474,6 +474,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 285d5c057766..9573166eb356 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 74d072df0292e8ee2a4fa58dac446758cb59cc68..1f38f0efc1b666dcbd5d23875e23232fdad8c9e0 100644 +index ca48d1019d7f8feef5f0ecb3507c664822f99d2a..e420cb7814a02e09e8ba6b056a250cf488056479 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3439,16 +3439,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3444,16 +3444,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 99bfa9e7bc04..a7f3b1a1f35b 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 7de98e33360dfa2ab91f2f94ae106addd476114c..fe800d472ea33d87b40a88f52cd298c315f16d82 100644 +index a96b524a9265d5b77fbf02fc35d609e65743d313..769ff61bc2c90706e62e976c781b86d7c67767d8 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2922,6 +2922,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2998,6 +2998,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 7de98e33360dfa2ab91f2f94ae106addd476114c..fe800d472ea33d87b40a88f52cd298c3 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4408,6 +4409,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4484,6 +4485,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 05edc732428c..2f97dc874db2 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index a436c6a67b565e6cbb2a08af055cafab2d0d1086..8766284bc7cff793adb6e21e8d3e775005347a4e 100644 +index 99f1c9203e9763f7869fb92553edb77ddec3483b..2a96b2ca7f3b3f67bafc19c2b82fe1d492e4e435 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -2052,6 +2052,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2063,6 +2063,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 5e82f72fb7d3..c8ed935a1299 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 0176c0d3a43bbc49c2b2e492ef8d91b36875fecf..ce238f49e7993436c7a30bccf614bf5e0168ca11 100644 +index 531ec8c12a1c36dbcb3c73b4e90696c14147c97e..1e8faaadde4adfaf73d2d6ae166d1927d20891c3 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4458,6 +4458,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4446,6 +4446,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/extensions-renderer-native_extension_bindings_system.h.patch b/patches/extensions-renderer-native_extension_bindings_system.h.patch index b9064fa67274..201688f1e34c 100644 --- a/patches/extensions-renderer-native_extension_bindings_system.h.patch +++ b/patches/extensions-renderer-native_extension_bindings_system.h.patch @@ -1,8 +1,8 @@ diff --git a/extensions/renderer/native_extension_bindings_system.h b/extensions/renderer/native_extension_bindings_system.h -index b0cb48530c0f4147dfd9021612a1a4e9b91bbc17..8864a75bde791284720cf4b473368c659e555d52 100644 +index 31785e4d9052fa487d86b583c31eff75e7b9f2ae..330fe5293dec61da3f679c97aff10fcd1ed0751a 100644 --- a/extensions/renderer/native_extension_bindings_system.h +++ b/extensions/renderer/native_extension_bindings_system.h -@@ -41,6 +41,7 @@ class NativeExtensionBindingsSystem { +@@ -42,6 +42,7 @@ class NativeExtensionBindingsSystem { NativeExtensionBindingsSystem& operator=( const NativeExtensionBindingsSystem&) = delete; diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index f6993906d868..0a51a7b8e182 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 801a2fa7e2a3f44e2b82141b22f6c0ea1fdb321b..269d56ec75f1d16db5db2c1566dffaf5e70d6b10 100644 +index b18ca800bf1c3606d76d30c9afae848b0428eac8..d168f664d70151c09d52ac5021f62aa91d9ba87f 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1134,6 +1134,7 @@ component("net") { +@@ -1136,6 +1136,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index 8272d627ef5e..2c068ff11626 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index 581ba9542b6268fbec3d4c6b6bdb1b572c01f285..3269e3a99625d7474909f6dd5dcb039969f2cc4c 100644 +index ff42dffc08c92a91800aa1b1a764de8f49e0914b..09e63dbe525f2b320348174134b796ebeabf3c92 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -727,6 +727,7 @@ void CorsURLLoader::StartRequest() { +@@ -730,6 +730,7 @@ void CorsURLLoader::StartRequest() { (fetch_cors_flag_ || (request_.method != net::HttpRequestHeaders::kGetMethod && request_.method != net::HttpRequestHeaders::kHeadMethod))) { diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index d510aeb7c31a..cfda19f3f516 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index 8d874bc51f2c6f576ca0e7f99f8eaaf2bc98a0e0..1e6518c48627e79e43c644540792cdfd75f59aea 100644 +index d23e85462ba39b3f0003431f8301c18e1d43bb14..dc58c49ec5b570b714911c5d25c04f5f92258f09 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -182,6 +182,7 @@ component("cpp") { +@@ -183,6 +183,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 5949050a6441..54b69cfe922c 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 507b69129cdbe9914893cc70e6536e25ea43dbea..04ddd4b49136958ab26ea895080eb44c3f888bdc 100644 +index 1ba87c3eb1c617190b584d8eab01e540cba39eb8..748bd741aa18acc62f9df88c3738aa6eebb2f4af 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2622,6 +2622,7 @@ generated_interface_sources_in_modules = [ +@@ -2644,6 +2644,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 7c80496ba005..9126efbde0be 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index 4ca7b688c9a74d709b4eede65edad7c018bc4f33..7346c537b6088627f1d1e5e263e72bde4f0ea34b 100644 +index 293f44c52f72dea7bd583162ae2481cd107e8608..d1d9a817006f07af5ceb5fdf5984086f93cd0835 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1176,6 +1176,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1184,6 +1184,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index a2d0b36523be..2e7c60f0b596 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 6530a17d2e991c4b20759a11344fe9b7488d2adb..04c55be96308d0185fe84a27985b5b2b3ed798a3 100644 +index e6cfaa6d322f9766ade654bf82484d9e8aa18ae4..98fa4f243dae7728008401db0b113086af15faa5 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -368,6 +368,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 0c71c3ee144e..25ca3ddbe234 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 528527e1819211240b705d0018b8fe38f3bc88d2..5952f9b20254c4275b9d4fb2dafb5648981418c7 100644 +index a966af5c5a130217d86b39493ce96803a050088d..f69abcf1d25e5e581a7d6c6f20bb7c49fe87efd6 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -1066,6 +1066,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1067,6 +1067,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch index ec24544c8eaa..598a6e23653d 100644 --- a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch +++ b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -index afa13c20e94797da3c130b78a94d67f36eb2968a..69f83c713c04543f007c2ba3373a4ac7f0b9ad9b 100644 +index e677d78fc33d6ea2afe4ba9ff4dfe0307b9d723d..7f1cba8ea9379a793acd0f06d80cb9ab1b21e119 100644 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -@@ -404,5 +404,13 @@ +@@ -408,5 +408,13 @@ name: "WindowPlacement", permissions_policy_name: "window-placement", }, diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index f96be5c1c7c0..da3b9b548d96 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 40eb674753300791ac091ae420886e962560c7ce..d338cb351fd7f2eed113a6f09a958f09ee98dd74 100644 +index 630a696497ad7b61afbb0510c05daabc03669c26..2e6bf83e3a7169f82cbe7c320e931f34ca133d6d 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -15,6 +15,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index 40eb674753300791ac091ae420886e962560c7ce..d338cb351fd7f2eed113a6f09a958f09 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -169,6 +170,7 @@ component("modules") { +@@ -170,6 +171,7 @@ component("modules") { # generating the snapshot for android, blink is compiled with # current_os="linux" and target_os="android". Using target_os is necessary as # we need to compile in the same way as would happen when current_os="android". diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 4df18f9e713d..71cb9db8b46e 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 8b9a477469ed51dad8d78c4b544b77f3bb73088b..8d00de3e4de4bf5b1eb3f081a9f1082a0d7390e4 100644 +index c43fa84a284e07bbbd363b2de3201da39e58a977..695d73dd2071757a0b2e21d3929196bf0af66334 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -889,6 +889,7 @@ void MediaDevices::DevicesEnumerated( +@@ -859,6 +859,7 @@ void MediaDevices::DevicesEnumerated( } } diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index a2dae6fd080b..50df82f5a4b0 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 11a2294eba6323e1354271fb97c9edb58ee5ac5d..23c5f091d02afb47d68df5c019f9468e0520d127 100644 +index 29a7eb3d9ed28f27d129a0aeece728f0b10cf9e2..4bc7fc1dbb12a7dea4d0a5e10d172bca6e39ffb2 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1849,6 +1849,7 @@ component("platform") { +@@ -1840,6 +1840,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch b/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch index 9559a3c2c647..07187d84f969 100644 --- a/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch +++ b/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch @@ -1,8 +1,8 @@ diff --git a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -index 461051842dc9fbebf8798b7551e8659bf97e31e3..b3d32f3a9dd9064b930c3c8027cca062de93b297 100644 +index 623c7a58dbccadc403ffd1410853e5455d9c9d30..1076a9338142b65981bce22414a8bedd4a5cd74b 100644 --- a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py +++ b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -@@ -475,3 +475,4 @@ def FindAllAvailableBrowsers(finder_options, device): +@@ -477,3 +477,4 @@ def FindAllAvailableBrowsers(finder_options, device): return [] return browsers diff --git a/patches/tools-json_schema_compiler-feature_compiler.py.patch b/patches/tools-json_schema_compiler-feature_compiler.py.patch index 35f990dc2df1..8c0baefdc1a4 100644 --- a/patches/tools-json_schema_compiler-feature_compiler.py.patch +++ b/patches/tools-json_schema_compiler-feature_compiler.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py -index 7a938eb885b77856948a271ed9b40372491c2145..f87a833d4817cd1bcb043ea35baa603e694bd25a 100644 +index 72fd4b50c91ea3a0715abcc0c667136d02df0c84..a95eddab1142a45f8a1d9f839a05c4d36c20aa7c 100644 --- a/tools/json_schema_compiler/feature_compiler.py +++ b/tools/json_schema_compiler/feature_compiler.py @@ -774,6 +774,7 @@ class FeatureCompiler(object): diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index bab06838b156..244dfee284c9 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,5 +1,5 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index bbbe55cc127dc68426cc7e26a6a1947e51daf361..5095a530052693b221468270a971f4c5bb5ae24b 100644 +index e1251e3c35f1a96efc2d50f87e86f565990f67ab..1fe3e3341d453f9081196814b16a0f05db16e342 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml @@ -4234,6 +4234,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 30fc6b4d6395..f6b685319104 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index 3d77a407eb119bcf35360b63e8983234348694db..d2cb0d3cb7eefdf0a9f1da52e6c44ff277178646 100644 +index a679ec857c2500ceba91fc7fdda2d077cf26553e..bfa037103f08a6ec814283e4cdd7b61ce53ea32e 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -2264,6 +2264,7 @@ void CollectAncestorRoles( +@@ -2263,6 +2263,7 @@ void CollectAncestorRoles( if (!_node) return nil; diff --git a/patches/ui-views-controls-button-md_text_button.cc.patch b/patches/ui-views-controls-button-md_text_button.cc.patch index 0f0c33d66b11..50506d2eecd3 100644 --- a/patches/ui-views-controls-button-md_text_button.cc.patch +++ b/patches/ui-views-controls-button-md_text_button.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc -index 2110ef33b92bd6535bf243c03ae0fe2ee7cea5d4..8214c1cb8db1ccd3d9a6a5c347b91af13b5892b0 100644 +index 21ab6b7014ae9fcb1821a3271ee17f171eb28b96..81ef08c9b9015ff32fcfa65bc7f3983db0a31f63 100644 --- a/ui/views/controls/button/md_text_button.cc +++ b/ui/views/controls/button/md_text_button.cc -@@ -250,6 +250,7 @@ void MdTextButton::UpdateColors() { +@@ -265,6 +265,7 @@ void MdTextButton::UpdateColors() { UpdateTextColor(); UpdateBackgroundColor(); SchedulePaint(); diff --git a/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch b/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch index cd07bcbb66cf..549565197acc 100644 --- a/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch +++ b/patches/ui-webui-resources-cr_elements-cr_lottie-cr_lottie.ts.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts b/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts -index 8a4039e6732523a72c939e9d8860398996f78747..178b169623574666bebf2700906c8d926a4bc5b2 100644 +index 629d74d3f2dff63cf51895d10c0067367fec208b..84579bd935c8e394cb623e8ed8ccea4483748ef5 100644 --- a/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts +++ b/ui/webui/resources/cr_elements/cr_lottie/cr_lottie.ts -@@ -361,6 +361,7 @@ export class CrLottieElement extends PolymerElement { +@@ -360,6 +360,7 @@ export class CrLottieElement extends PolymerElement { this.fire_('cr-lottie-paused'); } else if (event.data.name === 'stopped') { this.fire_('cr-lottie-stopped'); diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index fdd48a2bc5ba..62558493c5bc 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/BUILD.gn b/BUILD.gn -index c81ce84b91119eae98688d3da9bede622af743d8..363878a5caffd489ae5e0d3b7e78fa02c71a8fd1 100644 +index 1d9a331f1c65c50cd98b966b3d9e826d4124192b..f2eb84310d5dbeccc259888865ab4276ed139ed3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -629,6 +629,7 @@ config("internal_config_base") { @@ -10,7 +10,7 @@ index c81ce84b91119eae98688d3da9bede622af743d8..363878a5caffd489ae5e0d3b7e78fa02 } config("internal_config") { -@@ -2657,6 +2658,7 @@ v8_header_set("v8_headers") { +@@ -2658,6 +2659,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] diff --git a/patches/v8/src-codegen-compiler.cc.patch b/patches/v8/src-codegen-compiler.cc.patch index a5a747c0f6b7..2fa50e8a0e5d 100644 --- a/patches/v8/src-codegen-compiler.cc.patch +++ b/patches/v8/src-codegen-compiler.cc.patch @@ -1,8 +1,8 @@ diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc -index c87b78ae19af1ea7fa7b9e4908722670dfa70860..46edf27515b1a8e218373c655c3685cf0289e0a7 100644 +index e8bbe066f93a66feca48eb17032c21d8d8e19478..32ac940fe1ed1ad5bbc0bc8cd7fd4030cfb9b063 100644 --- a/src/codegen/compiler.cc +++ b/src/codegen/compiler.cc -@@ -2870,6 +2870,7 @@ MaybeHandle Compiler::GetFunctionFromEval( +@@ -2871,6 +2871,7 @@ MaybeHandle Compiler::GetFunctionFromEval( } } DCHECK(is_compiled_scope.is_compiled()); From b7f10d7d067b4dc7b8bade6018bac1e23bddbd82 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 06:00:05 +0000 Subject: [PATCH 073/146] Updated strings for Chromium 110.0.5476.3. --- app/generated_resources.grd | 134 +++++++++++++----- app/generated_resources_override.grd | 9 +- app/os_settings_strings.grdp | 53 ++++++- app/password_manager_ui_strings.grdp | 9 ++ app/settings_strings.grdp | 21 ++- .../strings/android_chrome_strings.grd | 36 +++-- components/autofill_payments_strings.grdp | 3 + components/components_strings.grd | 1 - components/password_manager_strings.grdp | 12 +- components/payments_strings.grdp | 3 + 10 files changed, 224 insertions(+), 57 deletions(-) diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 3dc6c7482538..5e49021ce1d6 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -788,12 +788,6 @@ are declared in tools/grit/grit_rule.gni. Search page with $1Google Lens - - Search any part of the page with $1Google Lens - - - Search inside image with $1Google Lens - Search images with $1Google Lens @@ -1057,12 +1051,6 @@ are declared in tools/grit/grit_rule.gni. Search Page with $1Brave - - Search Any Part of the Page with $1Google Lens - - - Search inside Image with $1Google Lens - Search Images with $1Google Lens @@ -1855,7 +1843,7 @@ are declared in tools/grit/grit_rule.gni. $1bla.exe is being scanned. - + $1bla.exe can't be downloaded securely @@ -1876,10 +1864,10 @@ are declared in tools/grit/grit_rule.gni. This file is dangerous - + $1bla.exe can't be downloaded securely - + $1bla.exe can't be downloaded securely @@ -1897,7 +1885,7 @@ are declared in tools/grit/grit_rule.gni. This type of file may harm your computer. - + This file can't be downloaded securely @@ -1926,7 +1914,7 @@ are declared in tools/grit/grit_rule.gni. - + Insecure download blocked @@ -2136,17 +2124,17 @@ are declared in tools/grit/grit_rule.gni. - + $1file.exe is being scanned. - + $1file.exe can't be downloaded securely. - + $1file.exe can't be downloaded securely. Press Shift+F6 to cycle to the downloads bar area. @@ -2206,7 +2194,7 @@ are declared in tools/grit/grit_rule.gni. &More information - + &Learn more @@ -2257,7 +2245,7 @@ are declared in tools/grit/grit_rule.gni. &More Information - + &Learn More @@ -2381,6 +2369,9 @@ are declared in tools/grit/grit_rule.gni. Delete + + $1bla.exe $2blocked dangerous more details + Resume @@ -2507,33 +2498,54 @@ are declared in tools/grit/grit_rule.gni. Anyone using this device can see downloaded files - + Resume - + + Resume $1bla.exe + + Pause - + + Pause $1bla.exe + + Cancel - + + Cancel $1bla.exe + + Open + + Open $1bla.exe + - + Show in Finder + + Show $1bla.exe in Finder + - + Show in folder + + Show $1bla.exe in folder + - + Show in Folder + + Show $1bla.exe in Folder + @@ -3683,6 +3695,22 @@ are declared in tools/grit/grit_rule.gni. Switch to captured tab + + + Casting this tab + + + Casting a tab + + + Casting $1youtube.com + + + Cast this tab instead + + + Stop casting + @@ -5237,6 +5265,24 @@ Keep your key file in a safe place. You will need it to create new versions of y + + + Ask your admin to update this app + + + Brave Apps are migrating to Progressive Web Apps. This Brave App was installed on your browser by your organization. To open the Progressive Web App from the Apps list, first contact your administrator and ask them to uninstall the Brave App. In the meantime, you can visit $1sheets.google.com to open $2Brave Sheets on the web. + + + + Go To Site + + + + + Go to site + + + $12 apps are no longer supported @@ -8201,6 +8247,12 @@ Check your passwords anytime in $1Brave P Previous track + + Previous slide + + + Next slide + @@ -11179,9 +11231,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Microphone is turned off in Mac System Preferences - + Open Preferences + + Open Settings + Camera @@ -11949,6 +12004,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Camera + + Geolocation + File Info @@ -11969,6 +12027,16 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Nexus 5 detected + + + + An extension is using a HID device + + + Click to manage permissions for "$1Brave Translate" + + + @@ -13434,14 +13502,8 @@ Please help our engineers fix this problem. Tell us what happened right before y - Drag over any image to search - - Select image area to search - - Select any part of the page to search - Thumbnail tab strip for tablet mode diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index bdad29c667de..e2fd0dbfb3a2 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -515,6 +515,10 @@ are declared in tools/grit/grit_rule.gni. + + + + @@ -1015,7 +1019,10 @@ are declared in tools/grit/grit_rule.gni. - + + + + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 02283a9bd43b..e67ccf92637c 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -1237,6 +1237,24 @@ Use Ctrl + Alt + Brightness down to zoom out. Speech + + Language + + + Device language + + + Voice + + + System voice settings + + + System voice + + + Default natural voice + Highlighting @@ -1252,6 +1270,12 @@ Use Ctrl + Alt + Brightness down to zoom out. Text will be sent to Brave for processing. + + Natural voice + + + $1English (United States) Voice $22 + Highlight color @@ -1978,7 +2002,13 @@ Press an assigned switch or key to remove assignment. Container name - IP + IP address + + + Share microphone + + + App badge color Create a new container @@ -2853,6 +2883,21 @@ Press an assigned switch or key to remove assignment. Uses your Chromebook’s mobile data and your carrier may charge additional fees. May increase battery usage. <a target="_blank" href="$1">Learn more</a> + + Hotspot enable + + + On + + + Off + + + Hotspot enabled + + + Hotspot disabled + Wi-Fi networks @@ -4342,6 +4387,9 @@ Press an assigned switch or key to remove assignment. App badging + + Show notification dot on app icon + Google Play Store @@ -4563,6 +4611,9 @@ Press an assigned switch or key to remove assignment. No microphone + + To turn on microphone access, turn on the physical microphone switch on your device + Location access diff --git a/app/password_manager_ui_strings.grdp b/app/password_manager_ui_strings.grdp index 35d056d531f0..6fb49c969670 100644 --- a/app/password_manager_ui_strings.grdp +++ b/app/password_manager_ui_strings.grdp @@ -58,6 +58,9 @@ Your passwords will be visible to anyone who can see the exported file. + + Exporting passwords... + Password Checkup @@ -153,4 +156,10 @@ Signed in with + + Username copied to clipboard + + + Password copied to clipboard + diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 6d49899a0227..adde82600fb1 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -1005,8 +1005,8 @@ - - Use TouchID when filling passwords + + Use your screen lock when filling passwords @@ -2071,6 +2071,18 @@ =1 {Permissions removed from <b>1 site</b> you haven’t visited recently} other {Permissions removed from <b>{NUM_SITES} sites</b> you haven’t visited recently}} + + Removed $1location + + + Removed $1location, $2notifications + + + Removed $1location, $2notifications, $3camera + + + Removed $1location, $2notifications, and $32 more + {NUM_SITES, plural, =1 {Permissions removed for 1 site} @@ -2078,7 +2090,7 @@ {NUM_SITES, plural, - =1 {To protect your data, permissions were removed from this site you haven't visited in 2 months} + =1 {To protect your data, permissions were removed from a site you haven't visited in 2 months} other {To protect your data, permissions were removed from sites you haven't visited in 2 months}} @@ -2508,6 +2520,9 @@ Reset all settings + + Learn more about resetting settings + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index c5854e65c329..9b685398ad50 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -1154,6 +1154,9 @@ Private state tokens improve privacy on the web and can’t be used to find out Esed purus vestibulum velit convalli + + More + @@ -1268,18 +1271,27 @@ Private state tokens improve privacy on the web and can’t be used to find out Enabled Nulla eros tortor, placerat blandit dictum a, interdum id metus + + Disabled Nulla eros tortor, placerat blandit dictum a, interdum id metus + Aenean erat leo Enabled Duis scelerisque a mi eget ultricies + + Disabled Duis scelerisque a mi eget ultricies + Vestibulum augue erat Enabled Vivamus id lacus et lacus porttitor vulputate. Sed semper egestas orci vel maximus. + + Disabled Vivamus id lacus et lacus porttitor vulputate. Sed semper egestas orci vel maximus. + @@ -1969,13 +1981,13 @@ Your Brave account may have other forms of browsing history like searches and ac - + File can’t be downloaded securely - + Keep - + Discard @@ -2105,6 +2117,7 @@ Your Brave account may have other forms of browsing history like searches and ac Waiting for details of parents. + This browser is managed by %1$sparent1@gmail.com. @@ -2123,6 +2136,15 @@ Your Brave account may have other forms of browsing history like searches and ac Allow all sites + + If you need help, ask your parent + + + If you need help, ask your parent (%1$sparent1@gmail.com) + + + If you need help, ask your parent (%1$sparent1@gmail.com or %2$sparent2@gmail.com) + @@ -4460,8 +4482,8 @@ To change this setting, <resetlink>reset sync

Go to Following - - Refresh to view + + Refresh Can’t follow. Something went wrong. @@ -5123,10 +5145,6 @@ To change this setting, <resetlink>reset sync

- - Brave Assistant in Brave - - Developer UI diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 0915e3e8c190..15012b71bee7 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -776,6 +776,9 @@ Manage payment methods + + Autofill payment info + diff --git a/components/components_strings.grd b/components/components_strings.grd index a2c652b21014..15ffd701965f 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -281,7 +281,6 @@ - diff --git a/components/password_manager_strings.grdp b/components/password_manager_strings.grdp index 9b8c92494d3f..b2a2b882a9db 100644 --- a/components/password_manager_strings.grdp +++ b/components/password_manager_strings.grdp @@ -151,22 +151,22 @@ fill your password on $1google.com - Protect passwords with TouchID + Protect passwords with your screen lock - If you share this device with others, you can turn on TouchID to verify it's you whenever you use a saved password + If you share this device with others, you can use your screen lock to verify it's you whenever you use a saved password - turn on TouchID for filling passwords + use your screen lock for filling passwords - turn off TouchID for filling passwords + stop using your screen lock for filling passwords - TouchID is on for filling passwords + You're using your screen lock for filling passwords - You can turn TouchID on or off in $1Settings + You can change whether you use your screen lock for filling passwords in $1Settings diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index cecc3219c42f..e7e93fbbd417 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -572,6 +572,9 @@ Back + + Close + Edit From 9d991c024d3083cd2eef95278118734d230a4257 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 05:48:59 +0000 Subject: [PATCH 074/146] Settings router.js path moved Chromium change: https://chromium.googlesource.com/chromium/src/+/62f2cba3cde3c8bdb617330d049aa2b93fcb0499 commit 62f2cba3cde3c8bdb617330d049aa2b93fcb0499 Author: Keishi Hattori Date: Fri Dec 9 02:50:22 2022 +0000 Reland "Settings: Fork router.js for OS Settings and migrate to TypeScript" This reverts commit 2e66af8bcf8fc6b6ab47764e1871d8bbd6503c22. Reason for revert: Will disable test instead of reverting Original change's description: > Revert "Settings: Fork router.js for OS Settings and migrate to TypeScript" > > This reverts commit d3cc2c8e4cb1a9bffbf358a161b9d9379f76fc31. > > Reason for revert: Causing merge conflict for revert > https://chromium-review.googlesource.com/c/chromium/src/+/4090764 > > Original change's description: > > Settings: Fork router.js for OS Settings and migrate to TypeScript > > > > Migrate router to TypeScript, so that it can use non-deprecated > > shared resources files, and move the old JS router to OS Settings, > > which still needs it for closure compilation. > > > > Bug: 1316438, 1396704 > > Change-Id: Ibe71bfd339295503743a4d645dacd06138ba7a00 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4085819 > > Commit-Queue: Rebekah Potter > > Reviewed-by: Demetrios Papadopoulos > > Reviewed-by: Xiaohui Chen > > Cr-Commit-Position: refs/heads/main@{#1081247} > > Bug: 1316438, 1396704 > Change-Id: I0f886e96fa0dc4cf0031eb2041b6421d375065a3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4090925 > Owners-Override: Keishi Hattori > Commit-Queue: Keishi Hattori > Bot-Commit: Rubber Stamper > Cr-Commit-Position: refs/heads/main@{#1081268} Bug: 1316438, 1396704 --- browser/resources/settings/brave_routes.ts | 2 +- ...chrome-browser-resources-settings-router.ts.patch | 12 ++++++++++++ ...owser-resources-settings-settings_routes.ts.patch | 10 ---------- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 patches/chrome-browser-resources-settings-router.ts.patch delete mode 100644 patches/chrome-browser-resources-settings-settings_routes.ts.patch diff --git a/browser/resources/settings/brave_routes.ts b/browser/resources/settings/brave_routes.ts index bba2022bfbc6..26293a33d7c3 100644 --- a/browser/resources/settings/brave_routes.ts +++ b/browser/resources/settings/brave_routes.ts @@ -7,7 +7,7 @@ import {pageVisibility} from './brave_overrides/page_visibility.js' import {loadTimeData} from './i18n_setup.js' -import {SettingsRoutes} from './settings_routes.js'; +import {SettingsRoutes} from 'chrome://settings/settings.js'; export default function addBraveRoutes(r: Partial) { const isGuest = loadTimeData.getBoolean('isGuest') diff --git a/patches/chrome-browser-resources-settings-router.ts.patch b/patches/chrome-browser-resources-settings-router.ts.patch new file mode 100644 index 000000000000..77569c07f948 --- /dev/null +++ b/patches/chrome-browser-resources-settings-router.ts.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts +index 384f546685777b5366f7bfe60c991017e31a082e..e3313869fb4dd310861bf60333f4ea47c7363023 100644 +--- a/chrome/browser/resources/settings/router.ts ++++ b/chrome/browser/resources/settings/router.ts +@@ -98,6 +98,7 @@ export interface SettingsRoutes { + SYNC_ADVANCED: Route; + SYSTEM: Route; + TRIGGERED_RESET_DIALOG: Route; ++ GET_STARTED: Route; SHIELDS: Route; SOCIAL_BLOCKING: Route; REWARDS: Route; EXTENSIONS: Route; BRAVE_SYNC: Route; BRAVE_SYNC_SETUP: Route; BRAVE_IPFS: Route; BRAVE_WALLET: Route; BRAVE_WEB3: Route; BRAVE_HELP_TIPS: Route; BRAVE_NEW_TAB: Route; THEMES: Route; + } + + /** Class for navigable routes. */ diff --git a/patches/chrome-browser-resources-settings-settings_routes.ts.patch b/patches/chrome-browser-resources-settings-settings_routes.ts.patch deleted file mode 100644 index 1320c3a73f93..000000000000 --- a/patches/chrome-browser-resources-settings-settings_routes.ts.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts -index 021b9c141285c1d79cd1c2507dc71207b9ee14fc..926bd99e567ff2ec14582ee226cd77a7d58a2fec 100644 ---- a/chrome/browser/resources/settings/settings_routes.ts -+++ b/chrome/browser/resources/settings/settings_routes.ts -@@ -94,4 +94,5 @@ export interface SettingsRoutes { - SYNC_ADVANCED: Route; - SYSTEM: Route; - TRIGGERED_RESET_DIALOG: Route; -+ GET_STARTED: Route; SHIELDS: Route; SOCIAL_BLOCKING: Route; REWARDS: Route; EXTENSIONS: Route; BRAVE_SYNC: Route; BRAVE_IPFS: Route; BRAVE_WALLET: Route; BRAVE_WEB3: Route; BRAVE_HELP_TIPS: Route; BRAVE_NEW_TAB: Route; THEMES: Route; - } From 4cc494e661ab86570adb78d7bd7cd9561a973d01 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 05:51:14 +0000 Subject: [PATCH 075/146] base::Value modernisation on sandbox_unpacker.cc override Chromium change: https://chromium.googlesource.com/chromium/src/+/55309356533712a767fd72b667c20b07680d1aa8 commit 55309356533712a767fd72b667c20b07680d1aa8 Author: Matt Reynolds Date: Mon Dec 12 21:02:20 2022 +0000 [Code-Health] Use base::Value::Dict for extension manifests Bug: 1366865 --- chromium_src/extensions/browser/sandboxed_unpacker.cc | 6 ++---- patches/extensions-browser-sandboxed_unpacker.cc.patch | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/chromium_src/extensions/browser/sandboxed_unpacker.cc b/chromium_src/extensions/browser/sandboxed_unpacker.cc index 7b9dddbc7294..ac5d4ef420c7 100644 --- a/chromium_src/extensions/browser/sandboxed_unpacker.cc +++ b/chromium_src/extensions/browser/sandboxed_unpacker.cc @@ -41,10 +41,8 @@ bool BraveRewriteManifest(const std::string& extension_id, } // namespace brave -#define BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE \ - base::Value::Dict* dict_manifest = final_manifest.GetIfDict(); \ - DCHECK(dict_manifest); \ - brave::BraveRewriteManifest(extension_id_, dict_manifest); +#define BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE \ + brave::BraveRewriteManifest(extension_id_, &final_manifest); #include "src/extensions/browser/sandboxed_unpacker.cc" #undef BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index 06b8b10f65ee..31dcebb98ca0 100644 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch @@ -1,11 +1,11 @@ diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index 3c0c30858dde7341e22129d7a993b95368b1162b..93534619d9da0549857f3da3279efd83ea8de4fe 100644 +index 182ba5bd4eab8c23789fafb9e0943e78fd730c99..5d973142c728120b5612e60afce4a70f4f029f5a 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc -@@ -1049,6 +1049,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( +@@ -1045,6 +1045,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( DCHECK(!public_key_.empty()); - base::Value final_manifest = manifest.Clone(); - final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_); + base::Value::Dict final_manifest = manifest.Clone(); + final_manifest.Set(manifest_keys::kPublicKey, public_key_); + BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE { From 5d61c4f8710ac5104c729c802a582a73ac5a2817 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 16:30:06 +0000 Subject: [PATCH 076/146] Expect-CT removed upstream Chromium change: https://chromium.googlesource.com/chromium/src/+/fcd1ed2e85d65d2c4161cbce58c14e6bf3b6b9ec commit fcd1ed2e85d65d2c4161cbce58c14e6bf3b6b9ec Author: Emily Stark Date: Wed Dec 7 18:37:46 2022 +0000 Delete Expect-CT This deletes the code for Expect-CT, an obsolete featured that was deprecated and has been disabled by default for several milestones. The CL mostly contains mechanical code deletion. One exception is that there is new code in net/http/transport_security_persister.cc (and corresponding unit test) to delete Expect-CT entries when they are read from disk. Bug: 1232560 --- app/brave_main_delegate_browsertest.cc | 1 - chromium_src/net/base/features.cc | 2 -- chromium_src/net/http/transport_security_state.cc | 4 +--- .../input_file_parsers.cc | 8 ++++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index 6e3f4e89be3d..e656688ba650 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -197,7 +197,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, EnabledFeatures) { #endif &media::kEnableTabMuting, &net::features::kPartitionConnectionsByNetworkIsolationKey, - &net::features::kPartitionExpectCTStateByNetworkIsolationKey, &net::features::kPartitionHttpServerPropertiesByNetworkIsolationKey, &net::features::kPartitionSSLSessionsByNetworkIsolationKey, &net::features::kSplitHostCacheByNetworkIsolationKey, diff --git a/chromium_src/net/base/features.cc b/chromium_src/net/base/features.cc index bf83e1ebdddc..89bb84f00354 100644 --- a/chromium_src/net/base/features.cc +++ b/chromium_src/net/base/features.cc @@ -16,8 +16,6 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kPartitionConnectionsByNetworkIsolationKey, base::FEATURE_ENABLED_BY_DEFAULT}, {kPartitionedCookies, base::FEATURE_DISABLED_BY_DEFAULT}, - {kPartitionExpectCTStateByNetworkIsolationKey, - base::FEATURE_ENABLED_BY_DEFAULT}, {kPartitionHttpServerPropertiesByNetworkIsolationKey, base::FEATURE_ENABLED_BY_DEFAULT}, {kPartitionSSLSessionsByNetworkIsolationKey, diff --git a/chromium_src/net/http/transport_security_state.cc b/chromium_src/net/http/transport_security_state.cc index c8e7dd9fef24..080bd5a80da1 100644 --- a/chromium_src/net/http/transport_security_state.cc +++ b/chromium_src/net/http/transport_security_state.cc @@ -13,9 +13,7 @@ #if !BUILDFLAG(IS_ANDROID) -#define BRAVE_ENABLE_STATIC_PINS \ - enable_static_pins_ = true; \ - enable_static_expect_ct_ = true; +#define BRAVE_ENABLE_STATIC_PINS enable_static_pins_ = true; #else diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 7ded414d3e13..de47a501fb19 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -1,7 +1,7 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. +/* Copyright (c) 2019 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #define ParseJSON ParseJSON_ChromiumImpl #define ParseCertificatesFile ParseCertificatesFile_ChromiumImpl @@ -368,9 +368,9 @@ bool ParseJSON(base::StringPiece json, for (auto& entry : chromium_entries) { // Google has asked us not to include the pins that ship with Chrome, - // but we do want the preloaded HSTS and Expect CT entries. + // but we do want the preloaded HSTS entries. entry->pinset = ""; - if (!entry->force_https && !entry->expect_ct) { + if (!entry->force_https) { continue; } From f803968041f176381e52f11daacea713a4d44f02 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 16:34:03 +0000 Subject: [PATCH 077/146] base::Value modernisation for Component Installer Chromium change: https://chromium.googlesource.com/chromium/src/+/288023bfb5c392e8b2643f2bd68ab86a67c1789a commit 288023bfb5c392e8b2643f2bd68ab86a67c1789a Author: Ashley Newson Date: Fri Dec 9 15:36:03 2022 +0000 [CodeHealth] Migrate component installers to use base::Value::Dict ComponentInstaller, ComponentInstallerPolicy, and related classes use dictionary values for manifest parameters. Originally, these parameters used base::DictionaryValue, and were migrated to v1 of the base::Value API in change 3138699, which replaced base::DictionaryValue with base::Value. This change now replaces the use of base::Value with the more type safe base::Value::Dict, in keeping with the v2 base::Value API. Some tightly related utility methods are also updated to follow the v2 base::Value API. Bug: 1395007 --- .../brave_component_installer.cc | 16 ++++++++-------- .../brave_component_installer.h | 6 +++--- .../browser/ad_block_component_installer.cc | 12 ++++++------ .../browser/wallet_data_files_installer.cc | 12 ++++++------ .../media_detector_component_installer.cc | 12 ++++++------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/browser/component_updater/brave_component_installer.cc b/browser/component_updater/brave_component_installer.cc index 6821802b910b..153a58f938ae 100644 --- a/browser/component_updater/brave_component_installer.cc +++ b/browser/component_updater/brave_component_installer.cc @@ -31,13 +31,13 @@ using InstallError = update_client::InstallError; namespace { bool RewriteManifestFile(const base::FilePath& extension_root, - const base::Value& manifest, + const base::Value::Dict& manifest, const std::string& public_key) { // Add the public key DCHECK(!public_key.empty()); - base::Value final_manifest = manifest.Clone(); - final_manifest.SetStringKey("key", public_key); + base::Value::Dict final_manifest = manifest.Clone(); + final_manifest.Set("key", public_key); std::string manifest_json; JSONStringValueSerializer serializer(&manifest_json); @@ -55,9 +55,9 @@ bool RewriteManifestFile(const base::FilePath& extension_root, return true; } -std::string GetManifestString(base::Value* manifest, +std::string GetManifestString(base::Value::Dict* manifest, const std::string& public_key) { - manifest->SetStringKey("key", public_key); + manifest->Set("key", public_key); std::string manifest_json; JSONStringValueSerializer serializer(&manifest_json); @@ -85,7 +85,7 @@ BraveComponentInstallerPolicy::BraveComponentInstallerPolicy( BraveComponentInstallerPolicy::~BraveComponentInstallerPolicy() = default; bool BraveComponentInstallerPolicy::VerifyInstallation( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) const { // The manifest file will generate a random ID if we don't provide one. // We want to write one with the actual extensions public key so we get @@ -108,7 +108,7 @@ bool BraveComponentInstallerPolicy::RequiresNetworkEncryption() const { update_client::CrxInstaller::Result BraveComponentInstallerPolicy::OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return Result(InstallError::NONE); } @@ -118,7 +118,7 @@ void BraveComponentInstallerPolicy::OnCustomUninstall() {} void BraveComponentInstallerPolicy::ComponentReady( const base::Version& version, const base::FilePath& install_dir, - base::Value manifest) { + base::Value::Dict manifest) { ready_callback_.Run(install_dir, GetManifestString(&manifest, base64_public_key_)); } diff --git a/browser/component_updater/brave_component_installer.h b/browser/component_updater/brave_component_installer.h index eae21cfd652a..61c6cff39bed 100644 --- a/browser/component_updater/brave_component_installer.h +++ b/browser/component_updater/brave_component_installer.h @@ -39,17 +39,17 @@ class BraveComponentInstallerPolicy private: // The following methods override ComponentInstallerPolicy - bool VerifyInstallation(const base::Value& manifest, + bool VerifyInstallation(const base::Value::Dict& manifest, const base::FilePath& install_dir) const override; bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; void ComponentReady(const base::Version& version, const base::FilePath& install_dir, - base::Value manifest) override; + base::Value::Dict manifest) override; base::FilePath GetRelativeInstallDir() const override; void GetHash(std::vector* hash) const override; std::string GetName() const override; diff --git a/components/brave_shields/browser/ad_block_component_installer.cc b/components/brave_shields/browser/ad_block_component_installer.cc index 1973df1feb21..10c17a2d0e88 100644 --- a/components/brave_shields/browser/ad_block_component_installer.cc +++ b/components/brave_shields/browser/ad_block_component_installer.cc @@ -79,14 +79,14 @@ class AdBlockComponentInstallerPolicy bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; - bool VerifyInstallation(const base::Value& manifest, + bool VerifyInstallation(const base::Value::Dict& manifest, const base::FilePath& install_dir) const override; void ComponentReady(const base::Version& version, const base::FilePath& path, - base::Value manifest) override; + base::Value::Dict manifest) override; base::FilePath GetRelativeInstallDir() const override; void GetHash(std::vector* hash) const override; std::string GetName() const override; @@ -126,7 +126,7 @@ bool AdBlockComponentInstallerPolicy::RequiresNetworkEncryption() const { update_client::CrxInstaller::Result AdBlockComponentInstallerPolicy::OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return update_client::CrxInstaller::Result(0); } @@ -136,12 +136,12 @@ void AdBlockComponentInstallerPolicy::OnCustomUninstall() {} void AdBlockComponentInstallerPolicy::ComponentReady( const base::Version& version, const base::FilePath& path, - base::Value manifest) { + base::Value::Dict manifest) { ready_callback_.Run(path); } bool AdBlockComponentInstallerPolicy::VerifyInstallation( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) const { return true; } diff --git a/components/brave_wallet/browser/wallet_data_files_installer.cc b/components/brave_wallet/browser/wallet_data_files_installer.cc index a0590a647afb..4706ade10ad9 100644 --- a/components/brave_wallet/browser/wallet_data_files_installer.cc +++ b/components/brave_wallet/browser/wallet_data_files_installer.cc @@ -170,14 +170,14 @@ class WalletDataFilesInstallerPolicy bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; - bool VerifyInstallation(const base::Value& manifest, + bool VerifyInstallation(const base::Value::Dict& manifest, const base::FilePath& install_dir) const override; void ComponentReady(const base::Version& version, const base::FilePath& path, - base::Value manifest) override; + base::Value::Dict manifest) override; base::FilePath GetRelativeInstallDir() const override; void GetHash(std::vector* hash) const override; std::string GetName() const override; @@ -206,7 +206,7 @@ bool WalletDataFilesInstallerPolicy::RequiresNetworkEncryption() const { update_client::CrxInstaller::Result WalletDataFilesInstallerPolicy::OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return update_client::CrxInstaller::Result(update_client::InstallError::NONE); } @@ -216,7 +216,7 @@ void WalletDataFilesInstallerPolicy::OnCustomUninstall() {} void WalletDataFilesInstallerPolicy::ComponentReady( const base::Version& version, const base::FilePath& path, - base::Value manifest) { + base::Value::Dict manifest) { last_installed_wallet_version = version; sequenced_task_runner_->PostTask( FROM_HERE, base::BindOnce(&ParseTokenListAndUpdateRegistry, path)); @@ -226,7 +226,7 @@ void WalletDataFilesInstallerPolicy::ComponentReady( } bool WalletDataFilesInstallerPolicy::VerifyInstallation( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) const { return true; } diff --git a/components/playlist/browser/media_detector_component_installer.cc b/components/playlist/browser/media_detector_component_installer.cc index 867a2d89d719..4402fde4cb29 100644 --- a/components/playlist/browser/media_detector_component_installer.cc +++ b/components/playlist/browser/media_detector_component_installer.cc @@ -41,14 +41,14 @@ class MediaDetectorComponentInstallerPolicy bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; - bool VerifyInstallation(const base::Value& manifest, + bool VerifyInstallation(const base::Value::Dict& manifest, const base::FilePath& install_dir) const override; void ComponentReady(const base::Version& version, const base::FilePath& path, - base::Value manifest) override; + base::Value::Dict manifest) override; base::FilePath GetRelativeInstallDir() const override; void GetHash(std::vector* hash) const override; std::string GetName() const override; @@ -97,7 +97,7 @@ bool MediaDetectorComponentInstallerPolicy::RequiresNetworkEncryption() const { update_client::CrxInstaller::Result MediaDetectorComponentInstallerPolicy::OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return update_client::CrxInstaller::Result(0); } @@ -107,12 +107,12 @@ void MediaDetectorComponentInstallerPolicy::OnCustomUninstall() {} void MediaDetectorComponentInstallerPolicy::ComponentReady( const base::Version& version, const base::FilePath& path, - base::Value manifest) { + base::Value::Dict manifest) { ready_callback_.Run(path); } bool MediaDetectorComponentInstallerPolicy::VerifyInstallation( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) const { return true; } From 9e2d51a3a34680709037196198b285dd469ffb25 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 16:41:07 +0000 Subject: [PATCH 078/146] Autofill assistant removed from upstream Chromium change: https://chromium.googlesource.com/chromium/src/+/46cb4f7cfee66037b672dc87807af1ae1057991e commit 46cb4f7cfee66037b672dc87807af1ae1057991e Author: Clemens Arbesser Date: Wed Dec 7 15:08:17 2022 +0000 Remove components/autofill_assistant b: b:259509313 --- .../autofill_assistant/browser/BUILD.gn | 21 ------------ .../autofill_assistant/browser/DEPS | 4 --- .../autofill_assistant_features_unittest.cc | 18 ---------- .../autofill_assistant/browser/features.cc | 22 ------------ components/autofill_assistant_strings.grdp | 34 ------------------- test/BUILD.gn | 2 +- 6 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 chromium_src/components/autofill_assistant/browser/BUILD.gn delete mode 100644 chromium_src/components/autofill_assistant/browser/DEPS delete mode 100644 chromium_src/components/autofill_assistant/browser/autofill_assistant_features_unittest.cc delete mode 100644 chromium_src/components/autofill_assistant/browser/features.cc delete mode 100644 components/autofill_assistant_strings.grdp diff --git a/chromium_src/components/autofill_assistant/browser/BUILD.gn b/chromium_src/components/autofill_assistant/browser/BUILD.gn deleted file mode 100644 index 0b801a9e62eb..000000000000 --- a/chromium_src/components/autofill_assistant/browser/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2021 The Brave Authors. All rights reserved. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. - -source_set("unit_tests") { - testonly = true - sources = [ - # "//components/autofill_assistant/browser" target doesn't seem to build - # properly on all platforms yet (only builds on Android), so instead of - # adding a dep on the target, adding feaures.h/cc directly. - "//components/autofill_assistant/browser/features.cc", - "//components/autofill_assistant/browser/features.h", - "autofill_assistant_features_unittest.cc", - ] - - deps = [ - "//base", - "//testing/gtest:gtest", - ] -} diff --git a/chromium_src/components/autofill_assistant/browser/DEPS b/chromium_src/components/autofill_assistant/browser/DEPS deleted file mode 100644 index eb200ee866c1..000000000000 --- a/chromium_src/components/autofill_assistant/browser/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - "+base", - "+testing/gtest/include/gtest", -] diff --git a/chromium_src/components/autofill_assistant/browser/autofill_assistant_features_unittest.cc b/chromium_src/components/autofill_assistant/browser/autofill_assistant_features_unittest.cc deleted file mode 100644 index 1fc1b171c80f..000000000000 --- a/chromium_src/components/autofill_assistant/browser/autofill_assistant_features_unittest.cc +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "base/feature_list.h" -#include "components/autofill_assistant/browser/features.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace autofill_assistant { - -TEST(AutofillAssistantFeaturesTest, - AutofillAssistantFeedbackChipFeatureDisabled) { - EXPECT_FALSE( - base::FeatureList::IsEnabled(features::kAutofillAssistantFeedbackChip)); -} - -} // namespace autofill_assistant diff --git a/chromium_src/components/autofill_assistant/browser/features.cc b/chromium_src/components/autofill_assistant/browser/features.cc deleted file mode 100644 index f070a1ae2444..000000000000 --- a/chromium_src/components/autofill_assistant/browser/features.cc +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "components/autofill_assistant/browser/features.h" - -#define kAutofillAssistantFeedbackChip \ - kAutofillAssistantFeedbackChip_ChromiumImpl - -#include "src/components/autofill_assistant/browser/features.cc" -#undef kAutofillAssistantFeedbackChip - -namespace autofill_assistant { -namespace features { - -BASE_FEATURE(kAutofillAssistantFeedbackChip, - "AutofillAssistantFeedbackChip", - base::FEATURE_DISABLED_BY_DEFAULT); - -} // namespace features -} // namespace autofill_assistant diff --git a/components/autofill_assistant_strings.grdp b/components/autofill_assistant_strings.grdp deleted file mode 100644 index 283851948f1e..000000000000 --- a/components/autofill_assistant_strings.grdp +++ /dev/null @@ -1,34 +0,0 @@ - - - - - Continue - - - Information missing - - - Something went wrong - - - Opening $1google.com… - - - Sorry I'm not able to help, please continue on your own. - - - Continue manually? - - - The screening is different from what you selected. Continue? - - - Continue - - - Brave Assistant in Brave stopping - - - Send feedback - - diff --git a/test/BUILD.gn b/test/BUILD.gn index 10cae382d2ec..f23f2b91200e 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -182,7 +182,7 @@ test("brave_unit_tests") { "//brave/browser/ui/brave_tooltips", "//brave/browser/ui/webui/new_tab_page:unit_tests", "//brave/browser/web_discovery:unit_tests", - "//brave/chromium_src/components/autofill_assistant/browser:unit_tests", + "//brave/browser/widevine:unittest", "//brave/chromium_src/components/privacy_sandbox:unit_tests", "//brave/chromium_src/net/base:unit_tests", "//brave/components/adblock_rust_ffi", From f50b864efebeffe94ea50a7381b366e9e6931e84 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 16:46:44 +0000 Subject: [PATCH 079/146] Update from Chromium 110.0.5476.3 to Chromium 110.0.5478.4. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ffcf1ca63c8..de507d20b7e5 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5476.3", + "tag": "110.0.5478.4", "repository": { "url": "https://github.com/chromium/chromium" } From efec930de95a614e390fc8ae213c92ccebdee411 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 17:03:20 +0000 Subject: [PATCH 080/146] Conflict-resolved patches from Chromium 110.0.5476.3 to Chromium 110.0.5478.4. --- patches/chrome-VERSION.patch | 6 +++--- ...ui-webui-settings-site_settings_helper.cc.patch | 8 ++++---- .../chrome-test-data-webui-settings-BUILD.gn.patch | 14 +++++++------- ..._settings-core-common-content_settings.cc.patch | 6 +++--- patches/ui-webui-resources-BUILD.gn.patch | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 31f8295fae73..0605a97eefad 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 7cb2bf247bc8dd97dfe58c5749a5969d17f93e26..27da1238ca47fda5a3a0d37c1ad075b0775ed3eb 100644 +index fe98f5c45394bf6b3f2d50067de6139b81accb5e..933bc4c77ddc643e0e383b8f6652caad66f3b4e3 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 --BUILD=5476 --PATCH=3 +-BUILD=5478 +-PATCH=4 +MINOR=1 +BUILD=49 +PATCH=59 diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 723f40c2d26f..9e4a98cba6e7 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,16 +1,16 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index f73d0fcbbf8ab5da69ae470cdb7f77a4ad2a7603..52dbf1f2e944d49d1a96ea50fb4cfdb07b3edbea 100644 +index 2fcbaaaac2e34cc04e9c60164df2252afc9326c6..b33c558e61ab7d8ce2dc894510f2aa609a6f9e63 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -175,6 +175,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { - // PPAPI_BROKER has been deprecated. The content setting is not used or +@@ -176,6 +176,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { // called from UI, so we don't need a representation JS string. {ContentSettingsType::DEPRECATED_PPAPI_BROKER, nullptr}, + {ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, nullptr}, + BRAVE_CONTENT_SETTINGS_TYPE_GROUP_NAMES_LIST }; static_assert(std::size(kContentSettingsTypeGroupNames) == -@@ -363,6 +364,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -364,6 +365,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index 99a84a043eb8..1801e8b205b3 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,12 +1,12 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index 3bdbb3270f8fb9101515e327648bcd450bf703fa..6c1074f18249519452871bbf2807f1e4d462802e 100644 +index 2c111a1a4d50483a04f387ea799607aca3506d5f..4204519ebe5809c41e83167fa698e38260f15c49 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -240,6 +240,7 @@ ts_library("build_ts") { - definitions += +@@ -205,6 +205,7 @@ build_webui_tests("build") { + ts_definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } -+ import("//brave/browser/resources/settings/sources.gni") definitions += brave_settings_ts_definitions - deps = [ - "..:build_ts", - "//chrome/browser/resources/settings:build_ts", ++ import("//brave/browser/resources/settings/sources.gni") ts_definitions += brave_settings_ts_definitions + + ts_deps = [ "//chrome/browser/resources/settings:build_ts" ] + } diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 40a09591686c..de02a3ed98b7 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index 7c1b5b6ccf737bbbef90f3638eb651d6cd565d0f..f0ef751051679ef62cdd80bb2ffc84d13d74b8ad 100644 +index f516737a56282d248fe78717b94797b8ab9ca3d5..3e2b819cf46a29fe5906088be9f0bd0909fd1b8f 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -111,6 +111,7 @@ constexpr HistogramValue kHistogramValue[] = { - {ContentSettingsType::PRIVATE_NETWORK_CHOOSER_DATA, 90}, +@@ -112,6 +112,7 @@ constexpr HistogramValue kHistogramValue[] = { {ContentSettingsType::FEDERATED_IDENTITY_IDENTITY_PROVIDER_SIGNIN_STATUS, 91}, + {ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, 92}, + BRAVE_HISTOGRAM_VALUE_LIST }; diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index 618afbccf3cb..f7ab52dc8d94 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index 0f6358f4aede9a874632ec92096d1cc339a572cf..2f13f6b730bf6cda0def7feb01b6c5d0ab365182 100644 +index 12bd3e903b28bbebd4fb135d950e3046eaf0ce85..6f5ded7cd01a4706b672d96ff249e7411b54f42d 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn @@ -103,6 +103,7 @@ generate_grd("build_grd") { @@ -10,9 +10,9 @@ index 0f6358f4aede9a874632ec92096d1cc339a572cf..2f13f6b730bf6cda0def7feb01b6c5d0 } if (is_chromeos_ash) { -@@ -246,6 +247,7 @@ ts_library("library") { - if (is_chromeos_ash) { - extra_deps += [ ":copy_checked_in_dts_files" ] +@@ -213,6 +214,7 @@ ts_library("library") { + if (is_ios) { + extra_deps += [ ":generate_definitions" ] } + import("//brave/ui/webui/resources/sources.gni") extra_deps += brave_ui_webui_resources_ts_extra_deps in_files += brave_local_files } From 396b9605fda255b676914a55ecb30400d59ce5ea Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 17:03:42 +0000 Subject: [PATCH 081/146] Update patches from Chromium 110.0.5476.3 to Chromium 110.0.5478.4. --- patches/chrome-android-java-AndroidManifest.xml.patch | 2 +- ...e-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch | 4 ++-- patches/chrome-browser-BUILD.gn.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 4 ++-- patches/chrome-browser-browser_process_impl.h.patch | 4 ++-- ...ons-chrome_component_extension_resource_manager.cc.patch | 4 ++-- ...r-extensions-updater-chrome_update_client_config.h.patch | 4 ++-- ...ser-external_protocol-external_protocol_handler.cc.patch | 2 +- patches/chrome-browser-resources-settings-BUILD.gn.patch | 4 ++-- patches/chrome-browser-resources-settings-settings.ts.patch | 2 +- ...wser-resources-settings-site_settings-constants.ts.patch | 2 +- ...-settings-site_settings_page-site_settings_page.ts.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 4 ++-- ...hrome-browser-ui-android-appmenu-internal-BUILD.gn.patch | 2 +- patches/chrome-browser-ui-browser.cc.patch | 6 +++--- patches/chrome-browser-ui-chrome_pages.cc.patch | 4 ++-- ...owser-ui-webui-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...ui-settings-settings_localized_strings_provider.cc.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 4 ++-- .../components-history-core-browser-history_types.h.patch | 2 +- patches/components-page_info-page_info.cc.patch | 2 +- patches/components-permissions-BUILD.gn.patch | 2 +- ...ontent-browser-renderer_host-navigation_request.cc.patch | 6 +++--- patches/content-renderer-render_frame_impl.cc.patch | 4 ++-- patches/content-renderer-render_thread_impl.cc.patch | 2 +- patches/net-BUILD.gn.patch | 2 +- ...nk-renderer-bindings-scripts-bind_gen-interface.py.patch | 4 ++-- patches/third_party-blink-renderer-platform-BUILD.gn.patch | 4 ++-- patches/tools-gritsettings-resource_ids.spec.patch | 4 ++-- ...cs-histograms-metadata-histogram_suffixes_list.xml.patch | 2 +- patches/ui-views-controls-button-md_text_button.cc.patch | 4 ++-- patches/v8/BUILD.gn.patch | 2 +- patches/v8/src-codegen-compiler.cc.patch | 2 +- 33 files changed, 54 insertions(+), 54 deletions(-) diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index bbc15b62d80b..7a34c015afb5 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 950ce56b3d24034cdbd795bf5231c2f4d94cc092..54b3067ec9e43fa2f47d739f8a07b5e44a2d3a44 100644 +index 39c57cc7d63ee802d71a8c27dc9e1b37e8de7d4a..4481d8e7aebffc8e80b5bfc47683b2309869277d 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch index 6958174dde96..728be1dc4890 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -index 10977b3adb4eefe79a05cddb86e47e7abf9bd671..f2a4d16aec12c19237789600a2bdb01269bdf66f 100644 +index 5c83e0a3f5ec976f568009df011197319a491d11..3b7928196c3b4e52d1ac151ff933347947dd9e0c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -689,7 +689,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -694,7 +694,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mActivity, mModalDialogManagerSupplier.get())); NotificationPermissionController.attach( mWindowAndroid, mNotificationPermissionController); diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index e051fc228e63..82e40565d007 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index b1304547ae914cc01a3d76b6c5c855cf16f73def..6c458015f0ca4b8e38367a999b9c89b6d4119173 100644 +index 7dbf7acaaaafae75c5e521330289ab71104fb841..b1f67b82e317bd5f1777033742110b7bda405d65 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2526,6 +2526,7 @@ static_library("browser") { +@@ -2528,6 +2528,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index f9c07dcd9841..8d8fbfc7ebd0 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 95110ce260dbf627d9c6ea960dbcda50bd92e05a..abef5a972343f235bbd2468c598e7f2538709f5e 100644 +index 1a3a841390b15f07b5b879170087b8b4b27446dc..a90421f55e65ff6f545c49813f0083ab929a0a0a 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3343,6 +3343,7 @@ const FeatureEntry::FeatureVariation kWebRtcApmDownmixMethodVariations[] = { +@@ -3368,6 +3368,7 @@ const FeatureEntry::FeatureVariation // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 2764f1ba2064..8b2c5a8e5878 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index a649553a1a6d7f0212f3bd07fac2f15953768171..554412f32dc82b837f795277289c78d4814b9543 100644 +index ecae3d0e0ca718740935285addf6fc8680e70d55..0403882b162b14049cacfe92ad278c23b07c0903 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -215,6 +215,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -216,6 +216,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch index 5d96b2c18664..0961aad8ad2a 100644 --- a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch +++ b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -index e79415547cd1b07cab166f81915bf7e3cdcabbb2..56d80f0886654fee9415e5479547a8c48448c51e 100644 +index ef131afb1f24e2dbf6925c79c3b1fdeeab74d8e3..817f52c0a5d030df233b6871d1f1c0f46bf08cac 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -@@ -157,6 +157,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { +@@ -156,6 +156,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { std::move(pdf_viewer_replacements); } #endif diff --git a/patches/chrome-browser-extensions-updater-chrome_update_client_config.h.patch b/patches/chrome-browser-extensions-updater-chrome_update_client_config.h.patch index 76c3641ae7bb..ab40e854f16a 100644 --- a/patches/chrome-browser-extensions-updater-chrome_update_client_config.h.patch +++ b/patches/chrome-browser-extensions-updater-chrome_update_client_config.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.h b/chrome/browser/extensions/updater/chrome_update_client_config.h -index 47a0644cbbdb6d545b7f3dc82a22055870e29fa9..db6b04a3da004ba7af831865713ff8a9e5da11fa 100644 +index d518d3f5b35115979568834ca435434978de4c82..b7ae13196a9c8d10cc3b21976c16a8811b531b40 100644 --- a/chrome/browser/extensions/updater/chrome_update_client_config.h +++ b/chrome/browser/extensions/updater/chrome_update_client_config.h -@@ -91,6 +91,7 @@ class ChromeUpdateClientConfig : public update_client::Configurator { +@@ -92,6 +92,7 @@ class ChromeUpdateClientConfig : public update_client::Configurator { #if BUILDFLAG(ENABLE_PUFFIN_PATCHES) absl::optional GetCrxCachePath() const override; #endif diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index 80e1daf38628..44aaad310e9c 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index 5ac521e898d4d97179a177d32105c8c3932846b4..6435e5dc1d2ff37d1c792d17d0ed84b44cf180d1 100644 +index 2722c3e70a8c5a75542429b23e43f884d6280b0b..c5e3ff2a505ea66d5cd4e7470d137243596f40c0 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -345,7 +345,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 067b0ab5cf57..626ce57e686f 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 7c7d52832e314577ca2bdbdf2492501b3c6b965c..42a24226e26c1cf189dc1ee395512ac73f7d0d02 100644 +index 86689c58f3cb8cad7f70ce0b519e3f89f8c14dbf..3b6af416764471183e9d088313b5dffc5946e7e5 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -479,4 +479,5 @@ build_webui("build") { +@@ -480,4 +480,5 @@ build_webui("build") { "lazy_load.rollup.js|lazy_load.js", ] } diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 76e48dbb6b4f..2afc5cda4df8 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index 21d4f4b83fa1dad332aaca179a7bada3beae5a90..65d0a2eff2140b442a6082622c8359ff40528e22 100644 +index 54cda320b1b7064a7b090be69a6c39470a73bcf6..8704495329cbc6163677c706e5431f21c10f9a6d 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 87e6cd244c4f..9c81279837d8 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index 459a76680a30ab20ea1164fcb234bff6456d0994..23ea008da34820aeaa3c373101a7fec8c7515778 100644 +index 3e33bc32e4415928725e79305866b6e80eaa454b..73839cb91f0e7e4f61e198a946c07a21e3ea4a0b 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts @@ -50,6 +50,7 @@ export enum ContentSettingsTypes { diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index c9a0b20b2e80..fc58091a164f 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index 9594631e8053cd88e19dacf7c43b22b202125ae7..3e0ed58402a3abce9470ad073978ae6af0d99d44 100644 +index b562f3f3de3b7f7b931b93dcd4fb51ae484f99b8..55b823c30df84fce8b4fd67727866a1f9a8331f0 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 9491a49a5e49..489fbb71bdb3 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 0430eeea606d7fb284f4e37b81fb7fc92ee0d2fa..882055299a4296b88ef48bbd9124fe36e999357f 100644 +index 978c1f31f9d7e7f377339d04f303d4e5cd7cd77f..e3c4721e02c64e6b9f0dc95b1a4a8e0c56da7f32 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -666,6 +666,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 0430eeea606d7fb284f4e37b81fb7fc92ee0d2fa..882055299a4296b88ef48bbd9124fe36 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -4005,10 +4006,13 @@ static_library("ui") { +@@ -4011,10 +4012,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch index b712a75c3948..86a46baa9e4f 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn -index 08b92a1712f17664e684e2d365d4512f17358a10..0b975f79c46c42bb23e4f9299b3431ace7b83f6f 100644 +index d1f2ef120348297ebd98810dd0e6218c5df628bb..ff202a170703848db6b63bb9663824905a89f886 100644 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -21,6 +21,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 1ac377d7adc9..ada07fe4f77c 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index c015e1d33e9799f0af495c097b1afea2523992c7..39cc43045094c62f9d568ee660bb179154787a12 100644 +index 8f9c1932cef561c9e6461dcf940e69560fc4acc6..ce4dad9569449d9741ed239874407916f91c6807 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -448,6 +448,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -449,6 +449,7 @@ Browser* Browser::Create(const CreateParams& params) { // not possible, e.g. using the wrong profile or during shutdown. The caller // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index c015e1d33e9799f0af495c097b1afea2523992c7..39cc43045094c62f9d568ee660bb1791 return new Browser(params); } -@@ -458,7 +459,7 @@ Browser::Browser(const CreateParams& params) +@@ -459,7 +460,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index 84e7613085c6..f34cf0652bc0 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index f14b01024e03f0d0488e967b848255f0f2a1a5db..af4c27a4b150ad4424d212ab604c89991ee1e84a 100644 +index fcaaaa05da054877a361bcc59c8bbb80143485cf..cc7ac1cdbba58a4710ec3fff244b4df20bc05e20 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -343,7 +343,7 @@ void ShowSlow(Browser* browser) { +@@ -344,7 +344,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 90c4f870c57a..2f21eaff7723 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index 15a333b31a1d198932c27f1a203350e35ecb5d38..183936449cdbd6e386091e8a76b9374226d83f40 100644 +index 9164ded909bacd91b5eb942a0f80dbd625359c4f..8683215e989d26cc20c9f9f8a7110546936a02dc 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1319,6 +1319,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1326,6 +1326,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 23579378d751..cc93cc9dfcd6 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 043354fe98a33b79721b05371e608b39a9bc9ac6..14d468f1272db8b3d1617572aad573ab1bebd924 100644 +index b61383ce8462ea4042f0283aab57672565f2e024..04b3b452d278755a39ac70daf36a811234a26bd7 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3395,6 +3395,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3399,6 +3399,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index b9c55ec02418..468acff057d1 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index cb231e5c605089c2f4c6a8f81ba917ed67dc88b6..b2ae492401febbf7ca4b74653b9ed21aa0900f1f 100644 +index a33fbad430ead20024adac6e4c6f4ab6a39b8018..dbdfe975e0cc8a79e63f94f672f627564bd5c110 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { @@ -10,7 +10,7 @@ index cb231e5c605089c2f4c6a8f81ba917ed67dc88b6..b2ae492401febbf7ca4b74653b9ed21a data_deps = [] if (enable_pdf) { -@@ -5267,7 +5268,7 @@ config("disable_thinlto_cache_flags") { +@@ -5272,7 +5273,7 @@ config("disable_thinlto_cache_flags") { } config("pdb_larger_than_4gb") { diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 98091e909b3c..7f61004e440b 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 649b6124e5397fe5790f631d0261ed346321497a..a072f04b0f6be78879852f461b18a2ca0871126f 100644 +index 3cbb236c60afdbbccd4dca20801e046e768e197f..cbba111215649c9b376a4f42f45f398234e2aaaf 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -52,6 +52,8 @@ enum VisitSource { diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 5578d79dc912..9e9af75f95e7 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index cb9befd20c02ec9e0a1f4283714cf438b4abed0f..2b1a33f886ad0aa2418675269cabd06a12c7a161 100644 +index d9b9633d74ff0c9b3bdab1e8b3c1635dc0dc0ff0..2571dbf54310a517c74007465a4a94676a308d69 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc @@ -1197,6 +1197,7 @@ void PageInfo::PresentSitePermissions() { diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 6436ad8777fd..0e59c80ade1a 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index d57c9c95230c01b801dc79dde142e2b7bca47c49..04eb56f8d7228efd105757bbf181608c61eb41f8 100644 +index 15deddf6d7463f83d2002d59adf6c2f0f6c195bb..529ef411230e3be20cef50c33803e046dc623ad4 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn @@ -142,6 +142,7 @@ source_set("permissions") { diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index a7f3b1a1f35b..4776365bc94c 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index a96b524a9265d5b77fbf02fc35d609e65743d313..769ff61bc2c90706e62e976c781b86d7c67767d8 100644 +index 757b9988ce106a3831d0c5265d720693ddc45837..2819bc72bf6a71393c4d9b78d6b45241cf7a2d6a 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2998,6 +2998,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2997,6 +2997,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index a96b524a9265d5b77fbf02fc35d609e65743d313..769ff61bc2c90706e62e976c781b86d7 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4484,6 +4485,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4483,6 +4484,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index c8ed935a1299..001c3c42bbbe 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 531ec8c12a1c36dbcb3c73b4e90696c14147c97e..1e8faaadde4adfaf73d2d6ae166d1927d20891c3 100644 +index 3d43d9488891f0bd27b7caaf53d8236402059bef..364330195387d5af1c536ec21f6a7225e3060aa0 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4446,6 +4446,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4437,6 +4437,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 8077ebc6eab2..52df816eb070 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index a887ad26ddad387acf144fd1e9fd89e6b4e9ceb0..f243710541be8fdede085a7d10ecd09e9f4cd6cd 100644 +index fbab90b71cefa2b300303d256ba9b1c8f997086d..dc72aede57ba83764de48a8c71afacb97394eb70 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -925,6 +925,7 @@ void RenderThreadImpl::InitializeRenderer( diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 0a51a7b8e182..7444c332705b 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index b18ca800bf1c3606d76d30c9afae848b0428eac8..d168f664d70151c09d52ac5021f62aa91d9ba87f 100644 +index c633dcd9554d07ebcdf7f071ad73f1e7e42b7cca..67ce31702e9beaf9358819c945f4a86e25f4d394 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1136,6 +1136,7 @@ component("net") { diff --git a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch index 43e7b6c0e600..cfaa62cb37b1 100644 --- a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch +++ b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -index cf0a01b472f93f248c31d7b667720518fa1f9623..745eaf8aedff09130b78dc60572bbfeac1575f15 100644 +index 1c163ff51d24a2415ed3c76ca46404a4727548f2..c17a29720cccdd2aeee29a6c79ba9a64fdd54465 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -8181,3 +8181,4 @@ def generate_interfaces(task_queue): +@@ -8188,3 +8188,4 @@ def generate_interfaces(task_queue): "InitIDLInterfacesForTesting", "init_idl_interfaces_for_testing", for_testing=True) diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index 50df82f5a4b0..54869b15ecf2 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 29a7eb3d9ed28f27d129a0aeece728f0b10cf9e2..4bc7fc1dbb12a7dea4d0a5e10d172bca6e39ffb2 100644 +index 9c01b81187295b19e6b1a5302358ab248cbf30f4..297d32de067ebff4b10ee6a22852e94feafd50d4 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1840,6 +1840,7 @@ component("platform") { +@@ -1839,6 +1839,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 5449536e72a0..bc5dd30e57c8 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 0c7a6f2d071d52c692f9c82d32ba1a3399508760..1489ca8f50dbe8ed47e2403ef152bbc913840bc1 100644 +index cc28e95c153fd33a3f5844f5d2cc198acc7dbf49..da6ed3bee2829d093fe4132267b7e81e441d0456 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -41,6 +41,9 @@ @@ -30,7 +30,7 @@ index 0c7a6f2d071d52c692f9c82d32ba1a3399508760..1489ca8f50dbe8ed47e2403ef152bbc9 "includes": [1960], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/signin/profile_picker/resources.grd": { -@@ -729,6 +732,9 @@ +@@ -733,6 +736,9 @@ "components/components_chromium_strings.grd": { "messages": [3520], }, diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index 244dfee284c9..266647eae2c8 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,5 +1,5 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index e1251e3c35f1a96efc2d50f87e86f565990f67ab..1fe3e3341d453f9081196814b16a0f05db16e342 100644 +index 6bdee9f10483106190f20b6db37472a53499e422..fb88eddf615dca89466c7928965dd5d2ebf01a40 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml @@ -4234,6 +4234,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/ui-views-controls-button-md_text_button.cc.patch b/patches/ui-views-controls-button-md_text_button.cc.patch index 50506d2eecd3..26c3e839bfd0 100644 --- a/patches/ui-views-controls-button-md_text_button.cc.patch +++ b/patches/ui-views-controls-button-md_text_button.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc -index 21ab6b7014ae9fcb1821a3271ee17f171eb28b96..81ef08c9b9015ff32fcfa65bc7f3983db0a31f63 100644 +index 3cc7267d297eb16df11944e6471ccb89aa6b9d5d..eb81c06124e4a19d757137982c8864006ac0413e 100644 --- a/ui/views/controls/button/md_text_button.cc +++ b/ui/views/controls/button/md_text_button.cc -@@ -265,6 +265,7 @@ void MdTextButton::UpdateColors() { +@@ -262,6 +262,7 @@ void MdTextButton::UpdateColors() { UpdateTextColor(); UpdateBackgroundColor(); SchedulePaint(); diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 62558493c5bc..b95ed2b61fb7 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/BUILD.gn b/BUILD.gn -index 1d9a331f1c65c50cd98b966b3d9e826d4124192b..f2eb84310d5dbeccc259888865ab4276ed139ed3 100644 +index e09bf653231b5a30867187742e832d44373103ac..08c4336448f527869be12802a375dd9fc98cf52e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -629,6 +629,7 @@ config("internal_config_base") { diff --git a/patches/v8/src-codegen-compiler.cc.patch b/patches/v8/src-codegen-compiler.cc.patch index 2fa50e8a0e5d..6ab498c86803 100644 --- a/patches/v8/src-codegen-compiler.cc.patch +++ b/patches/v8/src-codegen-compiler.cc.patch @@ -1,5 +1,5 @@ diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc -index e8bbe066f93a66feca48eb17032c21d8d8e19478..32ac940fe1ed1ad5bbc0bc8cd7fd4030cfb9b063 100644 +index 158d6f2d8703449ddd7d5e461f169c87b1f13e26..b911fad67052a42509a67eee4742fd3c950784c4 100644 --- a/src/codegen/compiler.cc +++ b/src/codegen/compiler.cc @@ -2871,6 +2871,7 @@ MaybeHandle Compiler::GetFunctionFromEval( From f7c06045f4b6701ae9150b0f41c533611231f5c0 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 17:10:40 +0000 Subject: [PATCH 082/146] Updated strings for Chromium 110.0.5478.4. --- app/brave_strings.grd | 9 +++++++++ app/brave_strings_override.grd | 3 +++ app/generated_resources.grd | 15 +++++++++++++++ app/os_settings_strings.grdp | 10 ++++++++-- app/settings_strings.grdp | 17 ++++++++++++++--- components/autofill_payments_strings.grdp | 3 +++ 6 files changed, 52 insertions(+), 5 deletions(-) diff --git a/app/brave_strings.grd b/app/brave_strings.grd index e4c995db357e..0558b30549ac 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -977,6 +977,15 @@ Permissions you've already given to websites and apps may apply to this account. Brave is using your camera. + + + + {NUM_DEVICES, plural, + =1 {Brave is connected to a HID device} + other {Brave is connected to HID devices}} + + + diff --git a/app/brave_strings_override.grd b/app/brave_strings_override.grd index 5747a646218c..ea41f21a3133 100644 --- a/app/brave_strings_override.grd +++ b/app/brave_strings_override.grd @@ -229,6 +229,9 @@ Permissions you've already given to websites and apps may apply to this account. + + + diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 5e49021ce1d6..6b4c150f6051 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -5416,6 +5416,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Discover more extensions + + Requests access + @@ -6983,6 +6986,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Bookmark things you want to come back to later + + Sign in to see your bookmarks + + + Bookmarks are unavailable in guest mode + {NUM_BOOKMARKS, plural, =1 {1 bookmark} other {# bookmarks}} @@ -12035,6 +12044,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Click to manage permissions for "$1Brave Translate" + + Manage HID devices + + + Manage HID devices for $1Nina@gmail.com + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index e67ccf92637c..ce3015c89665 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -1252,11 +1252,17 @@ Use Ctrl + Alt + Brightness down to zoom out. System voice + + Voice preview + Default natural voice + + Natural voice preview + - Highlighting + Highlight Highlight each word as it is spoken @@ -1307,7 +1313,7 @@ Use Ctrl + Alt + Brightness down to zoom out. The quick brown fox jumped over the lazy dog. - Enable navigation controls + Navigation controls Provides controls to speed up, slow down, and pause the reading voice diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index adde82600fb1..3f7f470654df 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -1549,8 +1549,14 @@ Automatically translate these languages + + Add languages to automatically translate + - Don’t offer to translate these languages + Never offer to translate these languages + + + Add languages to never offer translation Spell check @@ -2068,8 +2074,8 @@ {NUM_SITES, plural, - =1 {Permissions removed from <b>1 site</b> you haven’t visited recently} - other {Permissions removed from <b>{NUM_SITES} sites</b> you haven’t visited recently}} + =1 {Permissions removed from <b>1 site</b> you haven’t visited in a while} + other {Permissions removed from <b>{NUM_SITES} sites</b> you haven’t visited in a while}} Removed $1location @@ -2093,6 +2099,11 @@ =1 {To protect your data, permissions were removed from a site you haven't visited in 2 months} other {To protect your data, permissions were removed from sites you haven't visited in 2 months}} + + {NUM_SITES, plural, + =1 {Review complete for 1 site} + other {Review complete for {NUM_SITES} sites}} + Permissions allowed again for $1www.example.com diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 15012b71bee7..f6a5f516a575 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -589,6 +589,9 @@ Learn about virtual cards + + Card image + Virtual card From 220c022e863fe2840466fbfa790a4deb5a87ec91 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 18:09:27 +0000 Subject: [PATCH 083/146] GetCoarseTime removed upstream Chromium change: https://chromium.googlesource.com/chromium/src/+/a0ecc5bd8d5dec96b6a033bebaa64c4ca4da00e5 commit a0ecc5bd8d5dec96b6a033bebaa64c4ca4da00e5 Author: Tom Van Goethem Date: Tue Dec 13 13:21:32 2022 +0000 [SafetyCheck] Parametrize update options and update flags This CL makes the interval in which the unused site permissions are updated and the time duration when sites become considered unused configurable through Finch. Furthermore, it updates the flag to facilitate testing. Bug: 1345920 --- .../core/browser/brave_content_settings_pref_provider.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc index 46968bf0e16b..8a2f1360b723 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc @@ -580,7 +580,7 @@ bool BravePrefProvider::SetWebsiteSettingInternal( store_last_modified_ ? base::Time::Now() : base::Time(); base::Time last_visited = constraints.track_last_visit_for_autoexpiration - ? GetCoarseTime(base::Time::Now()) + ? GetCoarseVisitedTime(base::Time::Now()) : base::Time(); GetPref(content_type) From d0a51e15fe33929b304ffd99ed95fc470bf5e805 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 16 Dec 2022 18:21:01 +0000 Subject: [PATCH 084/146] Replacing assert ts header Chromium change: https://chromium.googlesource.com/chromium/src/+/d2dc97538b8b404b201feee848ade28919a75c9d commit d2dc97538b8b404b201feee848ade28919a75c9d Author: Rebekah Potter Date: Tue Dec 13 23:44:40 2022 +0000 WebUI: Move assert.js to ash/webui/common This file is no longer used on other platforms. Bug: 1347740 --- browser/resources/federated_internals/BUILD.gn | 11 ++++++----- .../settings/brave_appearance_page/super_referral.ts | 2 +- .../settings/brave_sync_page/brave_sync_subpage.ts | 2 +- .../resources/domain_block_interstitial.html | 1 - .../brave_wallet_ui/common/api/hardware_keyrings.ts | 4 ++-- components/brave_wallet_ui/common/async/lib.ts | 6 ++++-- .../hardware/ledgerjs/eth_ledger_bridge_keyring.ts | 4 ++-- .../hardware/ledgerjs/sol_ledger_bridge_keyring.ts | 4 ++-- .../common/hardware/trezor/trezor_bridge_keyring.ts | 6 +++--- .../resources/decentralized_dns_interstitial.html | 1 - components/ipfs/resources/ipfs_interstitial.html | 1 - .../ipfs/resources/onboarding/ipfs_onboarding.html | 1 - 12 files changed, 21 insertions(+), 22 deletions(-) diff --git a/browser/resources/federated_internals/BUILD.gn b/browser/resources/federated_internals/BUILD.gn index 08dcae55c77d..e89748659722 100644 --- a/browser/resources/federated_internals/BUILD.gn +++ b/browser/resources/federated_internals/BUILD.gn @@ -1,6 +1,7 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright (c) 2022 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. import("//brave/resources/brave_grit.gni") import("//chrome/common/features.gni") @@ -74,7 +75,7 @@ js_type_check("closure_compile") { js_library("federated_internals") { deps = [ ":federated_internals_browser_proxy", - "//ui/webui/resources/js:assert", + "//ui/webui/resources:library", ] } @@ -82,6 +83,6 @@ js_library("federated_internals_browser_proxy") { deps = [ "//brave/browser/ui/webui/brave_federated:mojo_bindings_webui_js", "//brave/components/brave_federated/public/interfaces:interfaces_webui_js", - "//ui/webui/resources/js:assert", + "//ui/webui/resources:library", ] } diff --git a/browser/resources/settings/brave_appearance_page/super_referral.ts b/browser/resources/settings/brave_appearance_page/super_referral.ts index e6613ae755ae..914a5b7365e4 100644 --- a/browser/resources/settings/brave_appearance_page/super_referral.ts +++ b/browser/resources/settings/brave_appearance_page/super_referral.ts @@ -4,7 +4,7 @@ // you can obtain one at https://mozilla.org/MPL/2.0/. import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {assert} from 'chrome://resources/js/assert.js'; +import {assert} from 'chrome://resources/js/assert_ts.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js' import {loadTimeData} from "../i18n_setup.js" import {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from '../appearance_page/appearance_browser_proxy.js'; diff --git a/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts b/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts index 4d565304c0c9..1131d68531c3 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_subpage.ts @@ -16,7 +16,7 @@ import '../people_page/sync_controls.js'; import './brave_sync_configure.js'; import './brave_sync_setup.js'; -import { assert } from 'chrome://resources/js/assert.js'; +import { assert } from 'chrome://resources/js/assert_ts.js'; import { PolymerElement } from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import { I18nMixin } from 'chrome://resources/cr_elements/i18n_mixin.js'; diff --git a/components/brave_shields/resources/domain_block_interstitial.html b/components/brave_shields/resources/domain_block_interstitial.html index dde608e63569..e9ea75ef5105 100644 --- a/components/brave_shields/resources/domain_block_interstitial.html +++ b/components/brave_shields/resources/domain_block_interstitial.html @@ -6,7 +6,6 @@ - diff --git a/components/brave_wallet_ui/common/api/hardware_keyrings.ts b/components/brave_wallet_ui/common/api/hardware_keyrings.ts index 8fd86eb225c8..ef8371dace01 100644 --- a/components/brave_wallet_ui/common/api/hardware_keyrings.ts +++ b/components/brave_wallet_ui/common/api/hardware_keyrings.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { assert } from 'chrome://resources/js/assert.js' +import { assert } from 'chrome://resources/js/assert_ts.js' import EthereumLedgerBridgeKeyring from '../../common/hardware/ledgerjs/eth_ledger_bridge_keyring' import SolanaLedgerBridgeKeyring from '../../common/hardware/ledgerjs/sol_ledger_bridge_keyring' import TrezorBridgeKeyring from '../../common/hardware/trezor/trezor_bridge_keyring' @@ -60,7 +60,7 @@ export function getHardwareKeyring ( } const trezorKeyring = getTrezorHardwareKeyring() - assert(type === trezorHardwareKeyring.type()) + assert(type === trezorHardwareKeyring.type(), '') return trezorKeyring } diff --git a/components/brave_wallet_ui/common/async/lib.ts b/components/brave_wallet_ui/common/async/lib.ts index d8e4ecc6e2ce..82878b4cba11 100644 --- a/components/brave_wallet_ui/common/async/lib.ts +++ b/components/brave_wallet_ui/common/async/lib.ts @@ -2,7 +2,9 @@ // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import { assert } from 'chrome://resources/js/assert.js' + +import { assert } from 'chrome://resources/js/assert_ts.js' + import { HardwareWalletConnectOpts } from '../../components/desktop/popup-modals/add-account-modal/hardware-wallet-connect/types' @@ -340,7 +342,7 @@ export function getKeyringIdFromCoin (coin: BraveWallet.CoinType): BraveKeyrings if (coin === BraveWallet.CoinType.SOL) { return BraveWallet.SOLANA_KEYRING_ID } - assert(coin === BraveWallet.CoinType.ETH) + assert(coin === BraveWallet.CoinType.ETH, '') return BraveWallet.DEFAULT_KEYRING_ID } diff --git a/components/brave_wallet_ui/common/hardware/ledgerjs/eth_ledger_bridge_keyring.ts b/components/brave_wallet_ui/common/hardware/ledgerjs/eth_ledger_bridge_keyring.ts index c4020fe97715..0729b72841e4 100644 --- a/components/brave_wallet_ui/common/hardware/ledgerjs/eth_ledger_bridge_keyring.ts +++ b/components/brave_wallet_ui/common/hardware/ledgerjs/eth_ledger_bridge_keyring.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { assert } from 'chrome://resources/js/assert.js' +import { assert } from 'chrome://resources/js/assert_ts.js' import { BraveWallet } from '../../../constants/types' import { getLocale } from '../../../../common/locale' import { LedgerEthereumKeyring } from '../interfaces' @@ -211,7 +211,7 @@ export default class EthereumLedgerBridgeKeyring extends LedgerBridgeKeyring imp return `m/44'/60'/${index}'/0` } - assert(scheme === LedgerDerivationPaths.Legacy) + assert(scheme === LedgerDerivationPaths.Legacy, '') return `m/44'/60'/0'/${index}` } } diff --git a/components/brave_wallet_ui/common/hardware/ledgerjs/sol_ledger_bridge_keyring.ts b/components/brave_wallet_ui/common/hardware/ledgerjs/sol_ledger_bridge_keyring.ts index 05502753e8aa..a2129310cd62 100644 --- a/components/brave_wallet_ui/common/hardware/ledgerjs/sol_ledger_bridge_keyring.ts +++ b/components/brave_wallet_ui/common/hardware/ledgerjs/sol_ledger_bridge_keyring.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { assert } from 'chrome://resources/js/assert.js' +import { assert } from 'chrome://resources/js/assert_ts.js' import { BraveWallet } from '../../../constants/types' import { LedgerSolanaKeyring } from '../interfaces' import { @@ -131,7 +131,7 @@ export default class SolanaLedgerBridgeKeyring extends LedgerBridgeKeyring imple if (scheme === SolDerivationPaths.LedgerLive) { return `44'/501'/${index}'` } - assert(scheme === SolDerivationPaths.Default) + assert(scheme === SolDerivationPaths.Default, '') return `44'/501'/${index}'/0'` } diff --git a/components/brave_wallet_ui/common/hardware/trezor/trezor_bridge_keyring.ts b/components/brave_wallet_ui/common/hardware/trezor/trezor_bridge_keyring.ts index 78a35dbd4567..d57e97e04729 100644 --- a/components/brave_wallet_ui/common/hardware/trezor/trezor_bridge_keyring.ts +++ b/components/brave_wallet_ui/common/hardware/trezor/trezor_bridge_keyring.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { assert } from 'chrome://resources/js/assert.js' +import { assert } from 'chrome://resources/js/assert_ts.js' import { publicToAddress, toChecksumAddress, bufferToHex } from 'ethereumjs-util' import { BraveWallet, SerializableTransactionInfo } from '../../../constants/types' import { getLocale } from '../../../../common/locale' @@ -206,7 +206,7 @@ export default class TrezorBridgeKeyring implements TrezorKeyring { } private createEIP1559TransactionPayload = (path: string, txInfo: SerializableTransactionInfo, chainId: string): SignTransactionCommandPayload => { - assert(txInfo.txDataUnion.ethTxData1559) + assert(txInfo.txDataUnion.ethTxData1559, '') return { path: path, transaction: { @@ -223,7 +223,7 @@ export default class TrezorBridgeKeyring implements TrezorKeyring { } private createLegacyTransactionPayload = (path: string, txInfo: SerializableTransactionInfo, chainId: string): SignTransactionCommandPayload => { - assert(txInfo.txDataUnion.ethTxData1559) + assert(txInfo.txDataUnion.ethTxData1559, '') return { path: path, transaction: { diff --git a/components/decentralized_dns/content/resources/decentralized_dns_interstitial.html b/components/decentralized_dns/content/resources/decentralized_dns_interstitial.html index 94e7f39516f3..05f07dc7521c 100644 --- a/components/decentralized_dns/content/resources/decentralized_dns_interstitial.html +++ b/components/decentralized_dns/content/resources/decentralized_dns_interstitial.html @@ -6,7 +6,6 @@ - diff --git a/components/ipfs/resources/ipfs_interstitial.html b/components/ipfs/resources/ipfs_interstitial.html index d7569f0526f1..01b5ae6b69d9 100644 --- a/components/ipfs/resources/ipfs_interstitial.html +++ b/components/ipfs/resources/ipfs_interstitial.html @@ -6,7 +6,6 @@ - diff --git a/components/ipfs/resources/onboarding/ipfs_onboarding.html b/components/ipfs/resources/onboarding/ipfs_onboarding.html index abb3ff1b8b4b..7fcec2d6fdd4 100644 --- a/components/ipfs/resources/onboarding/ipfs_onboarding.html +++ b/components/ipfs/resources/onboarding/ipfs_onboarding.html @@ -4,7 +4,6 @@ $i18n{tabTitle} - From eabbc857af1bb2f6caad3b65d19175b5bf6462e4 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 17:58:31 -0500 Subject: [PATCH 085/146] Use TimeDelta for duration values in component update_client Chromium change: https://source.chromium.org/chromium/chromium/src/+/d391ac33e62d14f58d1e012729a62e9ece5b6781 commit d391ac33e62d14f58d1e012729a62e9ece5b6781 Author: Noah Rose Ledesma Date: Tue Dec 13 21:09:06 2022 +0000 Use TimeDelta for duration values in component update_client Use TimeDelta to safely represent durations where possible. This should improve readability & maintainability. Fixed: 1400441 --- .../https_everywhere_component_installer.cc | 12 ++++++------ .../brave_component_updater_configurator.cc | 10 +++++----- .../brave_component_updater_configurator.h | 9 +++++---- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/browser/brave_shields/https_everywhere_component_installer.cc b/browser/brave_shields/https_everywhere_component_installer.cc index 65d7b096c900..2ed01d619723 100644 --- a/browser/brave_shields/https_everywhere_component_installer.cc +++ b/browser/brave_shields/https_everywhere_component_installer.cc @@ -54,14 +54,14 @@ class HTTPSEverywhereComponentInstallerPolicy bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; - bool VerifyInstallation(const base::Value& manifest, + bool VerifyInstallation(const base::Value::Dict& manifest, const base::FilePath& install_dir) const override; void ComponentReady(const base::Version& version, const base::FilePath& path, - base::Value manifest) override; + base::Value::Dict manifest) override; base::FilePath GetRelativeInstallDir() const override; void GetHash(std::vector* hash) const override; std::string GetName() const override; @@ -110,7 +110,7 @@ bool HTTPSEverywhereComponentInstallerPolicy::RequiresNetworkEncryption() update_client::CrxInstaller::Result HTTPSEverywhereComponentInstallerPolicy::OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return update_client::CrxInstaller::Result(0); } @@ -120,7 +120,7 @@ void HTTPSEverywhereComponentInstallerPolicy::OnCustomUninstall() {} void HTTPSEverywhereComponentInstallerPolicy::ComponentReady( const base::Version& version, const base::FilePath& path, - base::Value manifest) { + base::Value::Dict manifest) { if (g_browser_process->IsShuttingDown()) return; @@ -128,7 +128,7 @@ void HTTPSEverywhereComponentInstallerPolicy::ComponentReady( } bool HTTPSEverywhereComponentInstallerPolicy::VerifyInstallation( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) const { return true; } diff --git a/browser/component_updater/brave_component_updater_configurator.cc b/browser/component_updater/brave_component_updater_configurator.cc index 280e67db2768..a24d07e1b48c 100644 --- a/browser/component_updater/brave_component_updater_configurator.cc +++ b/browser/component_updater/brave_component_updater_configurator.cc @@ -57,11 +57,11 @@ BraveConfigurator::BraveConfigurator( BraveConfigurator::~BraveConfigurator() = default; -double BraveConfigurator::InitialDelay() const { +base::TimeDelta BraveConfigurator::InitialDelay() const { return configurator_impl_.InitialDelay(); } -int BraveConfigurator::NextCheckDelay() const { +base::TimeDelta BraveConfigurator::NextCheckDelay() const { auto* command = base::CommandLine::ForCurrentProcess(); if (command->HasSwitch(switches::kComponentUpdateIntervalInSec)) { int interval = 0; @@ -69,17 +69,17 @@ int BraveConfigurator::NextCheckDelay() const { switches::kComponentUpdateIntervalInSec), &interval)) { DCHECK_GE(interval, 1); - return interval; + return base::Seconds(interval); } } return configurator_impl_.NextCheckDelay(); } -int BraveConfigurator::OnDemandDelay() const { +base::TimeDelta BraveConfigurator::OnDemandDelay() const { return configurator_impl_.OnDemandDelay(); } -int BraveConfigurator::UpdateDelay() const { +base::TimeDelta BraveConfigurator::UpdateDelay() const { return configurator_impl_.UpdateDelay(); } diff --git a/browser/component_updater/brave_component_updater_configurator.h b/browser/component_updater/brave_component_updater_configurator.h index 172e0df76e47..1f2df2ce8a05 100644 --- a/browser/component_updater/brave_component_updater_configurator.h +++ b/browser/component_updater/brave_component_updater_configurator.h @@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "components/component_updater/configurator_impl.h" #include "components/update_client/configurator.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -35,10 +36,10 @@ class BraveConfigurator : public update_client::Configurator { PrefService* pref_service); // update_client::Configurator overrides. - double InitialDelay() const override; - int NextCheckDelay() const override; - int OnDemandDelay() const override; - int UpdateDelay() const override; + base::TimeDelta InitialDelay() const override; + base::TimeDelta NextCheckDelay() const override; + base::TimeDelta OnDemandDelay() const override; + base::TimeDelta UpdateDelay() const override; std::vector UpdateUrl() const override; std::vector PingUrl() const override; std::string GetProdId() const override; From ded2af4203be0e3e0d406a0b04fde62ce553794f Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 18:02:33 -0500 Subject: [PATCH 086/146] Adapt BubbleContentsWrapper override to account for removed method Chromium change: https://source.chromium.org/chromium/chromium/src/+/b364bd70b72cf70b88f3a9b6427b549cc41bbb2a commit b364bd70b72cf70b88f3a9b6427b549cc41bbb2a Author: Nasko Oskov Date: Mon Dec 12 17:48:46 2022 +0000 Remove RenderViewHostChanged from chrome/browser/ui/views/* RenderViewHostChanged is an old API which is deprecated and we would like to remove. This CL removes it from BubbleContentsWrapper and HungPagesTableModel. In the former case, the inputs are never used, so the change is only in the method name/signature. The latter uses only the RenderWidgetHostView, which should be equivalent between the RenderViewHost and the RenderFrameHost for the primary main frame. Bug: 1168562, 1394513 --- browser/ui/wallet_bubble_manager_delegate_impl.cc | 6 +++--- .../ui/views/bubble/bubble_contents_wrapper.cc | 9 ++++++--- .../browser/ui/views/bubble/bubble_contents_wrapper.h | 11 +++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/browser/ui/wallet_bubble_manager_delegate_impl.cc b/browser/ui/wallet_bubble_manager_delegate_impl.cc index c944d9813bb1..9b8d08bfcfc6 100644 --- a/browser/ui/wallet_bubble_manager_delegate_impl.cc +++ b/browser/ui/wallet_bubble_manager_delegate_impl.cc @@ -82,7 +82,7 @@ class BraveWebUIBubbleManagerT : public WebUIBubbleManagerT, if (!contents_wrapper) return; brave_observer_.reset(); - for (auto tab_id : contents_wrapper->GetPopupIds()) { + for (auto tab_id : contents_wrapper->popup_ids()) { Browser* popup_browser = nullptr; content::WebContents* popup_contents = brave_wallet::GetWebContentsFromTabId(&popup_browser, tab_id); @@ -93,12 +93,12 @@ class BraveWebUIBubbleManagerT : public WebUIBubbleManagerT, continue; delegate->CloseContents(popup_contents); } - contents_wrapper->GetPopupIds().clear(); + contents_wrapper->ClearPopupIds(); } const std::vector& GetPopupIdsForTesting() { auto contents_wrapper = WebUIBubbleManagerT::cached_contents_wrapper(); - return contents_wrapper->GetPopupIds(); + return contents_wrapper->popup_ids(); } void OnWidgetDestroying(views::Widget* widget) override { diff --git a/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc b/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc index 83cd2c07a28e..e0d95e3ca46e 100644 --- a/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc +++ b/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc @@ -16,7 +16,7 @@ // to the Browser delegate instead of default one. // In order to close all popups we also save tab ids of each opened popup window // and close all with the bubble together. -#define RenderViewHostChanged \ +#define PrimaryPageChanged \ SetWebContentsAddNewContentsDelegate( \ base::WeakPtr browser_delegate) { \ browser_delegate_ = std::move(browser_delegate); \ @@ -39,7 +39,10 @@ sessions::SessionTabHelper::IdForTab(raw_popup_contents).id(); \ popup_ids_.push_back(tab_id); \ } \ - void BubbleContentsWrapper::RenderViewHostChanged + void BubbleContentsWrapper::ClearPopupIds() { \ + popup_ids_.clear(); \ + } \ + void BubbleContentsWrapper::PrimaryPageChanged #include "src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc" -#undef RenderViewHostChanged +#undef PrimaryPageChanged diff --git a/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.h b/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.h index e21ceb060996..798d1e7c3b1f 100644 --- a/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.h +++ b/chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.h @@ -15,7 +15,7 @@ #include "ui/base/window_open_disposition.h" #include "url/gurl.h" -#define RenderViewHostChanged \ +#define PrimaryPageChanged \ SetWebContentsAddNewContentsDelegate( \ base::WeakPtr browser_delegate); \ void AddNewContents(content::WebContents* source, \ @@ -24,8 +24,11 @@ WindowOpenDisposition disposition, \ const blink::mojom::WindowFeatures& window_features, \ bool user_gesture, bool* was_blocked) override; \ - std::vector& GetPopupIds() { return popup_ids_; } \ - void RenderViewHostChanged + const std::vector& popup_ids() const { \ + return popup_ids_; \ + } \ + void ClearPopupIds(); \ + void PrimaryPageChanged #define webui_resizes_host_ \ webui_resizes_host_; \ @@ -33,6 +36,6 @@ base::WeakPtr browser_delegate_ #include "src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.h" #undef webui_resizes_host_ -#undef RenderViewHostChanged +#undef PrimaryPageChanged #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_CONTENTS_WRAPPER_H_ From 55129bf7b2df02f42e30a38771142d35ee56be9f Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 18:54:38 -0500 Subject: [PATCH 087/146] Migrate component installers to use base::Value::Dictionary Chromium change: https://source.chromium.org/chromium/chromium/src/+/288023bfb5c392e8b2643f2bd68ab86a67c1789a commit 288023bfb5c392e8b2643f2bd68ab86a67c1789a Author: Ashley Newson Date: Fri Dec 9 15:36:03 2022 +0000 [CodeHealth] Migrate component installers to use base::Value::Dict ComponentInstaller, ComponentInstallerPolicy, and related classes use dictionary values for manifest parameters. Originally, these para> used base::DictionaryValue, and were migrated to v1 of the base::Value API in change 3138699, which replaced base::DictionaryValue with base::Value. This change now replaces the use of base::Value with the more type safe base::Value::Dict, in keeping with the v2 base::Value API. Some tightly related utility methods are also updated to follow the v2 base::Value API. Bug: 1395007 --- .../browser/https_everywhere_component_installer.cc | 4 ++-- .../ntp_background_images_component_installer.cc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/brave_shields/browser/https_everywhere_component_installer.cc b/components/brave_shields/browser/https_everywhere_component_installer.cc index 108d61bba0fb..97d65e55eb2b 100644 --- a/components/brave_shields/browser/https_everywhere_component_installer.cc +++ b/components/brave_shields/browser/https_everywhere_component_installer.cc @@ -54,7 +54,7 @@ class HTTPSEverywhereComponentInstallerPolicy bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::DictionaryValue& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; bool VerifyInstallation(const base::DictionaryValue& manifest, @@ -104,7 +104,7 @@ bool HTTPSEverywhereComponentInstallerPolicy::RequiresNetworkEncryption() update_client::CrxInstaller::Result HTTPSEverywhereComponentInstallerPolicy::OnCustomInstall( - const base::DictionaryValue& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return update_client::CrxInstaller::Result(0); } diff --git a/components/ntp_background_images/browser/ntp_background_images_component_installer.cc b/components/ntp_background_images/browser/ntp_background_images_component_installer.cc index ebe8454e45fb..b47ce32dfc4d 100644 --- a/components/ntp_background_images/browser/ntp_background_images_component_installer.cc +++ b/components/ntp_background_images/browser/ntp_background_images_component_installer.cc @@ -54,14 +54,14 @@ class NTPBackgroundImagesComponentInstallerPolicy bool SupportsGroupPolicyEnabledComponentUpdates() const override; bool RequiresNetworkEncryption() const override; update_client::CrxInstaller::Result OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; - bool VerifyInstallation(const base::Value& manifest, + bool VerifyInstallation(const base::Value::Dict& manifest, const base::FilePath& install_dir) const override; void ComponentReady(const base::Version& version, const base::FilePath& path, - base::Value manifest) override; + base::Value::Dict manifest) override; base::FilePath GetRelativeInstallDir() const override; void GetHash(std::vector* hash) const override; std::string GetName() const override; @@ -104,7 +104,7 @@ bool NTPBackgroundImagesComponentInstallerPolicy:: update_client::CrxInstaller::Result NTPBackgroundImagesComponentInstallerPolicy::OnCustomInstall( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) { return update_client::CrxInstaller::Result(0); } @@ -114,12 +114,12 @@ void NTPBackgroundImagesComponentInstallerPolicy::OnCustomUninstall() {} void NTPBackgroundImagesComponentInstallerPolicy::ComponentReady( const base::Version& version, const base::FilePath& path, - base::Value manifest) { + base::Value::Dict manifest) { ready_callback_.Run(path); } bool NTPBackgroundImagesComponentInstallerPolicy::VerifyInstallation( - const base::Value& manifest, + const base::Value::Dict& manifest, const base::FilePath& install_dir) const { return true; } From 8b8cdd583dbbe17a82a6e148fa134ad95d721f20 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 18:56:49 -0500 Subject: [PATCH 088/146] Rename kMixedContentDownloadBlockingLearnMoreUrl to kInsecureDownloadBlockingLearnMoreUrl Chromium change: https://source.chromium.org/chromium/chromium/src/+/70f924e962184270283321b58b56b76b43588cd1 commit 70f924e962184270283321b58b56b76b43588cd1 Author: Joe DeBlasio Date: Mon Dec 12 22:10:21 2022 +0000 Rename Mixed Download Blocking to Insecure Download Blocking This CL has have no functional effect -- Chrome should work identically after this CL lands. This CL renames mixed download blocking to insecure download blocking in preparation for future work to allow blocking of all *insecure* downloads. Mixed downloads _are_ insecure downloads, so even without additional changes, the new name is still accurate. Bug: 1352598 --- chromium_src/chrome/common/url_constants.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index e733847067f0..16efd79b023a 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -1,7 +1,7 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. +/* Copyright (c) 2019 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "chrome/common/url_constants.h" @@ -139,7 +139,7 @@ const char kHighEfficiencyModeLearnMoreUrl[] = "https://support.brave.com/"; const char kManagedUiLearnMoreUrl[] = "https://support.brave.com/"; -const char kMixedContentDownloadBlockingLearnMoreUrl[] = +const char kInsecureDownloadBlockingLearnMoreUrl[] = "https://support.brave.com/"; const char kMyActivityUrlInClearBrowsingData[] = From 493bf7a1bae62dcbbc49a2d862c9c3945ac6bedb Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 19:00:13 -0500 Subject: [PATCH 089/146] Adapt to removal of base::DictionaryValue in components/search_engines Chromium change: https://source.chromium.org/chromium/chromium/src/+/d2b796196fe65582108357eb7d246564d89b7a2c commit d2b796196fe65582108357eb7d246564d89b7a2c Author: Nan Lin Date: Mon Dec 12 17:05:20 2022 +0000 [Code Health] Remove base::DictionaryValue in components/search_engines Bug: 1187023 --- .../private_window_search_engine_provider_service_base.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/search_engines/private_window_search_engine_provider_service_base.cc b/browser/search_engines/private_window_search_engine_provider_service_base.cc index 2c8ae4dea95d..e9e260888c55 100644 --- a/browser/search_engines/private_window_search_engine_provider_service_base.cc +++ b/browser/search_engines/private_window_search_engine_provider_service_base.cc @@ -85,9 +85,9 @@ void PrivateWindowSearchEngineProviderServiceBase:: otr_profile_->GetPrefs()->SetString(prefs::kSyncedDefaultSearchProviderGUID, data.sync_guid); - otr_profile_->GetPrefs()->Set( + otr_profile_->GetPrefs()->SetDict( DefaultSearchManager::kDefaultSearchProviderDataPrefName, - *TemplateURLDataToDictionary(data)); + TemplateURLDataToDictionary(data)); #endif } From 9a9fe106803f5d19cdc289a99c0dbafbcc4d6c14 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 19:13:59 -0500 Subject: [PATCH 090/146] Adapt to removal of FrameColorsChanged in our override Chromium change: https://source.chromium.org/chromium/chromium/src/+/cf9363af0be2cc57b2b3e5974edfdeed12f8a97e commit cf9363af0be2cc57b2b3e5974edfdeed12f8a97e Author: Jongmok Kim Date: Mon Dec 12 23:42:43 2022 +0000 Refactor FrameColorChanged related to tabs Bug: 1382208 --- .../browser/ui/views/frame/tab_strip_region_view.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h b/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h index a444186e5cc6..6e2e8ec4cf78 100644 --- a/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h +++ b/chromium_src/chrome/browser/ui/views/frame/tab_strip_region_view.h @@ -6,13 +6,15 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_FRAME_TAB_STRIP_REGION_VIEW_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_FRAME_TAB_STRIP_REGION_VIEW_H_ -#define FrameColorsChanged \ - UnUsed_FrameColorsChanged() {} \ +#define IsPositionInWindowCaption \ + Unused_IsPositionInWindowCaption() { \ + return false; \ + } \ friend class VerticalTabStripRegionView; \ friend class BraveTabStrip; \ FRIEND_TEST_ALL_PREFIXES(VerticalTabStripBrowserTest, MinHeight); \ - void FrameColorsChanged + bool IsPositionInWindowCaption #include "src/chrome/browser/ui/views/frame/tab_strip_region_view.h" -#undef FrameColorsChanged +#undef IsPositionInWindowCaption #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_FRAME_TAB_STRIP_REGION_VIEW_H_ From be1d2eb547bb2c0f33290d73aaa65ee88b5df028 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 19:18:52 -0500 Subject: [PATCH 091/146] Replace cr.m.js with cr.js in TypeScript code Chromium change: https://source.chromium.org/chromium/chromium/src/+/162428033ed74b685204debe4d8fdcbc37363527 commit 162428033ed74b685204debe4d8fdcbc37363527 Author: Rebekah Potter Date: Tue Nov 8 21:28:02 2022 +0000 chrome/browser/resources: Replace cr.m.js with cr.ts in TS code TypeScript code shouldn't use the cr.m.js wrapper. Bug: 1316438 --- .../extensions/brave_item_list_more_items.ts | 2 +- .../brave_appearance_browser_proxy.ts | 5 +++-- .../brave_default_extensions_browser_proxy.ts | 2 +- .../brave_new_tab_browser_proxy.ts | 5 +++-- .../brave_privacy_page_browser_proxy.ts | 2 +- .../brave_rewards_page/brave_rewards_page.ts | 7 ++++--- .../brave_search_engines_page_browser_proxy.ts | 2 +- .../brave_sync_page/brave_sync_browser_proxy.ts | 2 +- .../brave_tor_page/brave_tor_browser_proxy.ts | 2 +- .../brave_wallet_page/brave_wallet_browser_proxy.ts | 2 +- .../brave_web3_domains_browser_proxy.ts | 2 +- .../brave_adblock_browser_proxy.ts | 12 ++++++------ .../default_brave_shields_browser_proxy.ts | 2 +- .../pin_shortcut_page_browser_proxy.ts | 2 +- components/brave_new_tab_ui/api/newTabAdsData.ts | 4 ++-- components/brave_new_tab_ui/api/preferences.ts | 4 ++-- components/brave_new_tab_ui/api/privateTabData.ts | 4 ++-- components/brave_new_tab_ui/api/stats.ts | 4 ++-- components/brave_new_tab_ui/api/topSites.ts | 4 ++-- components/brave_new_tab_ui/api/torTabData.ts | 4 ++-- components/brave_new_tab_ui/api/wallpaper.ts | 2 +- components/brave_rewards/resources/tip/lib/host.ts | 11 ++++++----- .../api/default_browser_browser_proxy.ts | 2 +- .../api/import_data_browser_proxy.ts | 2 +- .../brave_welcome_ui/state/data-context-provider.tsx | 4 ++-- 25 files changed, 49 insertions(+), 45 deletions(-) diff --git a/browser/resources/extensions/brave_item_list_more_items.ts b/browser/resources/extensions/brave_item_list_more_items.ts index 91c6fdea94be..e1ee46eefb1f 100644 --- a/browser/resources/extensions/brave_item_list_more_items.ts +++ b/browser/resources/extensions/brave_item_list_more_items.ts @@ -6,7 +6,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js' import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js' import 'chrome://resources/cr_elements/cr_shared_style.css.js' -import 'chrome://resources/js/cr.m.js' +import 'chrome://resources/js/cr.js' import {getTemplate} from './brave_item_list_more_items.html.js' const ExtensionsBraveItemListMoreItemsElementBase = diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.ts b/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.ts index db8e1a8397e1..9fc6b2f1dc3c 100644 --- a/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.ts +++ b/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.ts @@ -1,8 +1,9 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; /** @interface */ export interface BraveAppearanceBrowserProxy { diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts index c0ca5a1d0e7b..a4ce2cb33edd 100644 --- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts +++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -import {sendWithPromise} from 'chrome://resources/js/cr.m.js' +import {sendWithPromise} from 'chrome://resources/js/cr.js' import {loadTimeData} from '../i18n_setup.js'; export interface BraveDefaultExtensionsBrowserProxy { diff --git a/browser/resources/settings/brave_new_tab_page/brave_new_tab_browser_proxy.ts b/browser/resources/settings/brave_new_tab_page/brave_new_tab_browser_proxy.ts index 7d84704f2c8f..19ad1021fa91 100644 --- a/browser/resources/settings/brave_new_tab_page/brave_new_tab_browser_proxy.ts +++ b/browser/resources/settings/brave_new_tab_page/brave_new_tab_browser_proxy.ts @@ -1,8 +1,9 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; export type NewTabOption = { name: string diff --git a/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.ts b/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.ts index 2423a5bcb7b6..c86f3197d935 100644 --- a/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.ts +++ b/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; import {loadTimeData} from '../i18n_setup.js'; export interface BravePrivacyBrowserProxy { diff --git a/browser/resources/settings/brave_rewards_page/brave_rewards_page.ts b/browser/resources/settings/brave_rewards_page/brave_rewards_page.ts index bca7286c2b04..252a29f1c57f 100644 --- a/browser/resources/settings/brave_rewards_page/brave_rewards_page.ts +++ b/browser/resources/settings/brave_rewards_page/brave_rewards_page.ts @@ -1,4 +1,5 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ @@ -8,8 +9,8 @@ import {loadTimeData} from '../i18n_setup.js' -import '//resources/js/cr.m.js' -import {PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js' +import '//resources/js/cr.js'; +import {PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js' import {PrefsMixin} from '../prefs/prefs_mixin.js' diff --git a/browser/resources/settings/brave_search_engines_page/brave_search_engines_page_browser_proxy.ts b/browser/resources/settings/brave_search_engines_page/brave_search_engines_page_browser_proxy.ts index 37a0d17a62b1..f5c25505d9a7 100644 --- a/browser/resources/settings/brave_search_engines_page/brave_search_engines_page_browser_proxy.ts +++ b/browser/resources/settings/brave_search_engines_page/brave_search_engines_page_browser_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; export interface BraveSearchEnginesPageBrowserProxy { getPrivateSearchEnginesList(): Promise // TODO(petemill): Define the expected type diff --git a/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts b/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts index 393236f958f4..b5b4df3b5b24 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; import {SyncStatus} from '../people_page/sync_browser_proxy.js'; export type BraveDeviceInfo = { diff --git a/browser/resources/settings/brave_tor_page/brave_tor_browser_proxy.ts b/browser/resources/settings/brave_tor_page/brave_tor_browser_proxy.ts index ad873aedc150..b4801ca4ddd0 100644 --- a/browser/resources/settings/brave_tor_page/brave_tor_browser_proxy.ts +++ b/browser/resources/settings/brave_tor_page/brave_tor_browser_proxy.ts @@ -5,7 +5,7 @@ // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck -import { sendWithPromise } from 'chrome://resources/js/cr.m.js'; +import { sendWithPromise } from 'chrome://resources/js/cr.js'; export interface BraveTorBrowserProxy { getBridgesConfig(): Promise // TODO(petemill): Define the expected type diff --git a/browser/resources/settings/brave_wallet_page/brave_wallet_browser_proxy.ts b/browser/resources/settings/brave_wallet_page/brave_wallet_browser_proxy.ts index b08c187644f8..042dc46bc2c9 100644 --- a/browser/resources/settings/brave_wallet_page/brave_wallet_browser_proxy.ts +++ b/browser/resources/settings/brave_wallet_page/brave_wallet_browser_proxy.ts @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * you can obtain one at https://mozilla.org/MPL/2.0/. */ -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; export enum CoinType { ETH = 60, diff --git a/browser/resources/settings/brave_web3_domains_page/brave_web3_domains_browser_proxy.ts b/browser/resources/settings/brave_web3_domains_page/brave_web3_domains_browser_proxy.ts index 3ac755106d38..7b594a23e43c 100644 --- a/browser/resources/settings/brave_web3_domains_page/brave_web3_domains_browser_proxy.ts +++ b/browser/resources/settings/brave_web3_domains_page/brave_web3_domains_browser_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -import { sendWithPromise } from 'chrome://resources/js/cr.m.js' +import { sendWithPromise } from 'chrome://resources/js/cr.js' import { DropdownMenuOptionList } from '../controls/settings_dropdown_menu.js'; import { loadTimeData } from '../i18n_setup.js'; diff --git a/browser/resources/settings/default_brave_shields_page/brave_adblock_browser_proxy.ts b/browser/resources/settings/default_brave_shields_page/brave_adblock_browser_proxy.ts index c56d2371dcb2..44c146b96ab3 100644 --- a/browser/resources/settings/default_brave_shields_page/brave_adblock_browser_proxy.ts +++ b/browser/resources/settings/default_brave_shields_page/brave_adblock_browser_proxy.ts @@ -1,11 +1,11 @@ -/* Copyright 2022 The Brave Authors. All rights reserved. +/* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * you can obtain one at https://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck -import { sendWithPromise, addWebUIListener } from 'chrome://resources/js/cr.m.js'; +import { sendWithPromise, addWebUiListener } from 'chrome://resources/js/cr.js'; export interface BraveAdblockBrowserProxy { getRegionalLists(): Promise // TODO(petemill): Define the expected type @@ -14,7 +14,7 @@ export interface BraveAdblockBrowserProxy { getCustomFilters(): Promise // TODO(petemill): Define the expected type setSubscriptionEnabled(url: string, enabled: boolean) addSubscription(url: string) - addWebUIListener(eventName: string, callback: Function) + addWebUiListener(eventName: string, callback: Function) updateSubscription(url: string) deleteSubscription(url: string) viewSubscription(url: string) @@ -68,8 +68,8 @@ export class BraveAdblockBrowserProxyImpl implements BraveAdblockBrowserProxy { chrome.send('brave_adblock.viewSubscription', [url]) } - addWebUIListener (event_name, callback) { - addWebUIListener(event_name, callback) + addWebUiListener (event_name, callback) { + addWebUiListener(event_name, callback) } } diff --git a/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.ts b/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.ts index e20583e8ea64..5a247af2f6bf 100644 --- a/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.ts +++ b/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.ts @@ -5,7 +5,7 @@ // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck diff --git a/browser/resources/settings/pin_shortcut_page/pin_shortcut_page_browser_proxy.ts b/browser/resources/settings/pin_shortcut_page/pin_shortcut_page_browser_proxy.ts index 6c05350d7bad..60d6930d64b8 100644 --- a/browser/resources/settings/pin_shortcut_page/pin_shortcut_page_browser_proxy.ts +++ b/browser/resources/settings/pin_shortcut_page/pin_shortcut_page_browser_proxy.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import {sendWithPromise} from 'chrome://resources/js/cr.m.js'; +import {sendWithPromise} from 'chrome://resources/js/cr.js'; /** @interface */ export class SettingsPinShortcutPageBrowserProxy { diff --git a/components/brave_new_tab_ui/api/newTabAdsData.ts b/components/brave_new_tab_ui/api/newTabAdsData.ts index d341badd9aca..4fee2906c305 100644 --- a/components/brave_new_tab_ui/api/newTabAdsData.ts +++ b/components/brave_new_tab_ui/api/newTabAdsData.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import * as Cr from 'chrome://resources/js/cr.m' +import * as Cr from 'chrome://resources/js/cr.js' export type NewTabAdsData = { needsBrowserUpgradeToServeAds: boolean @@ -16,5 +16,5 @@ export function getNewTabAdsData (): Promise { } export function addChangeListener (listener: NewTabAdsDataUpdatedHandler): void { - Cr.addWebUIListener('new-tab-ads-data-updated', listener) + Cr.addWebUiListener('new-tab-ads-data-updated', listener) } diff --git a/components/brave_new_tab_ui/api/preferences.ts b/components/brave_new_tab_ui/api/preferences.ts index a796830a236e..49a1c1644f19 100644 --- a/components/brave_new_tab_ui/api/preferences.ts +++ b/components/brave_new_tab_ui/api/preferences.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import { addWebUIListener, sendWithPromise } from 'chrome://resources/js/cr.m' +import { addWebUiListener, sendWithPromise } from 'chrome://resources/js/cr.js' // // Manages get and set of NTP preference data @@ -55,5 +55,5 @@ export function saveSetAllStackWidgets (visible: boolean): void { } export function addChangeListener (listener: PreferencesUpdatedHandler): void { - addWebUIListener('preferences-changed', listener) + addWebUiListener('preferences-changed', listener) } diff --git a/components/brave_new_tab_ui/api/privateTabData.ts b/components/brave_new_tab_ui/api/privateTabData.ts index a276c1c7b032..dd7a9cf6aa11 100644 --- a/components/brave_new_tab_ui/api/privateTabData.ts +++ b/components/brave_new_tab_ui/api/privateTabData.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import * as Cr from 'chrome://resources/js/cr.m' +import * as Cr from 'chrome://resources/js/cr.js' // // Manages get and set of NTP private data @@ -28,5 +28,5 @@ export function toggleAlternativePrivateSearchEngine (): void { } export function addChangeListener (listener: PrivateTabDataUpdatedHandler): void { - Cr.addWebUIListener('private-tab-data-updated', listener) + Cr.addWebUiListener('private-tab-data-updated', listener) } diff --git a/components/brave_new_tab_ui/api/stats.ts b/components/brave_new_tab_ui/api/stats.ts index d42b94028f8e..1aef83e4054e 100644 --- a/components/brave_new_tab_ui/api/stats.ts +++ b/components/brave_new_tab_ui/api/stats.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import * as Cr from 'chrome://resources/js/cr.m' +import * as Cr from 'chrome://resources/js/cr.js' // // Manages get and update of stats data @@ -51,5 +51,5 @@ export async function getStats (): Promise { } export function addChangeListener (listener: StatsUpdatedHandler): void { - Cr.addWebUIListener('stats-updated', (raw: any) => listener(rawToStats(raw))) + Cr.addWebUiListener('stats-updated', (raw: any) => listener(rawToStats(raw))) } diff --git a/components/brave_new_tab_ui/api/topSites.ts b/components/brave_new_tab_ui/api/topSites.ts index ef3c4dff2cde..e49a72d4e213 100644 --- a/components/brave_new_tab_ui/api/topSites.ts +++ b/components/brave_new_tab_ui/api/topSites.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import { addWebUIListener } from 'chrome://resources/js/cr.m' +import { addWebUiListener } from 'chrome://resources/js/cr.js' export type MostVisitedInfoChanged = { tiles: NewTab.Site[] @@ -19,7 +19,7 @@ export function updateMostVisitedInfo () { } export function addMostVistedInfoChangedListener (listener: MostVisitedInfoChangedHandler): void { - addWebUIListener('most-visited-info-changed', listener) + addWebUiListener('most-visited-info-changed', listener) } export function deleteMostVisitedTile (url: string): void { diff --git a/components/brave_new_tab_ui/api/torTabData.ts b/components/brave_new_tab_ui/api/torTabData.ts index 05c3593fa3b1..a55c65ea9c72 100644 --- a/components/brave_new_tab_ui/api/torTabData.ts +++ b/components/brave_new_tab_ui/api/torTabData.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import * as Cr from 'chrome://resources/js/cr.m' +import * as Cr from 'chrome://resources/js/cr.js' export type TorTabData = { torCircuitEstablished: boolean @@ -17,5 +17,5 @@ export function getTorTabData (): Promise { } export function addChangeListener (listener: TorTabDataUpdatedHandler): void { - Cr.addWebUIListener('tor-tab-data-updated', listener) + Cr.addWebUiListener('tor-tab-data-updated', listener) } diff --git a/components/brave_new_tab_ui/api/wallpaper.ts b/components/brave_new_tab_ui/api/wallpaper.ts index 8d57fb7836e9..52b1b18a3f06 100644 --- a/components/brave_new_tab_ui/api/wallpaper.ts +++ b/components/brave_new_tab_ui/api/wallpaper.ts @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at https://mozilla.org/MPL/2.0/. -import { sendWithPromise } from 'chrome://resources/js/cr.m' +import { sendWithPromise } from 'chrome://resources/js/cr.js' export function getWallpaper (): Promise { return sendWithPromise('getWallpaperData') diff --git a/components/brave_rewards/resources/tip/lib/host.ts b/components/brave_rewards/resources/tip/lib/host.ts index 467c85105cbe..7403ca821c1e 100644 --- a/components/brave_rewards/resources/tip/lib/host.ts +++ b/components/brave_rewards/resources/tip/lib/host.ts @@ -1,8 +1,9 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { addWebUIListener } from 'chrome://resources/js/cr.m' +import { addWebUiListener } from 'chrome://resources/js/cr.js' import { createStateManager } from '../../shared/lib/state_manager' import { userTypeFromMojo } from '../../shared/lib/user_type' @@ -51,9 +52,9 @@ function getDialogArgs (): DialogArgs { } } -function addWebUIListeners (listeners: Record) { +function addWebUiListeners (listeners: Record) { for (const [name, listener] of Object.entries(listeners)) { - addWebUIListener(name, listener) + addWebUiListener(name, listener) } } @@ -75,7 +76,7 @@ export function createHost (): Host { return false } - addWebUIListeners({ + addWebUiListeners({ rewardsInitialized () { const { publisherKey } = dialogArgs diff --git a/components/brave_welcome_ui/api/default_browser_browser_proxy.ts b/components/brave_welcome_ui/api/default_browser_browser_proxy.ts index 0dd828387ad4..6153c6635ced 100644 --- a/components/brave_welcome_ui/api/default_browser_browser_proxy.ts +++ b/components/brave_welcome_ui/api/default_browser_browser_proxy.ts @@ -11,7 +11,7 @@ */ // clang-format off -import { sendWithPromise } from 'chrome://resources/js/cr.m.js' +import { sendWithPromise } from 'chrome://resources/js/cr.js' // clang-format on export interface DefaultBrowserInfo { diff --git a/components/brave_welcome_ui/api/import_data_browser_proxy.ts b/components/brave_welcome_ui/api/import_data_browser_proxy.ts index 9c12e90cdd9b..2d9f2128b859 100644 --- a/components/brave_welcome_ui/api/import_data_browser_proxy.ts +++ b/components/brave_welcome_ui/api/import_data_browser_proxy.ts @@ -6,7 +6,7 @@ // Copied from Chromium // clang-format off -import { sendWithPromise } from 'chrome://resources/js/cr.m.js' +import { sendWithPromise } from 'chrome://resources/js/cr.js' // clang-format on /** diff --git a/components/brave_welcome_ui/state/data-context-provider.tsx b/components/brave_welcome_ui/state/data-context-provider.tsx index a06aa6048db1..80d0993188a6 100644 --- a/components/brave_welcome_ui/state/data-context-provider.tsx +++ b/components/brave_welcome_ui/state/data-context-provider.tsx @@ -4,7 +4,7 @@ // you can obtain one at https://mozilla.org/MPL/2.0/. import * as React from 'react' -import { addWebUIListener } from 'chrome://resources/js/cr.m.js' +import { addWebUiListener } from 'chrome://resources/js/cr.js' import DataContext from '../state/context' import { ViewType, Scenes } from '../state/component_types' @@ -33,7 +33,7 @@ function DataContextProvider (props: DataContextProviderProps) { } React.useEffect(() => { - addWebUIListener('brave-import-data-status-changed', (status: any) => { + addWebUiListener('brave-import-data-status-changed', (status: any) => { // TODO(tali): Handle item based events if (status.event === 'ImportStarted' && (profileCountRef.current > 0)) { From 3c485f012e2b5da4326b2965b0abbb6b65eb13ed Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 16 Dec 2022 23:37:25 -0500 Subject: [PATCH 092/146] load_time_data.m.js -> load_time_data.js --- browser/resources/settings/brave_overrides/page_visibility.ts | 2 +- ui/webui/resources/i18n_behavior.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/resources/settings/brave_overrides/page_visibility.ts b/browser/resources/settings/brave_overrides/page_visibility.ts index aa62e37c925e..447be1b2ebb5 100644 --- a/browser/resources/settings/brave_overrides/page_visibility.ts +++ b/browser/resources/settings/brave_overrides/page_visibility.ts @@ -5,7 +5,7 @@ // @ts-nocheck TODO(petemill): Define types and remove ts-nocheck -import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; import {pageVisibility as chromiumPageVisibility, setPageVisibilityForTesting} from '../page_visibility.js' diff --git a/ui/webui/resources/i18n_behavior.ts b/ui/webui/resources/i18n_behavior.ts index 4ba8425a0bf6..949b7dc8d09b 100644 --- a/ui/webui/resources/i18n_behavior.ts +++ b/ui/webui/resources/i18n_behavior.ts @@ -22,7 +22,7 @@ * code. */ -import {loadTimeData} from '//resources/js/load_time_data.m.js'; +import {loadTimeData} from '//resources/js/load_time_data.js'; import {parseHtmlSubset, sanitizeInnerHtml, SanitizeInnerHtmlOpts} from '//resources/js/parse_html_subset.js'; /** @polymerBehavior */ From 5d029c201374d77908974b0691c20bb03255bb40 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sat, 17 Dec 2022 07:45:14 -0500 Subject: [PATCH 093/146] [iOS] Make ParseCertificate compatible with std::make_shared Chromium change: https://chromium.googlesource.com/chromium/src/+/9ecb5dffd6193b4b0e3e68935ac2c8a5a2884afc commit 9ecb5dffd6193b4b0e3e68935ac2c8a5a2884afc Author: David Benjamin Date: Thu Dec 8 19:57:44 2022 +0000 Make ParseCertificate compatible with std::make_shared We don't need a private destructor anymore. Unlike scoped_refptr, std::shared_ptr makes the ownership store the caller's decision, not the class's. If someone manages to[*] get an unshared ParsedCertificate, there's nothing wrong with them freeing it. Additionally, since std::make_shared is meaningfully different than adopting a bare pointer in std::shared_ptr, use a pattern like base::PassKey to make std::make_shared work. Except, as this code is due to be extracted, we can't actually use base::PassKey, so I've just done the equivalent thing manually in the class. [*] It's not actually possible to get such a thing, because the constructor is private and the factory functions all return shared_ptr. It might be worth changing that, so some callers can embed the structure directly rather than indirect with a refcount, but I haven't looked at doing that here. If we were to do that, it could reduce also the places this API leaks shared_ptr into the rest of Chromium. Something to ponder as we work on this code. Bug: 1322914 --- chromium_presubmit_config.json5 | 2 ++ ios/browser/api/certificate/brave_certificate.mm | 7 +++---- .../models/brave_certificate_model+private.h | 2 +- ios/browser/api/net/certificate_utility.mm | 10 ++++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/chromium_presubmit_config.json5 b/chromium_presubmit_config.json5 index acb1673b06b9..04a384bb1bc5 100644 --- a/chromium_presubmit_config.json5 +++ b/chromium_presubmit_config.json5 @@ -131,6 +131,8 @@ "components/services/bat_ledger/bat_ledger_impl\\.cc", "components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge\\.cc", "ios/browser/api/ads/ads_client_ios\\.h", + "ios/browser/api/certificate/brave_certificate\\.mm", + "ios/browser/api/net/certificate_utility\\.mm", "utility/importer/chrome_importer\\.cc", "vendor/bat-native-ads/src/bat/ads/internal/common/crypto/crypto_util\\.cc", "vendor/bat-native-ads/src/bat/ads/internal/account/account_util\\.h", diff --git a/ios/browser/api/certificate/brave_certificate.mm b/ios/browser/api/certificate/brave_certificate.mm index d635fa926669..9a399fe0b313 100644 --- a/ios/browser/api/certificate/brave_certificate.mm +++ b/ios/browser/api/certificate/brave_certificate.mm @@ -5,7 +5,6 @@ #include "brave/ios/browser/api/certificate/brave_certificate.h" #include "base/logging.h" -#include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" @@ -37,7 +36,7 @@ @interface BraveCertificateModel () { base::ScopedCFTypeRef cert_data_; - scoped_refptr extended_cert_; + std::shared_ptr extended_cert_; base::ScopedCFTypeRef public_key_; } @end @@ -63,8 +62,8 @@ - (nullable instancetype)initWithCertificate:(SecCertificateRef)certificate { } net::CertErrors errors; - extended_cert_ = - scoped_refptr(net::ParsedCertificate::Create( + extended_cert_ = std::shared_ptr( + net::ParsedCertificate::Create( std::move(cert_buffer), net::x509_util::DefaultParseCertificateOptions() /* {} */, &errors)); diff --git a/ios/browser/api/certificate/models/brave_certificate_model+private.h b/ios/browser/api/certificate/models/brave_certificate_model+private.h index 5711db47070f..9d584b81d797 100644 --- a/ios/browser/api/certificate/models/brave_certificate_model+private.h +++ b/ios/browser/api/certificate/models/brave_certificate_model+private.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN @end @interface BraveCertificatePublicKeyInfo () -- (instancetype)initWithCertificate:(net::ParsedCertificate*)certificate +- (instancetype)initWithCertificate:(const net::ParsedCertificate*)certificate withKey:(SecKeyRef)key; @end diff --git a/ios/browser/api/net/certificate_utility.mm b/ios/browser/api/net/certificate_utility.mm index 083fcbdcf60e..e87921faacda 100644 --- a/ios/browser/api/net/certificate_utility.mm +++ b/ios/browser/api/net/certificate_utility.mm @@ -104,10 +104,12 @@ + (NSData*)hashCertificateSPKI:(SecCertificateRef)certificate { } net::CertErrors errors; - scoped_refptr extended_cert = - scoped_refptr(net::ParsedCertificate::Create( - std::move(cert_buffer), - net::x509_util::DefaultParseCertificateOptions() /* {} */, &errors)); + std::shared_ptr extended_cert = + std::shared_ptr( + net::ParsedCertificate::Create( + std::move(cert_buffer), + net::x509_util::DefaultParseCertificateOptions() /* {} */, + &errors)); if (!extended_cert) { VLOG(1) << errors.ToDebugString(); From 1227eb568eac1fcae769cf68fbacd2e5f9dd04d9 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sat, 17 Dec 2022 08:46:34 -0500 Subject: [PATCH 094/146] [iOS] Add keyboard provider Chromium change: https://chromium.googlesource.com/chromium/src/+/da32796e847b89d42d4d99096552f6cb6589738e commit da32796e847b89d42d4d99096552f6cb6589738e Author: David Jean Date: Tue Dec 13 11:15:56 2022 +0000 [ios] Add keyboard provider Provides keyboard window. Bug: 1357150 --- ios/browser/providers/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/browser/providers/BUILD.gn b/ios/browser/providers/BUILD.gn index 0e8fed9f975d..3993ea9a3455 100644 --- a/ios/browser/providers/BUILD.gn +++ b/ios/browser/providers/BUILD.gn @@ -20,6 +20,7 @@ group("brave_providers") { "//ios/chrome/browser/providers/follow:chromium_follow", "//ios/chrome/browser/providers/font:chromium_font", "//ios/chrome/browser/providers/fullscreen:chromium_fullscreen", + "//ios/chrome/browser/providers/keyboard:chromium_keyboard", "//ios/chrome/browser/providers/lens:chromium_lens", "//ios/chrome/browser/providers/mailto_handler:chromium_mailto_handler", "//ios/chrome/browser/providers/modals:chromium_modals", From 380014ff5c2f2cc2c08c1c0a0bbe5f40026a21cd Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Sun, 18 Dec 2022 17:43:58 -0500 Subject: [PATCH 095/146] Allow bookmarks side panel to access chrome.tabs API Chromium change: https://source.chromium.org/chromium/chromium/src/+/e886b453a7d1363d0736e2f64b241fe7397f69e7 commit e886b453a7d1363d0736e2f64b241fe7397f69e7 Author: Emily Shack Date: Mon Dec 5 23:33:45 2022 +0000 Use chrome.tabs.onUpdated to disable add tab button Bug: 1365606 --- common/extensions/api/_api_features.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/extensions/api/_api_features.json b/common/extensions/api/_api_features.json index c7b8d9b3bcb0..e75d30009582 100644 --- a/common/extensions/api/_api_features.json +++ b/common/extensions/api/_api_features.json @@ -56,12 +56,13 @@ "contexts": ["webui"], "matches": [ "chrome://bookmarks/*", + "chrome://bookmarks-side-panel.top-chrome/*", + "chrome://brave-shields.top-chrome/*", "chrome://read-later.top-chrome/*", + "chrome://rewards-panel.top-chrome/*", "chrome://tab-strip/*", "chrome://wallet-panel.top-chrome/*", - "chrome://wallet/*", - "chrome://brave-shields.top-chrome/*", - "chrome://rewards-panel.top-chrome/*" + "chrome://wallet/*" ] }, { "channel": "stable", From d5c013d15b0582420f053b81d2eb1cf0d748dc0a Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 19 Dec 2022 12:11:53 -0500 Subject: [PATCH 096/146] Modify signature of BraveLogoCoordinator constructor to add new visibility parameter Chromium change: https://source.chromium.org/chromium/chromium/src/+/dc10653bbd9cf4a74e60e98621c324535aa0375c commit dc10653bbd9cf4a74e60e98621c324535aa0375c Author: Xinyi Ji Date: Mon Dec 12 21:39:28 2022 +0000 [Start] Refactor Logo* and make it MVC structured We need to modularize logo/ and make it MVCed for being reused easily. In this cl, we added the Mediator, MediatorUnitTest parts. We mo> Bug: 1359422 --- .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 3 ++- .../chromium/chrome/browser/logo/BraveLogoCoordinator.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 545820965421..b9a69e56c997 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -49,6 +49,7 @@ import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.identity_disc.IdentityDiscController; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; +import org.chromium.chrome.browser.logo.LogoCoordinator; import org.chromium.chrome.browser.logo.LogoView; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.ntp.NewTabPageUma; @@ -729,7 +730,7 @@ public void testConstructorsExistAndMatch() throws Exception { Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/logo/LogoCoordinator", "org/chromium/chrome/browser/logo/BraveLogoCoordinator", Context.class, Callback.class, LogoView.class, boolean.class, Callback.class, Runnable.class, - boolean.class)); + boolean.class, LogoCoordinator.VisibilityObserver.class)); Assert.assertTrue(constructorsMatch( "org/chromium/chrome/browser/notifications/permissions/NotificationPermissionRationaleDialogController", "org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController", diff --git a/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java b/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java index 7072a07553c1..39222765d688 100644 --- a/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java +++ b/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java @@ -21,9 +21,10 @@ public class BraveLogoCoordinator extends LogoCoordinator { public BraveLogoCoordinator(Context context, Callback logoClickedCallback, LogoView logoView, boolean shouldFetchDoodle, Callback onLogoAvailableCallback, - Runnable onCachedLogoRevalidatedRunnable, boolean isParentSurfaceShown) { + Runnable onCachedLogoRevalidatedRunnable, boolean isParentSurfaceShown, + LogoCoordinator.VisibilityObserver visibilityObserver) { super(context, logoClickedCallback, logoView, shouldFetchDoodle, onLogoAvailableCallback, - onCachedLogoRevalidatedRunnable, isParentSurfaceShown); + onCachedLogoRevalidatedRunnable, isParentSurfaceShown, visibilityObserver); mLogoView = logoView; } From 6edc1759a89afa76a1c8ec2e1ac6d3ab7adb448e Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Mon, 19 Dec 2022 14:32:53 -0500 Subject: [PATCH 097/146] Remove unneeded #include causing gn check failure --- browser/ethereum_remote_client/ethereum_remote_client_service.h | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/ethereum_remote_client/ethereum_remote_client_service.h b/browser/ethereum_remote_client/ethereum_remote_client_service.h index ae88df98317a..e6e67ed4bbf9 100644 --- a/browser/ethereum_remote_client/ethereum_remote_client_service.h +++ b/browser/ethereum_remote_client/ethereum_remote_client_service.h @@ -16,7 +16,6 @@ #include "base/memory/weak_ptr.h" #include "base/values.h" #include "components/keyed_service/core/keyed_service.h" -#include "extensions/buildflags/buildflags.h" #include "url/gurl.h" class EthereumRemoteClientDelegate; From 4d068d5dacbc4e1495a08559ac99189962840064 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 20 Dec 2022 14:46:44 +0000 Subject: [PATCH 098/146] Optimisation guide patching fixed upstream Chromium change: https://chromium.googlesource.com/chromium/src/+/980db7e9a891d22155e85d7247ecea4bfe0aaac5 commit 980db7e9a891d22155e85d7247ecea4bfe0aaac5 Author: Adam Kallai Date: Wed Nov 16 18:28:00 2022 +0000 Fix the build files generation for Windows on ARM Building with tflite lib is not available on Windows on ARM, so "machine_learning" dependency should be guarded. Bug: 1385454 --- ...nts-optimization_guide-core-BUILD.gn.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 patches/components-optimization_guide-core-BUILD.gn.patch diff --git a/patches/components-optimization_guide-core-BUILD.gn.patch b/patches/components-optimization_guide-core-BUILD.gn.patch deleted file mode 100644 index 15727449debc..000000000000 --- a/patches/components-optimization_guide-core-BUILD.gn.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/components/optimization_guide/core/BUILD.gn b/components/optimization_guide/core/BUILD.gn -index 29444c9b70244c041e3522fbff0b8eeaf99d55a5..da432afd5be59e023caedfa2e8d0e3ed1b63f3bb 100644 ---- a/components/optimization_guide/core/BUILD.gn -+++ b/components/optimization_guide/core/BUILD.gn -@@ -65,6 +65,14 @@ static_library("model_executor") { - "//components/optimization_guide:machine_learning_tflite_buildflags", - "//third_party/re2", - ] -+ deps = [ -+ ":features", -+ "//base", -+ "//components/optimization_guide/proto:optimization_guide_proto", -+ "//net", -+ "//url", -+ ] -+ - if (build_with_tflite_lib) { - public_deps += [ - "//components/optimization_guide/core:machine_learning", -@@ -74,15 +82,8 @@ static_library("model_executor") { - "//third_party/tflite_support", - "//third_party/tflite_support:tflite_support_proto", - ] -+ deps += [ ":machine_learning" ] - } -- deps = [ -- ":features", -- ":machine_learning", -- "//base", -- "//components/optimization_guide/proto:optimization_guide_proto", -- "//net", -- "//url", -- ] - } - - mojom("interfaces") { From c4f417a08e7c3e9d7bfb2901573ee27909c1cb88 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 20 Dec 2022 15:43:36 +0000 Subject: [PATCH 099/146] Upstream fix to CompoundTabContainer's width callback checks Chromium change: https://chromium.googlesource.com/chromium/src/+/6c758d6159118a71a40c2aabfc01f18b18397842 commit 6c758d6159118a71a40c2aabfc01f18b18397842 Author: Taylor Bergquist Date: Tue Dec 13 03:00:46 2022 +0000 Make child TabContainers overlap. FlexLayout doesn't support overlapping children, so we must implement Layout manually: GetMinimumSize, CalculatePreferredSize, GetAvailableSize, and Layout itself. We also need to account for overlap during animation planning; GetUnpinnedContainerIdealLeadingX accounts for this. This CL does not include the tooltip/event handling parts of this, expect that in a followup CL. Bug: 1346023 --- .../ui/views/tabs/brave_compound_tab_container.cc | 13 ------------- .../ui/views/tabs/brave_compound_tab_container.h | 2 -- .../browser/ui/views/tabs/compound_tab_container.h | 7 +++---- .../chrome/browser/ui/views/tabs/tab_strip.h | 9 +++++---- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/browser/ui/views/tabs/brave_compound_tab_container.cc b/browser/ui/views/tabs/brave_compound_tab_container.cc index 7e81482f456b..57d94d9adb1d 100644 --- a/browser/ui/views/tabs/brave_compound_tab_container.cc +++ b/browser/ui/views/tabs/brave_compound_tab_container.cc @@ -66,19 +66,6 @@ base::OnceClosure BraveCompoundTabContainer::LockLayout() { std::move(closures)); } -int BraveCompoundTabContainer::GetAvailableWidthForUnpinnedTabContainer( - base::RepeatingCallback available_width_callback) { - // At this moment, Chromium upstream has a bug which causes crash. - // In a near future, this patch won't be needed as upstream checks if the - // `available_width_callback` is null. - if (!available_width_callback) { - return parent() ? parent()->GetAvailableSize(this).width().value() : 0; - } - - return CompoundTabContainer::GetAvailableWidthForUnpinnedTabContainer( - available_width_callback); -} - void BraveCompoundTabContainer::TransferTabBetweenContainers( int from_model_index, int to_model_index) { diff --git a/browser/ui/views/tabs/brave_compound_tab_container.h b/browser/ui/views/tabs/brave_compound_tab_container.h index 4d6d240fb307..8a546c525012 100644 --- a/browser/ui/views/tabs/brave_compound_tab_container.h +++ b/browser/ui/views/tabs/brave_compound_tab_container.h @@ -26,8 +26,6 @@ class BraveCompoundTabContainer : public CompoundTabContainer { // CompoundTabContainer: void SetAvailableWidthCallback( base::RepeatingCallback available_width_callback) override; - int GetAvailableWidthForUnpinnedTabContainer( - base::RepeatingCallback available_width_callback) override; void TransferTabBetweenContainers(int from_model_index, int to_model_index) override; diff --git a/chromium_src/chrome/browser/ui/views/tabs/compound_tab_container.h b/chromium_src/chrome/browser/ui/views/tabs/compound_tab_container.h index 797394c0832a..5c9ffd7e393e 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/compound_tab_container.h +++ b/chromium_src/chrome/browser/ui/views/tabs/compound_tab_container.h @@ -7,17 +7,16 @@ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_COMPOUND_TAB_CONTAINER_H_ #define NumPinnedTabs \ - NumPinnedTabs_Unused() { return {}; } \ + NumPinnedTabs_Unused() { \ + return {}; \ + } \ friend class BraveCompoundTabContainer; \ int NumPinnedTabs -#define GetAvailableWidthForUnpinnedTabContainer \ - virtual GetAvailableWidthForUnpinnedTabContainer #define TransferTabBetweenContainers virtual TransferTabBetweenContainers #include "src/chrome/browser/ui/views/tabs/compound_tab_container.h" #undef TransferTabBetweenContainers -#undef GetAvailableWidthForUnpinnedTabContainer #undef NumPinnedTabs #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_COMPOUND_TAB_CONTAINER_H_ diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_strip.h b/chromium_src/chrome/browser/ui/views/tabs/tab_strip.h index be00ecc7aa71..1af48c3672e1 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_strip.h @@ -12,10 +12,11 @@ class BraveTabHoverCardController; -#define UpdateHoverCard \ - UpdateHoverCard_Unused(); \ - friend class BraveTabHoverTest; \ - friend class BraveTabStrip; \ +#define UpdateHoverCard \ + UpdateHoverCard_Unused(); \ + friend class BraveTabHoverTest; \ + friend class BraveTabStrip; \ + friend class VerticalTabStripRegionView; \ void UpdateHoverCard #define ShouldDrawStrokes \ From c20c0966b802df1991d52a8d4696dbe93aec2aec Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Tue, 20 Dec 2022 17:01:47 -0500 Subject: [PATCH 100/146] [Android] Refactor Logo* and make it MVC structured Chromium change: https://github.com/chromium/chromium/commit/dc10653bbd9cf4a74e60e98621c324535aa0375c [Start] Refactor Logo* and make it MVC structured We need to modularize logo/ and make it MVCed for being reused easily. In this cl, we added the Mediator, MediatorUnitTest parts. We moved the implementation of LogoDelegateImpl into the LogoMediator and set CachedTintedBitmap as a independent class. Bug: 1359422 --- android/java/apk_for_test.flags | 6 ++---- .../org/chromium/chrome/browser/BytecodeTest.java | 4 +--- browser/ui/android/logo/BUILD.gn | 1 + .../chrome/browser/logo/BraveLogoCoordinator.java | 12 +++++++++--- .../bytecode/BraveLogoCoordinatorClassAdapter.java | 7 ++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 5484aa742c89..a9ae555727aa 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -642,15 +642,13 @@ } -keep class org.chromium.chrome.browser.logo.LogoCoordinator { - *** mShouldShowLogo; + *** mLogoModel; public (...); - *** updateVisibility(...); } -keep class org.chromium.chrome.browser.logo.BraveLogoCoordinator { - *** mShouldShowLogo; + *** mLogoModel; public (...); - *** updateVisibility(...); } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index b9a69e56c997..ba04e4a954e0 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -459,8 +459,6 @@ public void testMethodsExist() throws Exception { "isJavascriptSchemeOrInvalidUrl", true, boolean.class, String.class)); Assert.assertTrue(methodExists("org/chromium/chrome/browser/IntentHandler", "extractUrlFromIntent", true, String.class, Intent.class)); - Assert.assertTrue(methodExists("org/chromium/chrome/browser/logo/LogoCoordinator", - "updateVisibility", true, void.class)); Assert.assertTrue(methodExists( "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider", "setWidgetEnabled", false, null)); @@ -926,7 +924,7 @@ public void testFieldsExist() throws Exception { Assert.assertTrue(fieldExists("org/chromium/chrome/browser/omnibox/LocationBarMediator", "mAssistantVoiceSearchServiceSupplier")); Assert.assertTrue( - fieldExists("org/chromium/chrome/browser/logo/LogoCoordinator", "mShouldShowLogo")); + fieldExists("org/chromium/chrome/browser/logo/LogoCoordinator", "mLogoModel")); } @Test diff --git a/browser/ui/android/logo/BUILD.gn b/browser/ui/android/logo/BUILD.gn index 8411fff326d2..285d5f977799 100644 --- a/browser/ui/android/logo/BUILD.gn +++ b/browser/ui/android/logo/BUILD.gn @@ -13,5 +13,6 @@ android_library("java") { "//base:base_java", "//chrome/browser/ui/android/logo:java", "//content/public/android:content_full_java", + "//ui/android:ui_no_recycler_view_java", ] } diff --git a/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java b/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java index 39222765d688..0eb98f9d50a9 100644 --- a/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java +++ b/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/BraveLogoCoordinator.java @@ -11,10 +11,11 @@ import org.chromium.base.Callback; import org.chromium.chrome.browser.logo.LogoBridge.Logo; import org.chromium.content_public.browser.LoadUrlParams; +import org.chromium.ui.modelutil.PropertyModel; public class BraveLogoCoordinator extends LogoCoordinator { // To delete in bytecode, members from parent class will be used instead. - private boolean mShouldShowLogo; + private PropertyModel mLogoModel; // Own members. private final LogoView mLogoView; @@ -29,10 +30,15 @@ public BraveLogoCoordinator(Context context, Callback logoClicked mLogoView = logoView; } - public void updateVisibility() { + @Override + public void updateVisibilityAndMaybeCleanUp( + boolean isParentSurfaceShown, boolean shouldDestroyBridge, boolean animationEnabled) { // We don't want any logo to be shown regardless of the search engine chosen. - mShouldShowLogo = false; + mLogoModel.set(LogoProperties.VISIBILITY, false); mLogoView.setVisibility(View.GONE); + + super.updateVisibilityAndMaybeCleanUp( + isParentSurfaceShown, shouldDestroyBridge, animationEnabled); } } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveLogoCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveLogoCoordinatorClassAdapter.java index eb2bff9b33ba..5e03d84f8afd 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveLogoCoordinatorClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveLogoCoordinatorClassAdapter.java @@ -16,10 +16,7 @@ public BraveLogoCoordinatorClassAdapter(ClassVisitor visitor) { redirectConstructor(sLogoCoordinator, sBraveLogoCoordinator); - deleteField(sBraveLogoCoordinator, "mShouldShowLogo"); - makeProtectedField(sLogoCoordinator, "mShouldShowLogo"); - - makePublicMethod(sLogoCoordinator, "updateVisibility"); - addMethodAnnotation(sBraveLogoCoordinator, "updateVisibility", "Ljava/lang/Override;"); + deleteField(sBraveLogoCoordinator, "mLogoModel"); + makeProtectedField(sLogoCoordinator, "mLogoModel"); } } From 8483b7c69f81c60f31c40e400d2dc17e068d29ec Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Tue, 20 Dec 2022 17:53:08 -0500 Subject: [PATCH 101/146] [Android] New changes for ContentSettingsResources Chromium change: https://github.com/chromium/chromium/commit/600fac25e7982830d799ff0b8600862cb62b2cbd Privacy Sandbox Settings: Add 3p cookies and site data row Add a 3p cookie and site data row to the SiteSettings page on Android. Shown only when the v4 feature is enabled. Screenshot: https://crbug.com/1378703#c17 Bug: 1378703, b/254416167, b/254414210 --- .../org/chromium/chrome/browser/BytecodeTest.java | 8 +++----- .../site_settings/BraveContentSettingsResources.java | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index ba04e4a954e0..3392e2e82c4a 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -105,6 +105,7 @@ import org.chromium.components.browser_ui.site_settings.ContentSettingException; import org.chromium.components.browser_ui.site_settings.PermissionInfo; import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory; +import org.chromium.components.browser_ui.site_settings.SiteSettingsDelegate; import org.chromium.components.browser_ui.site_settings.Website; import org.chromium.components.browser_ui.site_settings.WebsiteAddress; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; @@ -398,9 +399,6 @@ public void testMethodsExist() throws Exception { Assert.assertTrue(methodExists( "org/chromium/components/browser_ui/site_settings/SingleCategorySettings", "resetList", false, null)); - Assert.assertTrue(methodExists( - "org/chromium/components/browser_ui/site_settings/ContentSettingsResources", - "getResourceItem", false, null)); Assert.assertTrue(methodExists( "org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings", "getPreferenceKey", false, null)); @@ -493,13 +491,13 @@ public void testMethodsForInvocationExist() throws Exception { "getResourceItem", true, getClassForPath( "org/chromium/components/browser_ui/site_settings/ContentSettingsResources$ResourceItem"), - int.class)); + int.class, SiteSettingsDelegate.class)); Assert.assertTrue(methodExists( "org/chromium/components/browser_ui/site_settings/ContentSettingsResources", "getResourceItem", true, getClassForPath( "org/chromium/components/browser_ui/site_settings/ContentSettingsResources$ResourceItem"), - int.class)); + int.class, SiteSettingsDelegate.class)); Assert.assertTrue(methodExists( "org/chromium/components/browser_ui/site_settings/SingleCategorySettings", "getAddExceptionDialogMessage", true, String.class)); diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveContentSettingsResources.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveContentSettingsResources.java index f06bd6c174ed..d4abec08878b 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveContentSettingsResources.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveContentSettingsResources.java @@ -22,7 +22,7 @@ protected static class ResourceItem { } } - protected static ResourceItem getResourceItem(int contentType) { + protected static ResourceItem getResourceItem(int contentType, SiteSettingsDelegate delegate) { switch (contentType) { case ContentSettingsType.AUTOPLAY: return new ResourceItem(R.drawable.ic_volume_up_grey600_24dp, @@ -31,7 +31,7 @@ protected static ResourceItem getResourceItem(int contentType) { R.string.website_settings_category_autoplay_allowed, 0); } - return (ResourceItem) BraveReflectionUtil.InvokeMethod( - ContentSettingsResources.class, null, "getResourceItem", int.class, contentType); + return (ResourceItem) BraveReflectionUtil.InvokeMethod(ContentSettingsResources.class, null, + "getResourceItem", int.class, contentType, SiteSettingsDelegate.class, delegate); } } From 99adbb9060ceb3be6bef823744c5d9b462447012 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 21 Dec 2022 15:49:15 -0500 Subject: [PATCH 102/146] Custom strings moved to a new location Chromium change: https://source.chromium.org/chromium/chromium/src/+/fab5fd69777b089e23bf9290edd32c934d3e79c7 commit fab5fd69777b089e23bf9290edd32c934d3e79c7 Author: Rebekah Potter Date: Fri Dec 9 18:36:27 2022 +0000 Settings: Refactor sync strings Many of these strings are no longer shared between OS and browser settings, since the sync elements have been forked. Move most strings out of shared_settings_localized_string_provider to separate locations for OS and browser settings. Change-Id: I00564618e1062beecc06897b16e24a303d021db3 --- .../settings_localized_strings_provider.cc | 15 +++++++++++++++ .../shared_settings_localized_strings_provider.cc | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index 719a4430d527..0f2bafcd2b50 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -32,4 +32,19 @@ #define IDS_SETTINGS_SAFEBROWSING_NONE_DESC \ IDS_SETTINGS_BRAVE_SAFEBROWSING_NONE_DESC +// Use custom strings for diagnostic (crashes, hangs) reporting settings. +#undef IDS_SETTINGS_ENABLE_LOGGING_PREF +#undef IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC +#define IDS_SETTINGS_ENABLE_LOGGING_PREF IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF +#define IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC \ + IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF_DESC + +// Sync types labels +#undef IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL +#define IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL \ + IDS_SETTINGS_BRAVE_AUTOFILL_CHECKBOX_LABEL + +#undef IDS_SETTINGS_APPS_CHECKBOX_LABEL +#define IDS_SETTINGS_APPS_CHECKBOX_LABEL IDS_SETTINGS_BRAVE_APPS_CHECKBOX_LABEL + #include "src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc" diff --git a/chromium_src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc index 3ebaeb512cc8..2f924777c622 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc @@ -40,21 +40,6 @@ bool ShouldReplaceSecureDNSDisabledDescription() { #endif // BUILDFLAG(ENABLE_BRAVE_VPN) && BUILDFLAG(IS_WIN) -// Use custom strings for diagnostic (crashes, hangs) reporting settings. -#undef IDS_SETTINGS_ENABLE_LOGGING_PREF -#undef IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC -#define IDS_SETTINGS_ENABLE_LOGGING_PREF IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF -#define IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC \ - IDS_BRAVE_DIAGNOSTIC_REPORTS_PREF_DESC - -// Sync types labels -#undef IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL -#define IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL \ - IDS_SETTINGS_BRAVE_AUTOFILL_CHECKBOX_LABEL - -#undef IDS_SETTINGS_APPS_CHECKBOX_LABEL -#define IDS_SETTINGS_APPS_CHECKBOX_LABEL IDS_SETTINGS_BRAVE_APPS_CHECKBOX_LABEL - #include "src/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc" #if BUILDFLAG(ENABLE_BRAVE_VPN) && BUILDFLAG(IS_WIN) From a2c5ec45ca03007e8704ab6e8193dfd1e985211f Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Thu, 22 Dec 2022 11:34:52 -0500 Subject: [PATCH 103/146] Create wrapper to use imported loadTimeData or window.loadTimeData as needed Chromium change: https://source.chromium.org/chromium/chromium/src/+/f798f8ac7a235035c18c7291729162f9700691c8 commit f798f8ac7a235035c18c7291729162f9700691c8 Author: Rebekah Potter Date: Fri Dec 2 03:11:57 2022 +0000 WebUI: Migrate load_time_data to TypeScript Migrate load_time_data.m.js to TypeScript as load_time_data.ts. Make load_time_data.m.js into a wrapper file to temporarily support TS files and to support closure users. Modify various locations relying on the |window.loadTimeData| global to import |loadTimeData| explicitly. The global should not be needed by post-JS-modules files, and will not be supported in the TS version. Note 1: Legacy pre-JS-modules code should use load_time_data_deprecated, which still sets a global. Note 2: Leaving global in the to-be-deprecated load_time_data.m.js to support Tast tests, which assume that the global exists. Bug: 1316438 --- .../brave_wallet_page/wallet_networks_list.ts | 4 ++- .../br_elements/br_toolbar/br_toolbar.ts | 32 ++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/browser/resources/settings/brave_wallet_page/wallet_networks_list.ts b/browser/resources/settings/brave_wallet_page/wallet_networks_list.ts index 570ccfe9aab8..efdbe163163f 100644 --- a/browser/resources/settings/brave_wallet_page/wallet_networks_list.ts +++ b/browser/resources/settings/brave_wallet_page/wallet_networks_list.ts @@ -1,4 +1,5 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ @@ -12,6 +13,7 @@ import { I18nMixin } from 'chrome://resources/cr_elements/i18n_mixin.js'; import { PolymerElement } from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import { BaseMixin } from '../base_mixin.js'; import {getTemplate} from './wallet_networks_list.html.js' +import {loadTimeData} from '../i18n_setup.js'; const SettingsWalletNetworksListBase = I18nMixin(BaseMixin(PolymerElement)) diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.ts b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.ts index 80b1a37be2ce..4e1e99510c9e 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.ts +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.ts @@ -11,6 +11,7 @@ import 'chrome://resources/br_elements/br_shared_vars.css.js'; import 'chrome://resources/br_elements/br_shared_style.css.js'; import './br_toolbar_search_field.js'; import {getTemplate} from './br_toolbar.html.js' +import {loadTimeData} from '../../js/load_time_data.js'; const customCurrentWebUINameMap = { extensions: 'settings', @@ -182,20 +183,35 @@ Polymer({ }) }, + getLoadTimeDataBoolean: function(value: string) { + if (loadTimeData.data_) { + return loadTimeData.getBoolean(value) + } + return window.loadTimeData.getBoolean(value) + }, + + getLoadTimeDataString: function(value: string) { + if (loadTimeData.data_) { + return loadTimeData.getString(value) + } + return window.loadTimeData.getString(value) + }, + initStrings: function() { - this.historyTitle = loadTimeData.getString('brToolbarHistoryTitle') - this.settingsTitle = loadTimeData.getString('brToolbarSettingsTitle') - this.bookmarksTitle = loadTimeData.getString('brToolbarBookmarksTitle') - this.downloadsTitle = loadTimeData.getString('brToolbarDownloadsTitle') - this.braveRewardsTitle = loadTimeData.getString('brToolbarRewardsTitle') - this.walletsTitle = loadTimeData.getString('brToolbarWalletsTitle') + this.historyTitle = this.getLoadTimeDataString('brToolbarHistoryTitle') + this.settingsTitle = this.getLoadTimeDataString('brToolbarSettingsTitle') + this.bookmarksTitle = this.getLoadTimeDataString('brToolbarBookmarksTitle') + this.downloadsTitle = this.getLoadTimeDataString('brToolbarDownloadsTitle') + this.braveRewardsTitle = this.getLoadTimeDataString('brToolbarRewardsTitle') + this.walletsTitle = this.getLoadTimeDataString('brToolbarWalletsTitle') }, /** @override */ attached: function () { this.shouldShowRewardsButton_ = - loadTimeData.getBoolean('brToolbarShowRewardsButton') - this.isBraveWalletAllowed_ = loadTimeData.getBoolean('isBraveWalletAllowed') + this.getLoadTimeDataBoolean('brToolbarShowRewardsButton') + this.isBraveWalletAllowed_ = + this.getLoadTimeDataBoolean('isBraveWalletAllowed') this.initSlotFilledDetection() this.initStrings() this.initFontLoadDetection() From a8e71c0b037dc3c8f5f977a3c79f9a4383631a94 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Wed, 21 Dec 2022 16:58:21 -0500 Subject: [PATCH 104/146] [Android] enable_jdk_library_desugaring was removed Chromium change: https://github.com/chromium/chromium/commit/a297b4db5e286f3e32cad79c92b3e6ccb30516a4 Android: Remove build logic for enable_jdk_library_desugaring With Android M support dropped, we no longer require this feature. Bug: 1366413 --- build/commands/lib/config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index 5e66b2a61a22..738e3f2bb7c9 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -458,7 +458,6 @@ Config.prototype.buildArgs = function () { if (this.targetOS === 'android') { args.android_channel = this.channel - args.enable_jdk_library_desugaring = false if (!this.isReleaseBuild()) { args.android_channel = 'default' args.chrome_public_manifest_package = 'com.brave.browser_default' From 9da7554214d12cf58b5d6b77a499116339a2d123 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 23 Dec 2022 14:32:52 -0500 Subject: [PATCH 105/146] PermissionDecided must retrieve callback from grouped requests when necessary --- .../permissions/permission_context_base.cc | 40 +++++++++++++++++-- .../permissions/permission_context_base.h | 2 + 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/chromium_src/components/permissions/permission_context_base.cc b/chromium_src/components/permissions/permission_context_base.cc index 7b2ace673242..d164584c9680 100644 --- a/chromium_src/components/permissions/permission_context_base.cc +++ b/chromium_src/components/permissions/permission_context_base.cc @@ -63,9 +63,36 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, } } } - PermissionContextBase_ChromiumImpl::PermissionDecided( - id, requesting_origin, embedding_origin, content_setting, is_one_time, - is_final_decision); + + if (!IsGroupedPermissionType(content_settings_type())) { + PermissionContextBase_ChromiumImpl::PermissionDecided( + id, requesting_origin, embedding_origin, content_setting, is_one_time, + is_final_decision); + return; + } + + DCHECK(content_setting == CONTENT_SETTING_ALLOW || + content_setting == CONTENT_SETTING_BLOCK || + content_setting == CONTENT_SETTING_DEFAULT); + UserMadePermissionDecision(id, requesting_origin, embedding_origin, + content_setting); + + bool persist = content_setting != CONTENT_SETTING_DEFAULT; + + auto grouped_request = pending_grouped_requests_.find(id.ToString()); + DCHECK(grouped_request != pending_grouped_requests_.end()); + DCHECK(grouped_request->second); + + if (grouped_request->second->IsDone()) { + return; + } + + auto callback = grouped_request->second->GetNextCallback(); + if (callback) { + NotifyPermissionSet(id, requesting_origin, embedding_origin, + std::move(callback), persist, content_setting, + is_one_time, is_final_decision); + } } void PermissionContextBase::DecidePermission( @@ -131,6 +158,13 @@ void PermissionContextBase::GroupedPermissionRequests::AddRequest( requests_.push_back(std::move(request)); } +BrowserPermissionCallback +PermissionContextBase::GroupedPermissionRequests::GetNextCallback() { + DCHECK(!IsDone()); + DCHECK(next_callback_index_ < requests_.size()); + return std::move(requests_[next_callback_index_++].second); +} + void PermissionContextBase::GroupedPermissionRequests::RequestFinished() { finished_request_count_++; } diff --git a/chromium_src/components/permissions/permission_context_base.h b/chromium_src/components/permissions/permission_context_base.h index 2eeed71ef598..fdc167176213 100644 --- a/chromium_src/components/permissions/permission_context_base.h +++ b/chromium_src/components/permissions/permission_context_base.h @@ -75,6 +75,7 @@ class PermissionContextBase : public PermissionContextBase_ChromiumImpl { bool IsDone() const; void AddRequest(std::pair, BrowserPermissionCallback> request); + BrowserPermissionCallback GetNextCallback(); void RequestFinished(); private: @@ -82,6 +83,7 @@ class PermissionContextBase : public PermissionContextBase_ChromiumImpl { BrowserPermissionCallback>> requests_; size_t finished_request_count_ = 0; + size_t next_callback_index_ = 0; }; void PermissionDecided(const PermissionRequestID& id, From f1c7f60e472eedefc55cca343f7e0d750a774ca6 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 27 Dec 2022 14:22:25 -0500 Subject: [PATCH 106/146] LookalikeURLNAvigation tests no longer instantiate a suite Chromium change: https://source.chromium.org/chromium/chromium/src/+/23191b647f0453dd0a1eae29b690092563e5c89d commit 23191b647f0453dd0a1eae29b690092563e5c89d Author: Mustafa Emre Acer Date: Wed Nov 30 00:13:18 2022 +0000 Lookalikes: Remove Digital Asset Links code This CL deletes the client side implementation of Digital Asset Links for lookalikes. An alternative server side approach was implemented a while ago: https://chromium.googlesource.com/chromium/src/+/master/docs/security/lookalikes/lookalike-domains.md#Automated-warning-removal Bug: 1314116 --- test/filters/browser_tests.filter | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index d7c677e3da7b..e2cf345d3699 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -134,6 +134,8 @@ -LazyLoadPrerenderBrowserTest.* -LiveTabCountPageLoadMetricsBrowserTest.LoadSingleTabWithPrerendering -LoginDetectionPrerenderBrowserTest.* +-LookalikeUrlNavigationThrottleBrowserTest.* +-LookalikeUrlNavigationThrottleSignedExchangeBrowserTest.* -MediaEngagementContentsObserverPrerenderBrowserTest.* -MediaHistoryForPrerenderBrowserTest.* -MixedContentSettingsTabHelperPrerenderBrowserTest.* @@ -362,9 +364,6 @@ -All/IntentPickerBubbleViewFencedFrameBrowserTest.* -All/LoadingPredictorNetworkIsolationKeyBrowserTest.* -All/LoginPromptBrowserTest.* --All/LookalikeUrlNavigationThrottleBrowserTest.* --All/LookalikeUrlNavigationThrottleDigitalAssetLinksBrowserTest.* --All/LookalikeUrlNavigationThrottleSignedExchangeBrowserTest.* -All/MultiActionAPICanvasTest.* -All/MultiActionAPITest.* -All/NetInfoNetworkQualityEstimatorHoldbackBrowserTest.* From 6dbd3d421808606a12ab2f979bb9915e6faee6e6 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 28 Dec 2022 09:59:57 -0500 Subject: [PATCH 107/146] Make adjustments for upstream browser tests --- test/filters/browser_tests-linux.filter | 1 - test/filters/browser_tests-windows-x86.filter | 3 +- test/filters/browser_tests.filter | 170 ++++++++++++------ 3 files changed, 118 insertions(+), 56 deletions(-) diff --git a/test/filters/browser_tests-linux.filter b/test/filters/browser_tests-linux.filter index 12f13abf298d..616dd0687505 100644 --- a/test/filters/browser_tests-linux.filter +++ b/test/filters/browser_tests-linux.filter @@ -24,7 +24,6 @@ -ExternalProtocolHandlerSandboxBrowserTest.* -IndividualNetworkContextsPrefetchProxyBrowserTest.* -LayoutInstabilityTest.* --MetricIntegrationTest.FirstInputDelay -MultiscreenWindowPlacementPermissionContextTest.IsExtendedCrossOriginAllow -MultiscreenWindowPlacementPermissionContextTest.IsExtendedCrossOriginDeny -MultiscreenWindowPlacementPermissionContextTest.IsExtendedSameOriginAllow diff --git a/test/filters/browser_tests-windows-x86.filter b/test/filters/browser_tests-windows-x86.filter index b1baaa9f1aa6..7b947d0e3af2 100644 --- a/test/filters/browser_tests-windows-x86.filter +++ b/test/filters/browser_tests-windows-x86.filter @@ -11,6 +11,5 @@ -CDM_10/ECKEncryptedMediaTest.MultipeCdmTypes/0 -CDM_11/ECKEncryptedMediaTest.MultipeCdmTypes/0 -# These tests fail on x86 CI but pass locally --MetricIntegrationTest.FirstInputDelay +# This test fails on x86 CI but passes locally -MetricIntegrationTest.LargestContentfulPaint_SubframeInput diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index e2cf345d3699..8cddbd32f804 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -54,6 +54,8 @@ -All/SharedStoragePrefBrowserTest.WorkletLength/PrivacySandboxEnabled_3PCookiesAllowed -All/SharedStoragePrefBrowserTest.WorkletRemainingBudget/PrivacySandboxEnabled_3PCookiesAllowed -All/SharedStoragePrefBrowserTest.WorkletSet/PrivacySandboxEnabled_3PCookiesAllowed +-BrowsingDataModelBrowserTest.SharedStorageHandledCorrectly +-BrowsingDataModelBrowserTest.SharedStorageAccessReportedCorrectly -SharedStorageChromeBrowserTest.AddModule_EmptyResultError -SharedStorageChromeBrowserTest.AddModule_LoadFailureError -SharedStorageChromeBrowserTest.AddModule_MultipleAddModuleError @@ -81,8 +83,10 @@ -SharedStorageChromeBrowserTest.WorkletNumPerPage_Three -SharedStorageChromeBrowserTest.WorkletNumPerPage_Two -SharedStorageChromeBrowserTest.WorkletTiming +-SharedStorageFencedFrameChromeBrowserTest.FencedFrameNavigateTop_BudgetWithdrawal +-SharedStorageFencedFrameChromeBrowserTest.TwoFencedFrames_DifferentURNs_EachNavigateOnce_BudgetWithdrawalTwice -# This test fails because kPrerender2 feature is disabled. Javascipt in the +# This test fails because kPrerender2 feature is disabled. Javascript in the # test expects `document.prerendering === false` whereas we have # `document.prerendering === unknown` -OmniboxPrerenderDefaultPrerender2BrowserTest.PrerenderFunctionsCheckWithDefaultFlag @@ -135,13 +139,12 @@ -LiveTabCountPageLoadMetricsBrowserTest.LoadSingleTabWithPrerendering -LoginDetectionPrerenderBrowserTest.* -LookalikeUrlNavigationThrottleBrowserTest.* +-LookalikeUrlNavigationThrottlePrerenderBrowserTest.* -LookalikeUrlNavigationThrottleSignedExchangeBrowserTest.* -MediaEngagementContentsObserverPrerenderBrowserTest.* -MediaHistoryForPrerenderBrowserTest.* -MixedContentSettingsTabHelperPrerenderBrowserTest.* -NavigationMetricsRecorderPrerenderBrowserTest.* --NavigationPredictorPreconnectClientPrerenderBrowserTestNoDelay.* --NavigationPredictorPrerenderBrowserTest.* -NetErrorTabHelperWithPrerenderingTest.* -NewTabPageNavigationThrottlePrerenderTest.* -NoStatePrefetchPrerenderBrowserTest.* @@ -172,6 +175,8 @@ -PrerenderOmniboxSearchSuggestionExpiryBrowserTest.* -PrerenderPageLoadMetricsBrowserTest.* -PrerenderPageLoadMetricsObserverBrowserTest.* +-PrerenderHoldbackBrowserTest.PreloadingHoldbackNotOverridden +-PrerenderHoldbackBrowserTest.PreloadingHoldbackOverridden -PrerenderSiteDetailsBrowserTest.* -PrerenderTaskBrowserTest.* -PrintPrerenderBrowserTest.* @@ -179,6 +184,7 @@ -SBNavigationObserverBrowserTest.PrerenderReferrerChains -SSLPrerenderTest.* -SafeBrowsingTriggeredPopupBlockerPrerenderingBrowserTest.* +-SafetyTipPageInfoBubbleViewBrowserTest.MetricsOnlyHeuristicDoesntShowInPageInfo -SafetyTipPageInfoBubbleViewPrerenderBrowserTest.* -ScriptingAPIPrerenderingTest.Basic -SearchEngineTabHelperPrerenderingBrowserTest.* @@ -203,7 +209,7 @@ # This test fails because we intentionally disable trust tokens via # network::features::kPrivateStateTokens --BrowsingDataModelTrustTokenBrowserTest.TrustTokenIssuance +-BrowsingDataModelBrowserTest.TrustTokenIssuance # These tests fail because we intentionally disable direct/raw sockets via # policy::policy_prefs::kIsolatedAppsDeveloperModeAllowed. See @@ -213,6 +219,8 @@ -ChromeDirectSocketsTcpIsolatedWebAppTest.TcpReadWrite -ChromeDirectSocketsUdpApiTest.UdpReadWrite -ChromeDirectSocketsUdpIsolatedWebAppTest.UdpReadWrite +-InstallIsolatedWebAppFromCommandLineFromFileBrowserTest.AppFromCommandLineIsInstalled +-InstallIsolatedWebAppFromCommandLineFromUrlBrowserTest.AppFromCommandLineIsInstalled -IsolatedWebAppsDeveloperModeAllowedPolicyTest.MockTcp/0 -IsolatedWebAppsDeveloperModeAllowedPolicyTest.MockUdp/0 @@ -233,10 +241,15 @@ # https://github.com/brave/brave-browser/issues/25733 -UnusedSitePermissionsServiceBrowserTest.TestIncognitoProfile -UnusedSitePermissionsServiceBrowserTest.TestNavigationUpdatesLastUsedDate +-UnusedSitePermissionsServiceBrowserTest.TestRevokeUnusedPermissions # These tests fail because of the following failed DCHECK in web_view_guest.cc: # render_frame_host->IsActive() || (content::SiteIsolationPolicy::IsSiteIsolationForGuestsEnabled() && render_frame_host->IsInLifecycleState( RenderFrameHost::LifecycleState::kPendingDeletion)) --WebViewSSLErrorTests/WebViewSSLErrorTest.*/SiteIsolationForGuestsEnabled +-ContentScriptTrackerAppBrowserTest.WebViewContentScript +-WebAuthFlowInBrowserTabParamBrowserTest.OnAuthFlowFailureChangeCalled/WithoutWebAuthFlowInBrowserTab +-WebViewSSLErrorTests/WebViewSSLErrorTest.*/SiteIsolationForGuestsEnabled_UseErrorPage +-WebViewSSLErrorTests/WebViewSSLErrorTest.*/SiteIsolationForGuestsEnabled_UseInterstitial +-ZoomControllerBrowserTest.SettingsZoomAfterSigninWorks # These tests use BroadcastChannel to communicate between 3p frame, we partition # these channels, which breaks test communication. @@ -276,6 +289,30 @@ # This test times out because we Disable "Use a prediction service to load # pages more quickly" (via prefetch::prefs::kNetworkPredictionOptions pref). +-All/LoadingPredictorNetworkIsolationKeyBrowserTest.* +-All/PredictionManagerBrowserTest.* +-All/PredictionManagerBrowserTest.*/* +-All/PredictionManagerModelDownloadingBrowserTest.* +-All/PredictionManagerModelDownloadingBrowserTest.*/* +-LoadingPredictorBrowserTest.* +-LoadingPredictorBrowserTestWithNoLocalPredictions.* +-LoadingPredictorBrowserTestWithOptimizationGuide.* +-LoadingPredictorBrowserTestWithProxy.* +-LoadingPredictorPrefetchBrowserTest.* +-LoadingPredictorPrefetchCounterfactualBrowserTest.* +-NavigationPredictorPreconnectClientBrowserTest.* +-NavigationPredictorPreconnectClientBrowserTestPreconnectOnDidFinishNavigationNoDelay.* +-NavigationPredictorPreconnectClientBrowserTestPreconnectOnDidFinishNavigationSecondDelay.* +-NavigationPredictorPreconnectClientBrowserTestWithHoldback.* +-NavigationPredictorPreconnectClientBrowserTestWithSearch.* +-NavigationPredictorPreconnectClientBrowserTestWithUnusedIdleSocketTimeout.* +-NavigationPredictorPreconnectClientFencedFrameBrowserTest.* +-NavigationPredictorPreconnectClientPrerenderBrowserTestNoDelay.* +-NavigationPredictorPrerenderBrowserTest.* +-NavigationPredictorSameDocumentPreconnectClientBrowserTest.* +-PredictionManagerModelPackageOverrideTest.* +-PredictionModelStoreBrowserTest.* +-PredictionServiceBrowserTest.* -SearchNavigationPrefetchNoCancelBrowserTest.PrefetchIsNotCancelled # The tests below are being disabled due to current incompatibilities between @@ -287,6 +324,7 @@ # The tests below are disabled as extension_urls::GetWebstoreUpdateUrl() relies # on brave overrides that require a command line argument for the webstore. -All/WebstoreInstallerWithWithholdingUIBrowserTest.WithholdingHostsOnInstall/* +-WebstoreInstallerMV2BrowserTest.SimultaneousInstall -WebstoreInstallerMV2BrowserTest.WebstoreInstall # These tests fail because we disable subresource web bundles. @@ -331,6 +369,70 @@ -WebViewTests/WebViewTest.DownloadCookieIsolation_CrossSession/SiteIsolationForGuestsDisabled -WebViewTests/WebViewTest.DownloadCookieIsolation_CrossSession/SiteIsolationForGuestsEnabled +# These tests fail because we intentionally disable fenced frames via +# blink::features::kFencedFrames +-AccessContextAuditFencedFrameBrowserTest.* +-All/IntentPickerBubbleViewFencedFrameBrowserTest.* +-All/SafeBrowsingFencedFrameBrowserTest.* +-BackgroundFetchFencedFrameBrowserTest.* +-ContentSettingsWithFencedFrameBrowserTest.RendererContentSettings +-ContentSettingsWithFencedFrameBrowserTest.StorageAccessInFencedFrame +-ContentSettingsWorkerModulesWithFencedFrameBrowserTest.WorkerImportModuleBlocked +-ContextMenuFencedFrameTest.MenuContentsVerification_Fencedframe +-DeclarativeNetRequestApiFencedFrameTest/DeclarativeNetRequestApiFencedFrameTest.* +-ExtensionWebRequestApiFencedFrameTest.DeclarativeSendMessage +-ExtensionWebRequestApiFencedFrameTest/ExtensionWebRequestApiFencedFrameTest.* +-FencedFrameSiteDetailsBrowserTest.* +-InspectUIFencedFrameTest.* +-MessagingApiFencedFrameTest.Load +-MessagingApiFencedFrameTest/MessagingApiFencedFrameTest.* +-PerformanceHintsObserverFencedFrameTest.* +-PrefetchProxyFencedFrameBrowserTest.* +-SigninReauthViewControllerFencedFrameBrowserTest.* +-TabContentsTagFencedFrameTest.FencedFrameDoesNotUpdateTitle +-WebNavigationApiFencedFrameTest.Load +-WebNavigationApiFencedFrameTest/WebNavigationApiFencedFrameTest.* +-WebViewTests/WebViewFencedFrameTest.FencedFrameInGuestHasGuestSiteInstance/SiteIsolationForGuestsEnabled + +# These tests fail because we intentionally disable +# blink::features::kAdInterestGroupAPI +-BrowsingDataModelBrowserTest.InterestGroupsAccessReportedCorrectly +-BrowsingDataModelBrowserTest.InterestGroupsHandledCorrectly +-InterestGroupFledgeOnBrowserTest.* +-InterestGroupPermissionsBrowserTest.* + +# These tests fail because we intentionally disable DICE signin via +# BraveAccountConsistencyModeManager::IsDiceSignInAllowed() +-DiceBrowserTest.* +-DiceBrowsingDataRemoverBrowserTest.* +-DiceManageAccountBrowserTest.* +-DiceSigninUiUtilBrowserTest.* +-DiceWebSigninInterceptionBubbleBrowserTest.* +-DiceWebSigninInterceptionBubbleV2BrowserTest.OpenLearnMoreLinkInNewTab +-DiceWebSigninInterceptorBrowserTest.* +-DiceWebSigninInterceptorEnterpriseBrowserTest.* +-FirstRunFlowControllerDiceBrowserTest.SignInAndSync + +# These tests fail because we intentionally disable prefs::kEnableMediaRouter +-All/CastMirroringServiceHostBrowserTestTabSwitcher.SwitchTabSource/* + +# These tests fail because of the following CHECK in identity_test_utils.cc: +# identity_manager->AreRefreshTokensLoaded() +-GaiaRemoteConsentFlowBrowserTest.* +-SyncConfirmationUIDialogPixelTest.InvokeUi_default/* +-SyncConfirmationUIWindowPixelTest.InvokeUi_default/* + +# This test fails with the following error: +# Terminating render process for bad Mojo message: Received bad user message: +# No binder found for interface brave_news.mojom.BraveNewsController for the frame/document scope +-InteractiveBrowserTestBrowsertest.InstrumentTabsAsTestSteps + +# These tests fail on CI but pass locally +-DeviceChooserExtensionBrowserTests/DeviceChooserExtensionBrowserTest.ChooserAnchoredToExtensionIcon/WebHid +-DeviceChooserExtensionBrowserTests/DeviceChooserExtensionBrowserTest.ChooserAnchoredToExtensionIcon/WebUsb +-MetricIntegrationTest.FirstInputDelay +-WebAppTabStripBrowserTest.TabbedModeMediaCSS + # Tests below this point have not been diagnosed or had issues created yet. -_/WebrtcLoggingPrivateApiStartEventLoggingTestFeatureAndPolicyEnabled.* -AccessCodeCastHandlerBrowserTest.* @@ -361,8 +463,6 @@ -All/GetAuthTokenFunctionEnableGranularPermissionsTest.EnableGranularPermissions/* -All/IdentityGetProfileUserInfoFunctionTestWithAccountStatusParam.* -All/IntentPickerBubbleViewBrowserTest.* --All/IntentPickerBubbleViewFencedFrameBrowserTest.* --All/LoadingPredictorNetworkIsolationKeyBrowserTest.* -All/LoginPromptBrowserTest.* -All/MultiActionAPICanvasTest.* -All/MultiActionAPITest.* @@ -390,7 +490,6 @@ -All/PromotionalTabsEnabledPolicyWhatsNewTest.* -All/QuietUIPromoBrowserTest.* -All/ReportingBrowserTest.* --All/SafeBrowsingFencedFrameBrowserTest.* -All/SameOriginUaOriginTrialBrowserTest.* -All/ScrollToTextFragmentPolicyTest.* -All/SearchEnginePreconnectorForegroundBrowserTest.* @@ -488,14 +587,12 @@ -ContentAnalysisDialogCustomMessageAppearanceBrowserTest.* -ContentAutofillDriverBrowserTest.* -ContentFaviconDriverTest.* --ContextMenuFencedFrameTest.MenuContentsVerification_Fencedframe +-ContentScriptApiPrerenderingTest.* -ContentScriptApiTest.* -ContentSettingBubbleDialogTest.* -ContentSettingImageModelBrowserTest.* -ContentSettingsBackForwardCacheBrowserTest.* -ContentSettingsTest.* --ContentSettingsWithFencedFrameBrowserTest.RendererContentSettings --ContentSettingsWorkerModulesWithFencedFrameBrowserTest.WorkerImportModuleBlocked -ContentSettingsWorkerModulesBrowserTest.* -ContentVerifierPolicyTest.* -ContextMenuBrowserTest.* @@ -510,7 +607,6 @@ -DataSaverWebAPIsBrowserTest.* -DebuggerApiTest.* -DeclarativeContentApiTest.* --DeclarativeNetRequestApiFencedFrameTest/DeclarativeNetRequestApiFencedFrameTest.* -DefaultProfileExtensionBrowserTest.* -DestroyProfileOnBrowserClose/ProfileHelperTestWithDestroyProfile.* -DestroyProfileOnBrowserClose/ProfileManagerBrowserTest.* @@ -523,14 +619,6 @@ -DevToolsTagTest.* -DevToolsTest.NewWindowFromBrowserContext -DevToolsTest.TestRawHeadersWithRedirectAndHSTS --DiceBrowserTest.* --DiceBrowsingDataRemoverBrowserTest.* --DiceManageAccountBrowserTest.* --DiceSigninUiUtilBrowserTest.* --DiceWebSigninInterceptionBubbleBrowserTest.* --DiceWebSigninInterceptionBubbleV2BrowserTest.OpenLearnMoreLinkInNewTab --DiceWebSigninInterceptorBrowserTest.* --DiceWebSigninInterceptorEnterpriseBrowserTest.* -DIPSBounceDetectorBrowserTest.DetectStatefulRedirect_Client_IgnoreThirdPartySubresource -DIPSBounceDetectorBrowserTest.Histograms_BounceCategory_Client -DIPSBounceDetectorBrowserTest.Histograms_BounceCategory_Server @@ -583,13 +671,11 @@ -ExtensionTelemetryServiceBrowserTest.* -ExtensionUninstallDialogViewInteractiveBrowserTest.* -ExtensionURLRewriteBrowserTest.* --ExtensionWebRequestApiFencedFrameTest/ExtensionWebRequestApiFencedFrameTest.* -ExtensionWebRequestApiTest.* -ExtensionWebstorePrivateApiAllowlistEnforcementTest.* -ExtensionWebstorePrivateApiTest.* -ExternalProtocolHandlerBrowserTest.* -FeatureEnabled/WebrtcLoggingPrivateApiStartEventLoggingTestFeatureOrPolicyDisabled.* --FencedFrameSiteDetailsBrowserTest.* -FieldTrialTest.* -FileIFrameAPITest.* -FindInPageControllerTest.* @@ -656,12 +742,10 @@ -IncognitoProfileMainNetworkContext/NetworkContextConfigurationManagedProxySettingsBrowserTest.* -IncognitoProfileMainNetworkContext/NetworkContextConfigurationProxyOnStartBrowserTest.* -IncognitoProfileMainNetworkContext/NetworkContextConfigurationProxySettingsBrowserTest.* --InspectUIFencedFrameTest.* -InspectUITest.* -IntentChipButtonBrowserTest.* +-IntentChipButtonSkipIntentPickerBrowserTest.ClickingChipOpensApp -IntentChipButtonSkipIntentPickerBrowserTest.ShowsIntentChipCollapsed --InterestGroupFledgeOnBrowserTest.* --InterestGroupPermissionsBrowserTest.* -IsolatedAppsDeveloperModeAllowedPolicyTest.* -JavascriptFrameworksUkmObserverBrowserTest.* -KeepAliveDevToolsTest.* @@ -670,12 +754,6 @@ -LiveCaptionSpeechRecognitionHostTest.* -LoadAndLaunchExtensionBrowserTest.* -LoadImageBrowserTest.* --LoadingPredictorBrowserTest.* --LoadingPredictorBrowserTestWithNoLocalPredictions.* --LoadingPredictorBrowserTestWithOptimizationGuide.* --LoadingPredictorBrowserTestWithProxy.* --LoadingPredictorPrefetchBrowserTest.* --LoadingPredictorPrefetchCounterfactualBrowserTest.* -LocalCardMigrationBrowserTest.* -LocalCardMigrationBrowserTestForStatusChip.* -LocalCardMigrationBrowserUiTest.InvokeUi_default @@ -688,7 +766,6 @@ -MediaRouterIntegrationOneUABrowserTest.* -MediaRouterIntegrationOneUANoReceiverBrowserTest.* -MediaRouterUIBrowserTest.* --MessagingApiFencedFrameTest/MessagingApiFencedFrameTest.* -MetadataCheckAndDeepScanningBrowserTest.* -MetricsLogBrowserTest.CommandLineKeyHash -MetricsServiceBrowserDoUploadTest.* @@ -703,14 +780,6 @@ -NativeBindingsApiTest.* -NativeMessagingLaunchBackgroundModeApiTest.* -NavigationEntryRemoverTest.* --NavigationPredictorPreconnectClientBrowserTest.* --NavigationPredictorPreconnectClientBrowserTestPreconnectOnDidFinishNavigationNoDelay.* --NavigationPredictorPreconnectClientBrowserTestPreconnectOnDidFinishNavigationSecondDelay.* --NavigationPredictorPreconnectClientBrowserTestWithHoldback.* --NavigationPredictorPreconnectClientBrowserTestWithSearch.* --NavigationPredictorPreconnectClientBrowserTestWithUnusedIdleSocketTimeout.* --NavigationPredictorPreconnectClientFencedFrameBrowserTest.* --NavigationPredictorSameDocumentPreconnectClientBrowserTest.* -NetInfoBrowserTest.* -NetworkConnectionTrackerBrowserTest.SimulateNetworkServiceCrash -NetworkOnOrOff/ProfileMenuViewSignoutTestWithNetwork.* @@ -768,6 +837,7 @@ -PasswordManagerAnonymousIframeTest.DisablePasswordManagerOnAnonymousIframe -PasswordManagerBackForwardCacheBrowserTest.* -PasswordManagerBrowserTest.* +-PasswordManagerCredentiallessIframeTest.DisablePasswordManagerOnCredentiallessIframe -PasswordManagerInternalsWebUIBrowserTest.* -PDFExtensionHitTestTest.ContextMenuCoordinates -PDFExtensionRegionSearchTest.NoContextMenuCommandExtensionMainFrame @@ -781,7 +851,6 @@ -PDFIFrameNavigationThrottleBrowserTest.* -PKIMetadataComponentUpdater/PKIMetadataComponentUpdaterTest.* -PerformanceHintsObserverBrowserTest.* --PerformanceHintsObserverFencedFrameTest.* -PermissionRequestManagerWithBackForwardCacheBrowserTest.* -PersistentBackground/DeclarativeNetRequestLazyApiTest.TestMatchOutcome/0 -PersistentBackground/ExtensionI18nTest.* @@ -799,13 +868,7 @@ -PolicyUpdateServiceTest.* -PolicyVariationsServiceTest.* -PolicyWebStoreIconTest.* --PredictionManagerBrowserTest.* --PredictionManagerModelDownloadingBrowserTest.* --PredictionManagerModelPackageOverrideTest.* --PredictionManagerNoUserPermissionsTest.* --PredictionServiceBrowserTest.* -PrefetchBrowserTest.* --PrefetchProxyFencedFrameBrowserTest.* -PrefsFunctionalTest.* -PreinstalledAppsBrowserTest.* -PreinstalledAppsMigrationBrowserTest.* @@ -866,6 +929,7 @@ -PushMessagingBrowserTest.* -PushMessagingExpWebFeaturesBrowserTest/PushMessagingExpWebFeaturesBrowserTest.CrossOriginFrame/* -PushMessagingIncognitoBrowserTest.* +-PushMessagingPartitionedBrowserTest/PushMessagingPartitionedBrowserTest.*/* -PwaInstallViewBrowserTest.* -QuicAllowedPolicyIsFalse.* -QuicAllowedPolicyIsTrue.* @@ -951,7 +1015,6 @@ -SignedExchangeSecurityStateTest.SecurityLevelIsSecureAfterPrefetch/* -SigninInterceptFirstRunExperienceDialogBrowserTest.* -SigninReauthViewControllerBrowserTest.* --SigninReauthViewControllerFencedFrameBrowserTest.* -SiteDetailsBrowserTest.* -SiteEngagementHelperBrowserTest.* -SitePerProcessWebViewTest.* @@ -1004,12 +1067,12 @@ -TabActivityWatcherTestWithBackgroundLogDisabledAndOnlyOneOldestTab.LogOldestNTabFeatures -TabActivityWatcherTestWithBackgroundLogEnabled.DiscardedTabGetsPreviousSourceId -TabCaptureApiTest.* --TabContentsTagFencedFrameTest.FencedFrameDoesNotUpdateTitle -TabContentsTagTest.* -TabHelperBrowserTest.* -TabManagerTest.* -TabManagerTestWithTwoTabs.* -TabRestoreTest.* +-TabSharingUIViewsPreferCurrentTabBrowserTest.* -TabStatsTrackerBrowserTest.TabStatsObserverBasics -TabStatsTrackerBrowserTest.TabsAndWindowsAreCountedAccurately -TabUsageScenarioTrackerBrowserTest.FullScreenVideo @@ -1062,9 +1125,9 @@ -WebAppOfflineDarkModeTest.* -WebAppTabStripBrowserTest.NavigationThrottle -WebAppTabStripBrowserTest.ReparentingPinsHomeTab +-WebAppTabStripBrowserTest.TabbedModeMediaCSS -WebAppTabStripLinkCapturingBrowserTest.* -WebNavigationApiBackForwardCacheTest.* --WebNavigationApiFencedFrameTest/WebNavigationApiFencedFrameTest.* -WebRtcDesktopCaptureBrowserTest.* -WebrtcLoggingPrivateApiBrowserTest.* -WebrtcLoggingPrivateApiStartEventLoggingTestFeatureAndPolicyEnabled.* @@ -1081,13 +1144,14 @@ -WebUiNtpBrowserTest.* -WebUiNtpInterceptionWebRequestAPITest.* -WebUIWebViewBrowserTest.* +-WebViewHttpsFirstModeTests/WebViewHttpsFirstModeTest.GuestLoadsHttpWithoutError/SiteIsolationForGuestsEnabled_UseErrorPage +-WebViewHttpsFirstModeTests/WebViewHttpsFirstModeTest.GuestLoadsHttpWithoutError/SiteIsolationForGuestsEnabled_UseInterstitial +-WebViewHttpsFirstModeTests/WebViewHttpsFirstModeTest.GuestLoadsHttpsWithoutError/SiteIsolationForGuestsEnabled_UseErrorPage +-WebViewHttpsFirstModeTests/WebViewHttpsFirstModeTest.GuestLoadsHttpsWithoutError/SiteIsolationForGuestsEnabled_UseInterstitial -WebViewTest.* -WebViewTests/ChromeSignInWebViewTest.ClosingChromeSignInShouldNotCrash/SiteIsolationForGuestsEnabled -WebViewTests/IsolatedOriginWebViewTest.IsolatedOriginInWebview/SiteIsolationForGuestsEnabled -WebViewTests/IsolatedOriginWebViewTest.LoadIsolatedOriginInWebviewAfterLoadingInRegularTab/SiteIsolationForGuestsEnabled --WebViewTests/WebViewFencedFrameTest.FencedFrameInGuestHasGuestSiteInstance/SiteIsolationForGuestsEnabled --WebViewTests/WebViewHttpsFirstModeTest.GuestLoadsHttpWithoutError/SiteIsolationForGuestsEnabled --WebViewTests/WebViewHttpsFirstModeTest.GuestLoadsHttpsWithoutError/SiteIsolationForGuestsEnabled -WebViewTests/WebViewNewWindowTest.NewWindow_DifferentCoopStatesInRelatedWebviews/SiteIsolationForGuestsEnabled -WebViewTests/WebViewPdfTest.ContextMenuNavigationInMimeHandlerView/SiteIsolationForGuestsEnabled -WebViewTests/WebViewSafeBrowsingTest.Shim_TestLoadAbortSafeBrowsing/SiteIsolationForGuestsEnabled From 386c231b584c89598d5e13a63f5fd3150f107747 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 28 Dec 2022 12:05:16 -0500 Subject: [PATCH 108/146] Make adjustments for upstream unit tests --- test/filters/unit_tests.filter | 44 +++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/test/filters/unit_tests.filter b/test/filters/unit_tests.filter index 827dae0a3920..c325bcc4ecd6 100644 --- a/test/filters/unit_tests.filter +++ b/test/filters/unit_tests.filter @@ -8,6 +8,8 @@ # These tests crash due to TestingBraveBrowserProcess::greaselion_download_service() # having NOTREACHED which causes an immediate crash # https://github.com/brave/brave-browser/issues/25726 +-All/AppLauncherHandlerTest.HandleClosedWhileUninstallingExtension/OSIntegrationSubManagers_Disabled +-All/AppLauncherHandlerTest.HandleClosedWhileUninstallingExtension/OSIntegrationSubManagers_Enabled -All/PriceTrackingViewFeatureFlagTest.PriceTrackingViewCreation/* -ApcScrimManagerImplTest.DisabledScrimCannotBeShown -ApcScrimManagerImplTest.HideDoesNotImmediatelySetOriginalAxMode @@ -19,6 +21,7 @@ -BatterySaverButtonTest.* -BrowserViewTestWithStopLoadingAnimationForHiddenWindow.LoadingAnimationNotRenderedWhenWindowHidden -ChromeBrowsingDataRemoverDelegateOriginTrialsTest.PersistentOriginTrialsAreDeleted +-DownloadBubbleRowViewTest.CopyAcceleratorCopiesFile -ExtensionActionViewControllerFeatureUnitTest.* -ExtensionActionViewControllerGrayscaleTest.* -ExtensionActionViewControllerUnitTest.* @@ -29,6 +32,16 @@ -PeopleHandlerSignoutTest.SignoutNotAllowedSyncOn -PeopleHandlerSignoutTest.SignoutWithSyncOff -PeopleHandlerSignoutTest.SignoutWithSyncOn +-SavedTabGroupModelListenerTest.CreatesRemovesBrowserListener +-SavedTabGroupModelListenerTest.GetTabStripModelWithTabGroupId + +# These tests crash due to TestingBraveBrowserProcess::extension_whitelist_service() +# having NOTREACHED which causes an immediate crash +-All/UnpackedInstallerUnitTest.WithheldHostPermissionsWithFlag/* +-ChromeAppsIconFactoryTest.LoadCompressedIcon +-ChromeAppsIconFactoryTest.LoadCompressedIconWithoutEffect +-ChromeAppsIconFactoryTest.LoadStandardIcon +-ChromeAppsIconFactoryTest.LoadUncompressedIcon # These tests crash when BraveExtensionManagement is initialized via a # TestExtensionSystem @@ -97,6 +110,28 @@ # Test flaky in cr109, although corrected in newer revisions -TabStripScrollSessionTestWithVariableSpeed.GivenScrollSessionWhenMaybeStartThenTimerCallback +# These tests fail because we intentionally disable DICE signin via +# BraveAccountConsistencyModeManager::IsDiceSignInAllowed() +-All/DiceWebSigninInterceptorManagedAccountTest.* +-All/ProcessDiceHeaderDelegateImplTestEnableSync.* +-All/ProcessDiceHeaderDelegateImplTestHandleTokenExchangeFailure.* +-DiceSigninUiUtilTest.* +-DiceTurnSyncOnHelperTest.* +-DiceWebSigninInterceptorForcedSeparationTest.* +-DiceWebSigninInterceptorTest.* +-GAIAInfoUpdateServiceDiceTest.* + +# This test fails because we disable the privacy sandbox +-PrivacySandboxServiceTest.MetricsLoggingOccursCorrectly + +# This test fails because we intentionally disable the Federated Credential +# Management API via features::kFedCm +-FederatedIdentityApiPermissionContextTest.WhitelistedSiteForThirdPartyCookies + +# These tests fail because we intentionally disable preloading via +# features::kEarlyHintsPreloadForNavigation +-PreconnectManagerTest.* + # Tests below this point have not been diagnosed or had issues created yet. -AboutFlagsHistogramTest.* -AboutFlagsTest.* @@ -112,7 +147,6 @@ -ActivityLogTestWithoutSwitch.* -All/ActionTrackerTest.* -All/ChromeLabs*Test.* --All/DiceWebSigninInterceptorManagedAccountTest.* -All/EnterpriseProfileWelcomeHandleProceedTest.HandleProceed/* -All/ExtensionActionAPIUnitTest.* -All/ExtensionContextMenuModelWithUserHostControlsTest.PageAccessItemsVisibilityBasedOnSiteSettings/* @@ -123,8 +157,6 @@ -All/MultipleRulesetsTest.* -All/ParameterizedDeclarativeContentActionTest.* -All/PreinstalledWebAppManagerTest.ReplacementExtensionBlockedByPolicy/* --All/ProcessDiceHeaderDelegateImplTestEnableSync.* --All/ProcessDiceHeaderDelegateImplTestHandleTokenExchangeFailure.* -All/RulesetManagerTest.* -All/SearchProviderCommandLineOverrideTest.CommandLineOverrides/* -All/SearchProviderTest.* @@ -227,10 +259,6 @@ -DevicePermissionsManagerTest.* -DevToolsUIBindingsTest.* -DevToolsUIDataSourceTest.* --DiceSigninUiUtilTest.* --DiceTurnSyncOnHelperTest.* --DiceWebSigninInterceptorForcedSeparationTest.* --DiceWebSigninInterceptorTest.* -DocumentOverlayWindowViewsTest.* -DownloadBubblePrefsTest.EnhancedProtectionEnabled -DownloadProtectionServiceTest.* @@ -271,6 +299,7 @@ -ExtensionsMenuViewUnitTest.* -ExtensionSourcePriorityTest.* -ExtensionsTabbedMenuViewUnitTest.* +-ExtensionsToolbarButtonUnitTest.ButtonOpensMenu -ExtensionsToolbarContainerUnitTest.* -ExtensionsToolbarControlsTest.* -ExtensionsToolbarControlsUnitTest.* @@ -293,7 +322,6 @@ -ForegroundedOrClosedTest.* -FullscreenControllerStateUnitTest.* -FullStreamUIPolicyTest.* --GAIAInfoUpdateServiceDiceTest.* -GalleryWatchManagerTest.* -GCMProfileServiceTest.* -GeolocationPermissionContextDelegateTests.* From 572902e661a7e85c3a21f63c16e744b8714e9f4e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 14:50:10 +0000 Subject: [PATCH 109/146] Update from Chromium 110.0.5478.4 to Chromium 110.0.5481.23. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de507d20b7e5..47915a7e1285 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5478.4", + "tag": "110.0.5481.23", "repository": { "url": "https://github.com/chromium/chromium" } From f6bedecef1ca2ac525021fea19942a691aaf73bd Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 14:58:15 +0000 Subject: [PATCH 110/146] Conflict-resolved patches from Chromium 110.0.5478.4 to Chromium 110.0.5481.23. --- patches/chrome-VERSION.patch | 6 +++--- patches/chrome-android-java-AndroidManifest.xml.patch | 4 ++-- patches/components-sync_device_info-BUILD.gn.patch | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 0605a97eefad..d647da3c82d0 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index fe98f5c45394bf6b3f2d50067de6139b81accb5e..933bc4c77ddc643e0e383b8f6652caad66f3b4e3 100644 +index a5b7e42781d06debd43f0d403bfe4b45e7fefd5c..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 --BUILD=5478 --PATCH=4 +-BUILD=5481 +-PATCH=23 +MINOR=1 +BUILD=49 +PATCH=59 diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 7a34c015afb5..ae4d144d6b51 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 39c57cc7d63ee802d71a8c27dc9e1b37e8de7d4a..4481d8e7aebffc8e80b5bfc47683b2309869277d 100644 +index e861de3a552a0ad5719f910a398898396e7d8674..62ab20aa7360d1d1233894c1ef54bbeacb7325b0 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -90,7 +90,7 @@ index 39c57cc7d63ee802d71a8c27dc9e1b37e8de7d4a..4481d8e7aebffc8e80b5bfc47683b230 @@ -900,6 +916,7 @@ by a child template that "extends" this file. diff --git a/patches/components-sync_device_info-BUILD.gn.patch b/patches/components-sync_device_info-BUILD.gn.patch index 9db3956d786b..6dc2ec7d23d1 100644 --- a/patches/components-sync_device_info-BUILD.gn.patch +++ b/patches/components-sync_device_info-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/components/sync_device_info/BUILD.gn b/components/sync_device_info/BUILD.gn -index 4cb48f7f878fb5f46e37643d86c126113ac84fd7..c2e59c8facc774e105b88cb1970a4004fbab5496 100644 +index a5dd5cb4fa5f78b600f825e25e7f699102f8d425..f42f8e91e95775e4b5d4d28f50cec667e723e967 100644 --- a/components/sync_device_info/BUILD.gn +++ b/components/sync_device_info/BUILD.gn -@@ -94,6 +94,7 @@ static_library("sync_device_info") { - "//chromeos/system", - ] +@@ -92,6 +92,7 @@ static_library("sync_device_info") { + if (is_chromeos_ash) { + deps += [ "//chromeos/ash/components/system" ] } + sources += brave_components_sync_device_info_sources deps += brave_components_sync_device_info_deps } From 698d82d484929b81b6288e6198233d523e4827e0 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 14:58:28 +0000 Subject: [PATCH 111/146] Update patches from Chromium 110.0.5478.4 to Chromium 110.0.5481.23. --- ...base-trace_event-builtin_categories.h.patch | 4 ++-- patches/chrome-android-BUILD.gn.patch | 18 +++++++++--------- ...privacy-settings-PrivacySettings.java.patch | 8 ++++---- ...bed_mode-TabbedRootUiCoordinator.java.patch | 4 ++-- patches/chrome-browser-BUILD.gn.patch | 2 +- patches/chrome-browser-about_flags.cc.patch | 4 ++-- .../chrome-browser-extensions-BUILD.gn.patch | 2 +- ...chrome-browser-prefs-browser_prefs.cc.patch | 2 +- ...ivacy_page-personalization_options.ts.patch | 2 +- ...ttings-privacy_page-privacy_page.html.patch | 2 +- ...rowser-resources-settings-settings.ts.patch | 2 +- .../chrome-browser-shell_integration.h.patch | 4 ++-- patches/chrome-browser-ui-BUILD.gn.patch | 4 ++-- ...browser-toolbar-top-ToolbarPhone.java.patch | 4 ++-- patches/chrome-browser-ui-browser.cc.patch | 6 +++--- ...-views-bookmarks-bookmark_bar_view.cc.patch | 4 ++-- ...ews-location_bar-location_bar_view.cc.patch | 4 ++-- ...mnibox-omnibox_popup_contents_view.cc.patch | 4 ++-- ...ions-permission_prompt_bubble_view.cc.patch | 2 +- ...wser-ui-views-toolbar-toolbar_view.cc.patch | 2 +- ...-ui-webui-extensions-extensions_ui.cc.patch | 4 ++-- ...ettings_localized_strings_provider.cc.patch | 4 ++-- patches/chrome-common-BUILD.gn.patch | 2 +- ...ome-installer-mini_installer-BUILD.gn.patch | 4 ++-- patches/chrome-installer-setup-BUILD.gn.patch | 4 ++-- patches/chrome-renderer-BUILD.gn.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 4 ++-- ...ome-test-data-webui-settings-BUILD.gn.patch | 4 ++-- ...et-android-java-res-values-dimens.xml.patch | 4 ++-- ...owser_context_keyed_service_factory.h.patch | 4 ++-- ...core-browser-password_form_filling.cc.patch | 4 ++-- ...r-renderer_host-navigation_request.cc.patch | 6 +++--- patches/content-common-BUILD.gn.patch | 2 +- ...blic-browser-content_browser_client.h.patch | 4 ++-- ...ontent-renderer-render_thread_impl.cc.patch | 2 +- ...ensions-browser-sandboxed_unpacker.cc.patch | 4 ++-- patches/net-cookies-canonical_cookie.cc.patch | 2 +- .../services-network-cookie_settings.cc.patch | 2 +- ...re-html-canvas-html_canvas_element.cc.patch | 4 ++-- ...nvas2d-canvas_rendering_context_2d.cc.patch | 4 ++-- ...erer-modules-webaudio-audio_buffer.cc.patch | 10 +++++----- ...arty-blink-renderer-platform-BUILD.gn.patch | 4 ++-- patches/ui-webui-resources-BUILD.gn.patch | 6 +++--- patches/v8/BUILD.gn.patch | 6 +++--- 44 files changed, 91 insertions(+), 91 deletions(-) diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index c41ecb227021..493cddbe762c 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,8 +1,8 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 1c33c3345fd7dcc106576b239946be79eee45cb1..858072517301d569a2c5330498a158d68b0e0235 100644 +index 37bbac5815969906f4d75798c37f748e9fc75216..563f0bb6d75138a9be43f76154c76565d8f00ddd 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -184,6 +184,7 @@ +@@ -185,6 +185,7 @@ X("webrtc") \ X("webrtc_stats") \ X("xr") \ diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index f7b4bd853805..a3c44b8ebfeb 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f85462bb99 100644 +index f3926b696ca0fb349a00ebf0f262532af8e1d1f3..457a9bd2b112e8edaf3c4806b1c051e5b50d328f 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -239,6 +239,7 @@ if (current_toolchain == default_toolchain) { @@ -18,7 +18,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 } if (enable_vr) { -@@ -711,6 +713,7 @@ if (current_toolchain == default_toolchain) { +@@ -712,6 +714,7 @@ if (current_toolchain == default_toolchain) { ] deps += feed_deps @@ -26,7 +26,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -735,6 +738,7 @@ if (current_toolchain == default_toolchain) { +@@ -736,6 +739,7 @@ if (current_toolchain == default_toolchain) { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -34,7 +34,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -872,6 +876,7 @@ if (current_toolchain == default_toolchain) { +@@ -873,6 +877,7 @@ if (current_toolchain == default_toolchain) { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -42,7 +42,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2087,6 +2092,7 @@ if (current_toolchain == default_toolchain) { +@@ -2088,6 +2093,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -2335,6 +2341,7 @@ if (current_toolchain == default_toolchain) { +@@ -2336,6 +2342,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2540,6 +2547,7 @@ if (current_toolchain == default_toolchain) { +@@ -2541,6 +2548,7 @@ if (current_toolchain == default_toolchain) { shared_libraries = [ ":libchrome" ] version_name = chrome_version_name @@ -66,7 +66,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 } } -@@ -2681,6 +2689,7 @@ if (current_toolchain == default_toolchain) { +@@ -2682,6 +2690,7 @@ if (current_toolchain == default_toolchain) { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -74,7 +74,7 @@ index 5d0dd7feecb621c147ac41b1e382253ff73800f3..9150acd26d164f4bf05bbe8694a910f8 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -2864,6 +2873,7 @@ if (current_toolchain == default_toolchain) { +@@ -2865,6 +2874,7 @@ if (current_toolchain == default_toolchain) { deps += [ "//weblayer/browser/java:upstream_java" ] } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index bf6079f5fa57..afc40f38e173 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,8 +1,8 @@ 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 -index bf6987fe59c6dcb8709d706ed16da74d3f07dc93..e624a6d04f40f7fd501141257c9ec631c3d3e4b8 100644 +index da126b63a3d93952bc0a361456b32a519d618cdc..aa48d8cbf929d90ae0ad7235736088f2ab33cc69 100644 --- 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 -@@ -53,7 +53,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -55,7 +55,7 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -11,7 +11,7 @@ index bf6987fe59c6dcb8709d706ed16da74d3f07dc93..e624a6d04f40f7fd501141257c9ec631 private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -283,6 +283,7 @@ public class PrivacySettings +@@ -288,6 +288,7 @@ public class PrivacySettings @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index bf6987fe59c6dcb8709d706ed16da74d3f07dc93..e624a6d04f40f7fd501141257c9ec631 MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(VectorDrawableCompat.create( -@@ -297,6 +298,6 @@ public class PrivacySettings +@@ -302,6 +303,6 @@ public class PrivacySettings null); return true; } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch index 728be1dc4890..1e20248684f9 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -index 5c83e0a3f5ec976f568009df011197319a491d11..3b7928196c3b4e52d1ac151ff933347947dd9e0c 100644 +index 419814bfcd224bc4b601bf9108b48f197207786f..83071a61d46dd8a06009777a12e013c8ea7dfabb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -694,7 +694,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -686,7 +686,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mActivity, mModalDialogManagerSupplier.get())); NotificationPermissionController.attach( mWindowAndroid, mNotificationPermissionController); diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 82e40565d007..7d9b1a37d29e 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 7dbf7acaaaafae75c5e521330289ab71104fb841..b1f67b82e317bd5f1777033742110b7bda405d65 100644 +index d7c913bdfe3b578576679ed3b75a0be4a559063a..47e4bd7aaaff34693d001a5191750947837a2648 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2528,6 +2528,7 @@ static_library("browser") { diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 8d8fbfc7ebd0..3da31817f365 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 1a3a841390b15f07b5b879170087b8b4b27446dc..a90421f55e65ff6f545c49813f0083ab929a0a0a 100644 +index f2e9d3f0317a8d9432b3f067b009d066ceab5d33..76d79f5e3bb22789095a7929b2af951c813ef2a3 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3368,6 +3368,7 @@ const FeatureEntry::FeatureVariation +@@ -3320,6 +3320,7 @@ const FeatureEntry::FeatureVariation // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 75728cf211fe..9b215879f873 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index a796089bb7e64a7c965e89e2311387bc51f8308c..881c9716bbe1f56f429101a4ea45ed23e37765b9 100644 +index 3d32690deb9eea0f7203bd3390f185f7d967bb7a..e2bd2b3aac9121ca4c4b088c4d14d0321ea79ea2 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -1366,6 +1366,7 @@ static_library("extensions") { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 701b8d99459e..595edbe1ffeb 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 9a0e0445b992df159da545c8f4815e2d63c1f9ea..187ffefcf2d121db3daefdf0538f1dfca4e29808 100644 +index 829d5faa9433f0cc5cdb577abed2f5e4489dc49a..027173f2631d8b029e7c66163c4a13d80569b1be 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -1302,6 +1302,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch index f4216ed827ee..a6a752da2f2f 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -index 0f869c257563db797663fb76b855bad3e22cf032..c31a8bfaffda5dc9d93ac847a02f3b1d2dd64df7 100644 +index 5c55e5518ba3087448b8333ae5c906fc14e0ac11..17e94c8eabe1a208fb60f1461d414952491e25a8 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts @@ -69,7 +69,7 @@ export class SettingsPersonalizationOptionsElement extends diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 3ff1db6c2a94..b8b1b0f4f261 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 5a3e6752d38c67a09203c12fa7acc46908b55228..aefc3413b0eeaca720235cdc0f5d1f7da3e8388b 100644 +index 366dcd2758e9dfaa67c711873582c57def487806..ef873b4f67d8fd120fcc8aa1d3389a8a0890af44 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -40,6 +40,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 2afc5cda4df8..a75b4dd375bc 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index 54cda320b1b7064a7b090be69a6c39470a73bcf6..8704495329cbc6163677c706e5431f21c10f9a6d 100644 +index 9f33a751eb51b7cede4069f864528811a5d9c8c5..0645b957986eb954a960a426b590b61f890c44fc 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-shell_integration.h.patch b/patches/chrome-browser-shell_integration.h.patch index 631f95fd2687..5f87a23fae32 100644 --- a/patches/chrome-browser-shell_integration.h.patch +++ b/patches/chrome-browser-shell_integration.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h -index 6385833bbdad93e13701ae4e0656a533cca38fff..2eb86bdfc7e5d95771a2fb9e9c60e6b29ccafd3c 100644 +index ac58e8cb287ec924d06d3acefdc1932880e90a8a..3abc296b80df992688c7d23b742ff2f45e70d07c 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h -@@ -249,6 +249,7 @@ class DefaultBrowserWorker : public DefaultWebClientWorker { +@@ -253,6 +253,7 @@ class DefaultBrowserWorker : public DefaultWebClientWorker { DefaultBrowserWorker(const DefaultBrowserWorker&) = delete; DefaultBrowserWorker& operator=(const DefaultBrowserWorker&) = delete; diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 489fbb71bdb3..a50d7747f9ac 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 978c1f31f9d7e7f377339d04f303d4e5cd7cd77f..e3c4721e02c64e6b9f0dc95b1a4a8e0c56da7f32 100644 +index 932388c3288896094d1e77c2dab602fc70348abe..9e21bab162e9402505a598dd705d4a59e9882b73 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -666,6 +666,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 978c1f31f9d7e7f377339d04f303d4e5cd7cd77f..e3c4721e02c64e6b9f0dc95b1a4a8e0c # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -4011,10 +4012,13 @@ static_library("ui") { +@@ -4012,10 +4013,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index 940b27b2fe19..eb4a7e88712f 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 621c04cfe2e0522a0db4681e189afb5f5a48a520..1e05efcae031d5e28426e439c3a756625ba047b4 100644 +index c46f2e7d7f9428ee62ff675a536d8ad3171e5421..0b1d9adc3be698a38bef8876740f4fa4ce9407f6 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java @@ -395,6 +395,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC @@ -34,7 +34,7 @@ index 621c04cfe2e0522a0db4681e189afb5f5a48a520..1e05efcae031d5e28426e439c3a75662 // Draw the tab stack button and associated text if necessary. if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null && mUrlExpansionFraction != 1f) { -@@ -2057,6 +2061,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2068,6 +2072,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index ada07fe4f77c..06c7199180f4 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 8f9c1932cef561c9e6461dcf940e69560fc4acc6..ce4dad9569449d9741ed239874407916f91c6807 100644 +index 5f4092a34b16084368af523530920bace4503808..5d24ce83fa37f9b13a3285650799fa8d8172a195 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -449,6 +449,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -452,6 +452,7 @@ Browser* Browser::Create(const CreateParams& params) { // not possible, e.g. using the wrong profile or during shutdown. The caller // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 8f9c1932cef561c9e6461dcf940e69560fc4acc6..ce4dad9569449d9741ed239874407916 return new Browser(params); } -@@ -459,7 +460,7 @@ Browser::Browser(const CreateParams& params) +@@ -462,7 +463,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 001a3dc9b9fd..9bac1b4c9526 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 7e90858799459b817c4a7b333ccbe09b08d70b50..1091a3915ac3fe116950fe75396928572dd250e3 100644 +index 6c2e7da1b4990c59286d57eeaaf69e3991039766..f10520bb5efc920cbde858065a10af12e4308a20 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -855,6 +855,7 @@ void BookmarkBarView::Layout() { +@@ -853,6 +853,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index bd572ab5f71b..41781b14ebe8 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index d7ed6c2a5af6bf0e845d977d76623de42fe9b09f..fd081e80e3b45e7c13d4b65889ad6c4a05dec535 100644 +index f46f5359245dbed2ff7f32d0bf9403519aa0d33e..78c88bbcb90ce110e500987256de39b003ce8e11 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -667,6 +667,7 @@ void LocationBarView::Layout() { +@@ -668,6 +668,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch b/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch index 800a89a9babe..4be6dc59f175 100644 --- a/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch +++ b/patches/chrome-browser-ui-views-omnibox-omnibox_popup_contents_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc -index 93949fd1aa1dcc712f29788fd0392daf1c0532b0..1cc0dc99eaa48fb4ff004c68e9fd80a1a14229db 100644 +index 9e2e18ec8e40b2a9f991578ba42ac121dca310f5..8637aaf8a85b7ca4c2b6d901baf171531924825b 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc -@@ -345,7 +345,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() { +@@ -351,7 +351,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() { if (children().size() == i) { AddChildView(std::make_unique( i, edit_model_, diff --git a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch index 95001414cb5c..459e5e2ba398 100644 --- a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc -index 2ec1fb696e4f95c26a7a1c6f009d191c96a38d67..34e25db9ed3cdaf5394f7c7cbada769bdb5068d2 100644 +index d1132d68dab3931074e240acae1d18525e6b99ce..81f68aed97716db49fbdb2aa77bd15cc9d46a80e 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc @@ -311,6 +311,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 848fba9583db..cdb594cb7867 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index ee4e67a702a0e6a7f6d4fef90fb7b40c7e405181..58378e0292c46b5bc7515297439752626088ba90 100644 +index dbe0846164b88eceea5e4d9f66110e467ee649c9..f0e93cfd2cf18c0ab0369b5e8d2331992fba9fd0 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -347,6 +347,7 @@ void ToolbarView::Init() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index 2ddd2c56206a..2ced7395ae67 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 1179c4add3b721b68f7ae0fdca19f051e3c66e31..d9eedd74408e19f65a3dcf9f09632d3a967e4862 100644 +index 5b49aeb200c7b1987dd74fc87bcfc47fecf56080..e6a00b0aadae06e937cdd0413dc368d0efa5eda4 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -395,6 +395,7 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, +@@ -396,6 +396,7 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, "showAccessRequestsInToolbarLearnMoreLink", chrome_extension_constants::kShowAccessRequestsInToolbarHelpURL); diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index cc93cc9dfcd6..c99ab194e34e 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index b61383ce8462ea4042f0283aab57672565f2e024..04b3b452d278755a39ac70daf36a811234a26bd7 100644 +index 62af3a765309dc7a87e19b05bf38f2fedc12e04f..0fade152231add95e2e1d85dbe3bcf54746a3d2f 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3399,6 +3399,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3408,6 +3408,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index e87e646c422b..92e89af42c93 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 1e8255db4253de945b7ae0f6028e069bb1cd2ce5..7ea042d577df3b584cfa85c1c966613bdd600f36 100644 +index 3e3bb00ddb6ab1feaaef8db1679b392da372cacd..e3dc6122cee227f20294c1e865de340471c7881d 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -90,6 +90,7 @@ source_set("channel_info") { diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch index d61731f730ac..6756020c0aad 100644 --- a/patches/chrome-installer-mini_installer-BUILD.gn.patch +++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn -index f72c5456309222e51d570e5d14676f28a73b405b..77b2a7470934712ece924d5f085b4b9676d419ae 100644 +index 7fe3f49dafecd0c81662e27f58e3cde4b52a1f4f..6ecdb461ff1b2bb32932eeca42181c536ed28f67 100644 --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn @@ -13,6 +13,7 @@ import("//third_party/icu/config.gni") @@ -10,7 +10,7 @@ index f72c5456309222e51d570e5d14676f28a73b405b..77b2a7470934712ece924d5f085b4b96 declare_args() { # The Chrome archive is compressed in official builds to reduce the size of -@@ -171,6 +172,9 @@ action("mini_installer_archive") { +@@ -174,6 +175,9 @@ action("mini_installer_archive") { "//mojo/core:shared_library", "//third_party/icu:icudata", ] diff --git a/patches/chrome-installer-setup-BUILD.gn.patch b/patches/chrome-installer-setup-BUILD.gn.patch index 72802f79e09c..11fc7816a8ea 100644 --- a/patches/chrome-installer-setup-BUILD.gn.patch +++ b/patches/chrome-installer-setup-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn -index b078dcbc6f99efbe2f70fc88fe78cd2109bca0dd..e757123cba905290c706e7093a8b802a32797b15 100644 +index c88c4ae4516a038ce2d9c31050b7bbacb68975f3..c73f973bffdc9deff40c1fefa6768b7963257314 100644 --- a/chrome/installer/setup/BUILD.gn +++ b/chrome/installer/setup/BUILD.gn -@@ -129,6 +129,7 @@ if (is_win) { +@@ -130,6 +130,7 @@ if (is_win) { "channel_override_work_item.h", ] } diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 965969b19347..33322bda3773 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index c38896d7abb27399a31ae8c3527f86df2a5b13cb..e2539e4306bd4386bca6ae67aa2c216333302ff5 100644 +index 289e3ad2abba45b5887520e6818457e26ed46478..b934411da3c48f70dd9b06cf700ec8fd119a9bd4 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -215,6 +215,7 @@ static_library("renderer") { +@@ -214,6 +214,7 @@ static_library("renderer") { "//v8", ] diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 468acff057d1..1429fbd91ae0 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index a33fbad430ead20024adac6e4c6f4ab6a39b8018..dbdfe975e0cc8a79e63f94f672f627564bd5c110 100644 +index 10e69466b090340236966c0be9c6e261f9cd232b..0a55b30c2d6fdbf25e4ea69bc9552bb67f581aad 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { @@ -10,7 +10,7 @@ index a33fbad430ead20024adac6e4c6f4ab6a39b8018..dbdfe975e0cc8a79e63f94f672f62756 data_deps = [] if (enable_pdf) { -@@ -5272,7 +5273,7 @@ config("disable_thinlto_cache_flags") { +@@ -5279,7 +5280,7 @@ config("disable_thinlto_cache_flags") { } config("pdb_larger_than_4gb") { diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index 1801e8b205b3..e704dd9f8298 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index 2c111a1a4d50483a04f387ea799607aca3506d5f..4204519ebe5809c41e83167fa698e38260f15c49 100644 +index a26e1550ec7eaa12782102140337567d75aee33a..61e5a3cc991ecab7bddb7afad7eeb52af3e7a0ed 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -205,6 +205,7 @@ build_webui_tests("build") { +@@ -206,6 +206,7 @@ build_webui_tests("build") { ts_definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index 9ece95117eeb..468cf2851560 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index c8672d3b020fede79174ec54db91651c60125ede..4d4d17cf64623755f0bb5ad00fe48be5eb3da0f9 100644 +index 7ab6fd858cc175a7eddc55accab1ee255f712736..d94dd144132bbd0c3c6b9f0c96572989b4bdc77c 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml -@@ -76,7 +76,7 @@ found in the LICENSE file. +@@ -75,7 +75,7 @@ found in the LICENSE file. 48dp diff --git a/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch b/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch index e06a4940a7e9..9e49e0d6f430 100644 --- a/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch +++ b/patches/components-keyed_service-content-browser_context_keyed_service_factory.h.patch @@ -1,8 +1,8 @@ diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h -index f546244b9f7ba685798640e315670527bb04276a..30ec4627b9570f1d8320c0d8b68262b11211c71f 100644 +index dda3f0c6163114dab45f1ece5ab5ec74ed206b41..5d0e3e030e94a9caa862e57a0c0217633cdee322 100644 --- a/components/keyed_service/content/browser_context_keyed_service_factory.h +++ b/components/keyed_service/content/browser_context_keyed_service_factory.h -@@ -157,6 +157,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory +@@ -164,6 +164,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory // and the default implementation removes it from |mapping_| and deletes // the pointer. virtual void BrowserContextShutdown(content::BrowserContext* context); diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index 98e645a66fef..78b8d659840a 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index 1dd49aa221bbfcbf89645efcbf67e761fedbb7bb..0d3e9ec5ab3cbeef3967daaaa7cc45da1bdc1143 100644 +index 3e2cf1a869bc4cffad95216d5a184b0576e8f702..3f8fb2ff80d0466bd8a6c780c700166ae67a16a4 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc -@@ -243,6 +243,7 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -250,6 +250,7 @@ LikelyFormFilling SendFillInformationToRenderer( bool wait_for_username = wait_for_username_reason != WaitForUsernameReason::kDontWait; diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 4776365bc94c..333f64383b43 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 757b9988ce106a3831d0c5265d720693ddc45837..2819bc72bf6a71393c4d9b78d6b45241cf7a2d6a 100644 +index 8dcc8499e45be5127d80ac882d10a9a2c7a9e8dd..f765547058da73b07f0e464f081c8a637cca8438 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2997,6 +2997,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2998,6 +2998,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 757b9988ce106a3831d0c5265d720693ddc45837..2819bc72bf6a71393c4d9b78d6b45241 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4483,6 +4484,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4487,6 +4488,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 341f3ae2c0ad..c8f3978c34e9 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index ff6b2e9248d7a03923ac57e44e31b5fb8320e456..a9bac0b34fefa4d15b63e7b2a66e47fcd7fd9991 100644 +index 54df36f673af12688e0575664c44c30be0cb6584..d7ab483ab86e25cca47fc65ba454b834de4223b1 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -71,6 +71,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 2f97dc874db2..b9c2fe2cea60 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 99f1c9203e9763f7869fb92553edb77ddec3483b..2a96b2ca7f3b3f67bafc19c2b82fe1d492e4e435 100644 +index eaedfc8f8603dc5af5406450ad290f34f7b8a055..5701bc26f84b36dfdecc4217d5ec39e50fb0fdcd 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -2063,6 +2063,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2055,6 +2055,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 52df816eb070..44710755613f 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index fbab90b71cefa2b300303d256ba9b1c8f997086d..dc72aede57ba83764de48a8c71afacb97394eb70 100644 +index 2ac91dcba1d7af4878822dd476843b8205fd37e7..7de95a046b4972a02ef51fb7daf5c79262d8b413 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -925,6 +925,7 @@ void RenderThreadImpl::InitializeRenderer( diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index 31dcebb98ca0..77a81b2233b3 100644 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index 182ba5bd4eab8c23789fafb9e0943e78fd730c99..5d973142c728120b5612e60afce4a70f4f029f5a 100644 +index e478f9fbd15bf56d492f30615ceac7dd2b061858..50adff525284463d51252f5ab692f2464b2f9f85 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc -@@ -1045,6 +1045,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( +@@ -1044,6 +1044,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( DCHECK(!public_key_.empty()); base::Value::Dict final_manifest = manifest.Clone(); final_manifest.Set(manifest_keys::kPublicKey, public_key_); diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index fe3dc96a11b0..02f9104ab185 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index 2fff8cee9cb84c9908413f1c9abc2ad51a450972..f09144e5206b880b7b72060a5617c4d587a7d979 100644 +index f0b68755fab2235aecbf10ea6197b24066c0bbd0..a272b36a1123a788af4815520a3ad68e285dbd5e 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc @@ -516,6 +516,7 @@ base::Time CanonicalCookie::ValidateAndAdjustExpiryDate( diff --git a/patches/services-network-cookie_settings.cc.patch b/patches/services-network-cookie_settings.cc.patch index 43cb43f9a938..326b5704372d 100644 --- a/patches/services-network-cookie_settings.cc.patch +++ b/patches/services-network-cookie_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_settings.cc -index 33169c2d85a48528ad105b2892a0fa0742f9a207..c4fe5e6b9e37ceb79921a4681d74e9a2091c6d09 100644 +index 83ae43e3841c2c234fa4add9ce8921b2e8a4661c..78695828da4fd8afe36fa0d999102c90ade35afd 100644 --- a/services/network/cookie_settings.cc +++ b/services/network/cookie_settings.cc @@ -228,6 +228,7 @@ CookieSettings::GetCookieSettingWithMetadata( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 25ca3ddbe234..2ab78317d75f 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index a966af5c5a130217d86b39493ce96803a050088d..f69abcf1d25e5e581a7d6c6f20bb7c49fe87efd6 100644 +index 340b2b9a73b57a2752164a2cb816b933131d5dc4..af8209bdee62096318222963b05228e83d43165c 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -1067,6 +1067,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1066,6 +1066,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index cfa3097c30c8..6751fb60fa10 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -index 020b4d97ec280fadd9a4280f840aeee8f144c96d..a27a01ec1578c960607ef7f20098d514d6fa6bc5 100644 +index e46a8fcb3057b9349720e259e29742f090c22d3a..ca8abeb2882dff5f8f2bce6ff9cc170202b2e9fe 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -931,6 +931,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -934,6 +934,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch index 0bd39cd2cafc..18499cb33f88 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -index 5933e326354d0f08aa0c32fdadbbff6b04144b70..812402d4fee6f4e39709d8ffd6f3748b17b3e908 100644 +index 2e032806463bb25fd0371c1a03538985a9fd164a..2e6ac692c7d772ce717cb6fad53cd9f7c1c7d9de 100644 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -@@ -198,6 +198,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) +@@ -197,6 +197,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) } NotShared AudioBuffer::getChannelData( @@ -10,7 +10,7 @@ index 5933e326354d0f08aa0c32fdadbbff6b04144b70..812402d4fee6f4e39709d8ffd6f3748b unsigned channel_index, ExceptionState& exception_state) { if (channel_index >= channels_.size()) { -@@ -209,6 +210,7 @@ NotShared AudioBuffer::getChannelData( +@@ -208,6 +209,7 @@ NotShared AudioBuffer::getChannelData( return NotShared(nullptr); } @@ -18,7 +18,7 @@ index 5933e326354d0f08aa0c32fdadbbff6b04144b70..812402d4fee6f4e39709d8ffd6f3748b return getChannelData(channel_index); } -@@ -220,13 +222,15 @@ NotShared AudioBuffer::getChannelData(unsigned channel_index) { +@@ -219,13 +221,15 @@ NotShared AudioBuffer::getChannelData(unsigned channel_index) { return NotShared(channels_[channel_index].Get()); } @@ -37,7 +37,7 @@ index 5933e326354d0f08aa0c32fdadbbff6b04144b70..812402d4fee6f4e39709d8ffd6f3748b int32_t channel_number, size_t buffer_offset, ExceptionState& exception_state) { -@@ -267,6 +271,7 @@ void AudioBuffer::copyFromChannel(NotShared destination, +@@ -266,6 +270,7 @@ void AudioBuffer::copyFromChannel(NotShared destination, DCHECK_LE(buffer_offset + count, data_length); memmove(dst, src + buffer_offset, count * sizeof(*src)); diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index 54869b15ecf2..76bcd9a79375 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 9c01b81187295b19e6b1a5302358ab248cbf30f4..297d32de067ebff4b10ee6a22852e94feafd50d4 100644 +index 7c8fc3182b3701e411947944a101c1fbf0976f8b..3420d82b6622375d289fb413399159b8255af289 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1839,6 +1839,7 @@ component("platform") { +@@ -1838,6 +1838,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/ui-webui-resources-BUILD.gn.patch b/patches/ui-webui-resources-BUILD.gn.patch index f7ab52dc8d94..182d59a142db 100644 --- a/patches/ui-webui-resources-BUILD.gn.patch +++ b/patches/ui-webui-resources-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn -index 12bd3e903b28bbebd4fb135d950e3046eaf0ce85..6f5ded7cd01a4706b672d96ff249e7411b54f42d 100644 +index 786f1f84f144812507a82da47c63838caddee801..28df78d3a9b69ab5b538cbe51bb38de06e2a35da 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn -@@ -103,6 +103,7 @@ generate_grd("build_grd") { +@@ -102,6 +102,7 @@ generate_grd("build_grd") { "$root_gen_dir/ui/webui/resources/cr_components/color_change_listener/resources.grdp", ] } @@ -10,7 +10,7 @@ index 12bd3e903b28bbebd4fb135d950e3046eaf0ce85..6f5ded7cd01a4706b672d96ff249e741 } if (is_chromeos_ash) { -@@ -213,6 +214,7 @@ ts_library("library") { +@@ -208,6 +209,7 @@ ts_library("library") { if (is_ios) { extra_deps += [ ":generate_definitions" ] } diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index b95ed2b61fb7..eb13695899fa 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index e09bf653231b5a30867187742e832d44373103ac..08c4336448f527869be12802a375dd9fc98cf52e 100644 +index 19399e86e8181034287e6d7867d8a4f429ddc6a4..74013efdd46175f8ff3e2ff93972f9746b24153b 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -629,6 +629,7 @@ config("internal_config_base") { +@@ -648,6 +648,7 @@ config("internal_config_base") { "$target_gen_dir", "$target_gen_dir/include", ] @@ -10,7 +10,7 @@ index e09bf653231b5a30867187742e832d44373103ac..08c4336448f527869be12802a375dd9f } config("internal_config") { -@@ -2658,6 +2659,7 @@ v8_header_set("v8_headers") { +@@ -2680,6 +2681,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] From 0d0cdef1e5fa44a8fbd213742e3af9a84f771249 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 15:03:16 +0000 Subject: [PATCH 112/146] Updated strings for Chromium 110.0.5481.23. --- app/extensions_strings.grdp | 3 + app/generated_resources.grd | 26 +++++++- app/generated_resources_override.grd | 2 + app/settings_strings.grdp | 59 +++++++++++++++++++ .../strings/android_chrome_strings.grd | 2 +- components/autofill_payments_strings.grdp | 3 + components/management_strings.grdp | 11 ++-- components/policy_strings.grdp | 3 + components/translate_strings.grdp | 17 ++++-- 9 files changed, 114 insertions(+), 12 deletions(-) diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index ff7968b3b18c..d29b68a9285f 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -422,6 +422,9 @@ Always on this site + + Site settings + All extensions allowed diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 6b4c150f6051..f592c358526c 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -5751,6 +5751,20 @@ Keep your key file in a safe place. You will need it to create new versions of y In Brave Password Manager for $1user@gmail.com + + + Brave Password Manager • $1user@gmail.com + + + To your Brave sync chain, for $1user@gmail.com + + + In your Brave sync chain, for $1user@gmail.com + + + Only on this device + + Sign In @@ -6399,6 +6413,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Classic Brave + + Uploaded image + Upload from device @@ -7837,9 +7854,6 @@ Check your passwords anytime in $1Brave P Update - - Update... - Continue @@ -12696,6 +12710,12 @@ Please help our engineers fix this problem. Tell us what happened right before y This device doesn't support the type of security key requested by this website + + No passkeys available + + + There aren't any passkeys for $1google.com on this device + Turn on Bluetooth? diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index e2fd0dbfb3a2..9ebac55a5671 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -558,6 +558,8 @@ are declared in tools/grit/grit_rule.gni. + + diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 3f7f470654df..14835453099b 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -1540,6 +1540,9 @@ No languages added + + Remove $1Swahili + Brave Translate @@ -1631,6 +1634,50 @@ + + + Preload pages + + + Choose whether to preload pages + + + No preloading + + + Pages load only after you open them. + + + Standard preloading + + + Some of the pages you visit are preloaded. + + + Browsing and searching is faster. + + + Brave preloads pages you're likely to visit, so that they load more quickly when you visit them. + + + Extended preloading + + + More pages are preloaded. Pages may be preloaded through Brave servers when requested by other sites. + + + Browsing and searching is faster than standard preloading. + + + Brave preloads even more pages that you're likely to visit, so that they load more quickly when you visit them. + + + When a site asks to privately preload links on their page, Brave uses Brave servers. This hides your identity from the preloaded site, but Brave learns what sites get preloaded. + + + If you allow cookies, Brave may use them when preloading. + + Privacy and security @@ -1830,6 +1877,18 @@ Vivamus nibh turpis, varius quis nisi vel, porta laoreet tellus. Mauris porta imperdiet venenatis + + Mauris at lectus + + + Nulla tincidunt iaculis nulla, sit amet viverra massa luctus nec. Integer eget pellentesque magna, et venenatis lorem. Integer a porta elit. Eget bibendum neque. + + + Sed porta viverra lacus ut euismod. Integer a cursus metus, ac ultricies libero. + + + Curabitur sagittis sapien ut turpis interdum, vitae porttitor sem pretium. Vestibulum sem mauris, ultrices ac massa sit amet, sodales aliquet est. + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 9b685398ad50..d7415d2dbb77 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -3554,7 +3554,7 @@ To change this setting, <resetlink>reset sync

%1$s5 tabs as a new background tab group. - See sites you follow here + See content you follow here diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index f6a5f516a575..09aedd610f68 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -782,6 +782,9 @@ Autofill payment info + + Continue + diff --git a/components/management_strings.grdp b/components/management_strings.grdp index b5b9831f5c3b..14b288d566e2 100644 --- a/components/management_strings.grdp +++ b/components/management_strings.grdp @@ -60,20 +60,23 @@ - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1">Learn more</a> + Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> - This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <a target="_blank" href="$1">Learn more</a> + This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1">Learn more</a> + Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> - This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <a target="_blank" href="$1">Learn more</a> + This browser is not managed by a company or other organization. Activity on this device may be managed outside of Brave. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + + Learn more about how your browser is managed + diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index 922ea138c3c8..83b5db0e6add 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -327,6 +327,9 @@ Ignored because $1CloudReportingEnabled is not set to $2Enabled. + + Ignored because $1CloudReportingEnabled is not set. + Ignored because user is not affiliated to the machine management or the machine is not managed. diff --git a/components/translate_strings.grdp b/components/translate_strings.grdp index 3bff66d7495c..61920d45c783 100644 --- a/components/translate_strings.grdp +++ b/components/translate_strings.grdp @@ -142,9 +142,18 @@ Undo - - - Detected Language - + + + + Detected Language + + + + + + Detected Language + + + From cb56cbfd48754da808c67546810b1e0ea3615f06 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 16:19:27 +0000 Subject: [PATCH 113/146] Update from Chromium 110.0.5481.23 to Chromium 110.0.5481.24. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47915a7e1285..87425835b85b 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5481.23", + "tag": "110.0.5481.24", "repository": { "url": "https://github.com/chromium/chromium" } From e6c29f2528ec37971dd057cd80cecfa48acc5992 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 16:23:20 +0000 Subject: [PATCH 114/146] Conflict-resolved patches from Chromium 110.0.5481.23 to Chromium 110.0.5481.24. --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index d647da3c82d0..cb5de8e7d0be 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index a5b7e42781d06debd43f0d403bfe4b45e7fefd5c..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 +index dbd5a9d05dc07b9dc9e20294e32330994404b32c..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5481 --PATCH=23 +-PATCH=24 +MINOR=1 +BUILD=49 +PATCH=59 From 674f78057deb3c31a2f70d6c9c34805b50b8a1ab Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 16:23:33 +0000 Subject: [PATCH 115/146] Update patches from Chromium 110.0.5481.23 to Chromium 110.0.5481.24. --- patches/chrome-browser-BUILD.gn.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 7d9b1a37d29e..0fe2655343e0 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index d7c913bdfe3b578576679ed3b75a0be4a559063a..47e4bd7aaaff34693d001a5191750947837a2648 100644 +index 8ba5a90740a059ce265d5e7690921f18a636f674..247ea01859f6952929503e956314456e6c972905 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2528,6 +2528,7 @@ static_library("browser") { +@@ -2530,6 +2530,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } From 5627e2feda3d08a7ebdc3ef4d0f323169558aeb8 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 5 Jan 2023 18:20:46 +0000 Subject: [PATCH 116/146] PostConstructionCallbackTrait override moved Chromium change: https://chromium.googlesource.com/chromium/src/+/995f951511ca7df63b38d05b93a05d98bfde1584 commit 995f951511ca7df63b38d05b93a05d98bfde1584 Author: Michael Lippautz Date: Wed Dec 14 12:32:09 2022 +0000 ActiveScriptWrappable: Introduce lazy version LazyActiveScriptWrappable only adds ASW behavior after explicitly registering an object. This is useful for objects with lots of instances that only require ASW behavior in certain cases. Change HTMLInputElement to LazyASW as it only requires ASW behavior when using an ImageLoader. This eliminates .3% CPU cycles spent in ASW logic on Speedometer2. Bug: chromium:1400641 --- .../core/v8/active_script_wrappable.h | 57 +++++++++++++++++++ .../bindings/active_script_wrappable_base.h | 49 ---------------- 2 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 chromium_src/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h delete mode 100644 chromium_src/third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h diff --git a/chromium_src/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h b/chromium_src/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h new file mode 100644 index 000000000000..f99108b3a751 --- /dev/null +++ b/chromium_src/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h @@ -0,0 +1,57 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_H_ +#define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_H_ + +#include "brave/components/brave_page_graph/common/buildflags.h" + +#if BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) +#include "third_party/blink/renderer/core/core_export.h" +#include "third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h" + +#define PostConstructionCallbackTrait PostConstructionCallbackTrait_ChromiumImpl +#endif // BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) + +#include "src/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" + +#if BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) +#undef PostConstructionCallbackTrait + +namespace blink { +class Node; +} // namespace blink + +namespace cppgc { + +template +struct PostConstructionCallbackTrait; + +template +struct is_post_construction_callback : std::false_type {}; + +template +struct is_post_construction_callback< + T, + std::void_t< + decltype(std::declval().ActiveScriptWrappableBaseConstructed())>> + : std::true_type {}; + +// Allow PostConstructionCallback to work with Node types. +template +struct PostConstructionCallbackTrait< + T, + typename std::enable_if::value && + !std::is_base_of::value, + void>::type> { + static void Call(T* object) { + PostConstructionCallbackTrait_ChromiumImpl::Call(object); + } +}; + +} // namespace cppgc +#endif // BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) + +#endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_H_ diff --git a/chromium_src/third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h b/chromium_src/third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h deleted file mode 100644 index 473c556032b7..000000000000 --- a/chromium_src/third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_ACTIVE_SCRIPT_WRAPPABLE_BASE_H_ -#define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_ACTIVE_SCRIPT_WRAPPABLE_BASE_H_ - -#include "brave/components/brave_page_graph/common/buildflags.h" - -#if BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) -#include "third_party/blink/renderer/platform/heap/garbage_collected.h" -#include "v8/include/cppgc/allocation.h" -#include "v8/include/v8.h" - -#define PostConstructionCallbackTrait PostConstructionCallbackTrait_ChromiumImpl -#endif // BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) - -#include "src/third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h" - -#if BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) -#undef PostConstructionCallbackTrait - -namespace blink { -class Node; -} // namespace blink - -namespace cppgc { - -template -struct PostConstructionCallbackTrait; - -// Allow PostConstructionCallback to work with Node types. -template -struct PostConstructionCallbackTrait< - T, - typename std::enable_if< - std::is_base_of::value && - !std::is_base_of::value, - void>::type> { - static void Call(T* object) { - PostConstructionCallbackTrait_ChromiumImpl::Call(object); - } -}; - -} // namespace cppgc -#endif // BUILDFLAG(ENABLE_BRAVE_PAGE_GRAPH) - -#endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_ACTIVE_SCRIPT_WRAPPABLE_BASE_H_ From db67cb5e376f5e057bc59079d434dc8174babb9f Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 5 Jan 2023 17:24:24 -0500 Subject: [PATCH 117/146] [Android] Removed unused resources Brave dino is not used anymore and lint produces errors on these resources. --- .../brave/android/res_brave_base/values/channel_constants.xml | 1 - .../android/res_brave_beta_base/values/channel_constants.xml | 1 - .../android/res_brave_default_base/values/channel_constants.xml | 1 - .../android/res_brave_dev_base/values/channel_constants.xml | 1 - .../android/res_brave_nightly_base/values/channel_constants.xml | 1 - app/theme/brave/android/values/channel_constants.xml | 1 - 6 files changed, 6 deletions(-) diff --git a/app/theme/brave/android/res_brave_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_base/values/channel_constants.xml index a2682b2ad75e..4759d6a86c02 100644 --- a/app/theme/brave/android/res_brave_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_base/values/channel_constants.xml @@ -9,5 +9,4 @@ Brave bookmarks Brave search Brave quick action search - Brave dino diff --git a/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml index 0c789dd5e67a..08ee9332ba16 100644 --- a/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml @@ -11,5 +11,4 @@ Brave bookmarks Brave search Brave quick action search - Brave dino diff --git a/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml index 470c2bc3842a..6c19ba4a5398 100644 --- a/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml @@ -9,5 +9,4 @@ Brave bookmarks Brave search Brave quick action search - Brave dino diff --git a/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml index 43f202e5ee37..9ae924fefd1b 100644 --- a/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml @@ -11,5 +11,4 @@ Brave bookmarks Brave search Brave quick action search - Brave dino diff --git a/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml index 1c9b04aead6a..bcd336dcd3dd 100644 --- a/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml @@ -11,5 +11,4 @@ Brave bookmarks Brave search Brave quick action search - Brave dino diff --git a/app/theme/brave/android/values/channel_constants.xml b/app/theme/brave/android/values/channel_constants.xml index 470c2bc3842a..6c19ba4a5398 100644 --- a/app/theme/brave/android/values/channel_constants.xml +++ b/app/theme/brave/android/values/channel_constants.xml @@ -9,5 +9,4 @@ Brave bookmarks Brave search Brave quick action search - Brave dino From 3b61ecb8c7d550ac968d0bc57f892709b6fe5607 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Thu, 5 Jan 2023 18:40:46 -0500 Subject: [PATCH 118/146] Extension::Create now takes a base::Value::Dict argument for manifest Chromium change: https://source.chromium.org/chromium/chromium/src/+/31533f8078d5c5053b1aaab6b4b593cbfdaaa121 commit 31533f8078d5c5053b1aaab6b4b593cbfdaaa121 Author: Alex Turner Date: Wed Dec 14 23:48:04 2022 +0000 Migrate Extension::Create() argument to base::Value::Dict (part 4 of 4) base::DictionaryValue is deprecated. This migrates all remaining callers and switches out the base::DictAdapterForMigration argument to a base::Value::Dict. After this cl, there are no remaining uses of base::DictAdapterForMigration other than its definition and unit tests. Bug: 1187061 --- browser/extensions/mv2_warning_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/extensions/mv2_warning_unittest.cc b/browser/extensions/mv2_warning_unittest.cc index 2b6ee95d1399..9396fb8053c0 100644 --- a/browser/extensions/mv2_warning_unittest.cc +++ b/browser/extensions/mv2_warning_unittest.cc @@ -25,15 +25,15 @@ TEST(Mv2WarningTest, ExtensionManifestVersions) { .Set("description", "An awesome extension"); if (manifest_version) builder.Set("manifest_version", *manifest_version); - return builder.Build(); + return builder.BuildDict(); }; std::string error; scoped_refptr extension = extensions::Extension::Create( base::FilePath(), extensions::mojom::ManifestLocation::kUnpacked, - *get_manifest(2).get(), - extensions::Extension::InitFromValueFlags::NO_FLAGS, &error); + get_manifest(2), extensions::Extension::InitFromValueFlags::NO_FLAGS, + &error); ASSERT_NE(extension, nullptr); From 303535a40bbc26827a10dbcc7ead420628ae6cc0 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Thu, 5 Jan 2023 19:05:23 -0500 Subject: [PATCH 119/146] [iOS] Add implementation for ApplicationContextImpl::GetSystemIdentityManager Chromium change: https://source.chromium.org/chromium/chromium/src/+/04fa025caa22ca66b350c97a8d1c0ed9aa05c7e7 commit 04fa025caa22ca66b350c97a8d1c0ed9aa05c7e7 Author: Sylvain Defresne Date: Thu Dec 15 10:27:57 2022 +0000 [ios] Allow access to SystemIdentityManager via ApplicationContext As SystemIdentityManager is an application level singleton, add it as a object owned by the ApplicationContext and expose an accessor. This requires the signin provider API to be implemented by in the internal repository, but do not yet use the new API. Add a hook to allow injecting a FakeSystemIdentityManager instead of a real instance. This allow decoupling the EarlGrey tests from the real signin API (as it requires network access). This is part of a multi-CL change: - https://crrev.com/c/4088608 - https://crrev.com/c/4088585 - https://crrev.com/i/5189969 - https://crrev.com/i/5189970 => https://crrev.com/c/4088826 - https://crrev.com/c/4088748 Bug: 1201182 --- .../application_context_impl.mm | 18 ++++++++++++++++++ ios/browser/providers/BUILD.gn | 1 + 2 files changed, 19 insertions(+) diff --git a/chromium_src/ios/chrome/browser/application_context/application_context_impl.mm b/chromium_src/ios/chrome/browser/application_context/application_context_impl.mm index 5e555c67436c..20f25c0071f6 100644 --- a/chromium_src/ios/chrome/browser/application_context/application_context_impl.mm +++ b/chromium_src/ios/chrome/browser/application_context/application_context_impl.mm @@ -30,6 +30,7 @@ #include "components/prefs/pref_service.h" #include "components/sessions/core/session_id_generator.h" #include "components/ukm/ukm_service.h" +#import "ios/chrome/app/tests_hook.h" #include "ios/chrome/browser/application_context/application_context.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.h" @@ -47,9 +48,11 @@ #import "ios/chrome/browser/promos_manager/promos_manager_impl.h" #include "ios/chrome/browser/push_notification/push_notification_service.h" #include "ios/chrome/browser/segmentation_platform/otr_web_state_observer.h" +#include "ios/chrome/browser/signin/system_identity_manager.h" #import "ios/components/security_interstitials/safe_browsing/safe_browsing_service.h" #include "ios/public/provider/chrome/browser/app_distribution/app_distribution_api.h" #include "ios/public/provider/chrome/browser/push_notification/push_notification_api.h" +#import "ios/public/provider/chrome/browser/signin/signin_identity_api.h" #include "ios/public/provider/chrome/browser/signin/signin_sso_api.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/log/net_log.h" @@ -333,6 +336,21 @@ void BindNetworkChangeManagerReceiver( return single_sign_on_service_; } +SystemIdentityManager* ApplicationContextImpl::GetSystemIdentityManager() { + DCHECK(thread_checker_.CalledOnValidThread()); + if (!system_identity_manager_) { + // Give the opportunity for the test hook to override the factory from + // the provider (allowing EG tests to use a fake SystemIdentityManager). + system_identity_manager_ = tests_hook::CreateSystemIdentityManager(); + if (!system_identity_manager_) { + system_identity_manager_ = + ios::provider::CreateSystemIdentityManager(GetSSOService()); + } + DCHECK(system_identity_manager_); + } + return system_identity_manager_.get(); +} + segmentation_platform::OTRWebStateObserver* ApplicationContextImpl::GetSegmentationOTRWebStateObserver() { if (!segmentation_otr_web_state_observer_) { diff --git a/ios/browser/providers/BUILD.gn b/ios/browser/providers/BUILD.gn index 3993ea9a3455..6dfcb1de4350 100644 --- a/ios/browser/providers/BUILD.gn +++ b/ios/browser/providers/BUILD.gn @@ -30,6 +30,7 @@ group("brave_providers") { "//ios/chrome/browser/providers/push_notification:chromium_push_notification", "//ios/chrome/browser/providers/risk_data:chromium_risk_data", "//ios/chrome/browser/providers/signin:chromium_signin_error", + "//ios/chrome/browser/providers/signin:chromium_signin_identity", "//ios/chrome/browser/providers/signin:chromium_signin_resources", "//ios/chrome/browser/providers/signin:chromium_signin_sso", "//ios/chrome/browser/providers/signin:chromium_trusted_vault", From e375919489ddca0fa43bf1956510767a6d0376f4 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Mon, 9 Jan 2023 14:52:28 -0500 Subject: [PATCH 120/146] Explicitly changes ChromeMainDelegate to BraveMainDelegate in header Due to this change brave@507149f BraveMainDelegateBrowserTest.ComponentUpdaterReplacement test fails on Android because ChromeMainDelegateAndroid inherits ChromeMainDelegate in browser tests instead of BraveMainDelegate. --- .../app/android/chrome_main_delegate_android.cc | 2 ++ .../app/android/chrome_main_delegate_android.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 chromium_src/chrome/app/android/chrome_main_delegate_android.h diff --git a/chromium_src/chrome/app/android/chrome_main_delegate_android.cc b/chromium_src/chrome/app/android/chrome_main_delegate_android.cc index 6f85192e988c..8d21a6b4df91 100644 --- a/chromium_src/chrome/app/android/chrome_main_delegate_android.cc +++ b/chromium_src/chrome/app/android/chrome_main_delegate_android.cc @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "brave/chromium_src/chrome/app/android/chrome_main_delegate_android.h" + #include "brave/app/brave_main_delegate.h" #define ChromeMainDelegate BraveMainDelegate diff --git a/chromium_src/chrome/app/android/chrome_main_delegate_android.h b/chromium_src/chrome/app/android/chrome_main_delegate_android.h new file mode 100644 index 000000000000..8f76c196955b --- /dev/null +++ b/chromium_src/chrome/app/android/chrome_main_delegate_android.h @@ -0,0 +1,15 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ + +#include "brave/app/brave_main_delegate.h" + +#define ChromeMainDelegate BraveMainDelegate +#include "src/chrome/app/android/chrome_main_delegate_android.h" +#undef ChromeMainDelegate + +#endif // BRAVE_CHROMIUM_SRC_CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ From fb65a19bc37ada0e7c289e4bb269202fb03b13fe Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Tue, 10 Jan 2023 11:15:39 -0500 Subject: [PATCH 121/146] Fix for Widevine gn check failure --- browser/widevine/BUILD.gn | 72 +++++++++++++++++++++------------------ test/BUILD.gn | 1 - 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/browser/widevine/BUILD.gn b/browser/widevine/BUILD.gn index bafb2fbbd670..3979b57abfff 100644 --- a/browser/widevine/BUILD.gn +++ b/browser/widevine/BUILD.gn @@ -1,5 +1,12 @@ +# Copyright (c) 2023 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + import("//third_party/widevine/cdm/widevine.gni") +assert(enable_widevine) + source_set("widevine") { # Remove when https://github.com/brave/brave-browser/issues/10644 is resolved check_includes = false @@ -38,45 +45,42 @@ source_set("constants") { source_set("unittest") { testonly = true - if (enable_widevine && !is_android) { - sources = [ "widevine_cdm_component_installer_unittest.cc" ] - deps = [ - "//testing/gtest", - "//third_party/widevine/cdm:buildflags", - ] - } + + sources = [ "widevine_cdm_component_installer_unittest.cc" ] + deps = [ + "//testing/gtest", + "//third_party/widevine/cdm:buildflags", + ] } source_set("browser_tests") { testonly = true defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] - if (enable_widevine) { - sources = [ - "widevine_permission_request_browsertest.cc", - "widevine_prefs_migration_browsertest.cc", - ] + sources = [ + "widevine_permission_request_browsertest.cc", + "widevine_prefs_migration_browsertest.cc", + ] - deps = [ - ":constants", - ":widevine", - "//base", - "//brave/browser", - "//brave/common", - "//brave/components/constants", - "//chrome/browser", - "//chrome/browser:browser_process", - "//chrome/browser/profiles:profile", - "//chrome/browser/ui", - "//chrome/common", - "//chrome/test:test_support_ui", - "//components/prefs", - "//content/public/browser", - "//content/test:test_support", - "//testing/gtest", - "//third_party/widevine/cdm:buildflags", - "//ui/views", - "//url", - ] - } + deps = [ + ":constants", + ":widevine", + "//base", + "//brave/browser", + "//brave/common", + "//brave/components/constants", + "//chrome/browser", + "//chrome/browser:browser_process", + "//chrome/browser/profiles:profile", + "//chrome/browser/ui", + "//chrome/common", + "//chrome/test:test_support_ui", + "//components/prefs", + "//content/public/browser", + "//content/test:test_support", + "//testing/gtest", + "//third_party/widevine/cdm:buildflags", + "//ui/views", + "//url", + ] } diff --git a/test/BUILD.gn b/test/BUILD.gn index f23f2b91200e..9847b262ec3c 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -182,7 +182,6 @@ test("brave_unit_tests") { "//brave/browser/ui/brave_tooltips", "//brave/browser/ui/webui/new_tab_page:unit_tests", "//brave/browser/web_discovery:unit_tests", - "//brave/browser/widevine:unittest", "//brave/chromium_src/components/privacy_sandbox:unit_tests", "//brave/chromium_src/net/base:unit_tests", "//brave/components/adblock_rust_ffi", From 7fc053ee1dacda206e6cf799eb93f7010b36b57d Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 10 Jan 2023 18:43:23 -0500 Subject: [PATCH 122/146] Update from Chromium 110.0.5481.24 to Chromium 110.0.5481.29 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87425835b85b..ee108e14bcf7 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5481.24", + "tag": "110.0.5481.29", "repository": { "url": "https://github.com/chromium/chromium" } From 73d01aef6a3fcb98787e394aea9133a6682acc06 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 10 Jan 2023 18:48:14 -0500 Subject: [PATCH 123/146] Conflict-resolved patches from Chromium 110.0.5481.24 to Chromium 110.0.5481.29 --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index cb5de8e7d0be..146140912e1b 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index dbd5a9d05dc07b9dc9e20294e32330994404b32c..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 +index 3dd6895a574bf5d41141e61e6d2655c29590fa54..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5481 --PATCH=24 +-PATCH=29 +MINOR=1 +BUILD=49 +PATCH=59 From 4100436b3614e7c9ab3ebf0c84fbf825d567d54a Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 10 Jan 2023 18:51:43 -0500 Subject: [PATCH 124/146] Update patches from Chromium 110.0.5481.24 to Chromium 110.0.5481.29 --- ...settings-browser-page_specific_content_settings.cc.patch | 6 +++--- patches/v8/BUILD.gn.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index aa607e613040..de08935c0fd5 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index e2d4bb5bc1673dfc21e279371a9b2014902a9151..fb0a86a2e977cef9ac963f18a91116a1a4127e6c 100644 +index 1b221f81ebdab5b76315a5dc2b351f587cda9234..8155f35d429c8a49708a1d02a4f0478f3c50b132 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -577,6 +577,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -589,6 +589,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index e2d4bb5bc1673dfc21e279371a9b2014902a9151..fb0a86a2e977cef9ac963f18a91116a1 content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION) { const auto& it = content_settings_status_.find(content_type); -@@ -599,6 +600,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -611,6 +612,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::MEDIASTREAM_CAMERA && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index eb13695899fa..b413b64f2900 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/BUILD.gn b/BUILD.gn -index 19399e86e8181034287e6d7867d8a4f429ddc6a4..74013efdd46175f8ff3e2ff93972f9746b24153b 100644 +index c9fec31475d6c777183e911df6bef5214c0b765b..7de977bbcaad9c330bf04616909eb8bf72230c25 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -648,6 +648,7 @@ config("internal_config_base") { @@ -10,7 +10,7 @@ index 19399e86e8181034287e6d7867d8a4f429ddc6a4..74013efdd46175f8ff3e2ff93972f974 } config("internal_config") { -@@ -2680,6 +2681,7 @@ v8_header_set("v8_headers") { +@@ -2682,6 +2683,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] From ddbecd9236d7b06983a85b4aa1917d280a75ca3b Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 11 Jan 2023 10:30:33 -0500 Subject: [PATCH 125/146] Update from Chromium 110.0.5481.29 to Chromium 110.0.5481.30 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee108e14bcf7..4152a5a6d82c 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5481.29", + "tag": "110.0.5481.30", "repository": { "url": "https://github.com/chromium/chromium" } From 034da35fee066a49dae745051ba1b719f5984c82 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 11 Jan 2023 10:36:42 -0500 Subject: [PATCH 126/146] Conflict-resolved patches from Chromium 110.0.5481.29 to Chromium 110.0.5481.30 --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 146140912e1b..8204a153130d 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 3dd6895a574bf5d41141e61e6d2655c29590fa54..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 +index a5d6f98070379cc6de5e13a8a03b789946eb093d..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5481 --PATCH=29 +-PATCH=30 +MINOR=1 +BUILD=49 +PATCH=59 From 6ab9d0865a15b9972c4a28d9354f70667f3705cc Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Thu, 12 Jan 2023 12:05:40 -0500 Subject: [PATCH 127/146] Call RegisterWindowClosingCallback to register callback for chooser bubble Our override of WidgetDelegate::WindowClosing was not being called as expected, causing BraveWalletTabHelperBrowserTest.DoNotHidePanelIfRequestedHIDPermissions to fail. The comments for WindowClosing, referencing RegisterWindow*Callback, say "It is better to use those callback mechanisms than to override one of these methods" so that's what we now do. --- .../ui/views/permissions/chooser_bubble_ui.cc | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc b/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc index 80e1e61a7436..7f113eecbab5 100644 --- a/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc +++ b/chromium_src/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc @@ -25,6 +25,27 @@ bool IsBravePanel(content::WebContents* content) { GURL(kBraveUIWalletPanelURL)); } +void OnWindowClosing(views::Widget* anchor_widget) { + if (!anchor_widget) { + return; + } + Browser* browser = + chrome::FindBrowserWithWindow(anchor_widget->GetNativeWindow()); + if (!browser || !browser->tab_strip_model()) { + return; + } + content::WebContents* active = + browser->tab_strip_model()->GetActiveWebContents(); + if (!active) { + return; + } + auto* tab_helper = + brave_wallet::BraveWalletTabHelper::FromWebContents(active); + if (tab_helper) { + tab_helper->SetCloseOnDeactivate(true); + } +} + } // namespace namespace views { @@ -34,25 +55,11 @@ class BraveBubbleDialogDelegateView : public views::BubbleDialogDelegateView { static views::Widget* CreateBubble( std::unique_ptr delegate) { - return BubbleDialogDelegateView::CreateBubble(std::move(delegate)); - } - void WindowClosing() override { - views::BubbleDialogDelegateView::WindowClosing(); - if (!anchor_widget()) - return; - Browser* browser = - chrome::FindBrowserWithWindow(anchor_widget()->GetNativeWindow()); - if (!browser || !browser->tab_strip_model()) - return; - content::WebContents* active = - browser->tab_strip_model()->GetActiveWebContents(); - if (!active) { - return; + if (delegate) { + delegate->RegisterWindowClosingCallback( + base::BindOnce(&OnWindowClosing, delegate->anchor_widget())); } - auto* tab_helper = - brave_wallet::BraveWalletTabHelper::FromWebContents(active); - if (tab_helper) - tab_helper->SetCloseOnDeactivate(true); + return BubbleDialogDelegateView::CreateBubble(std::move(delegate)); } }; From ea8069c2db9c74f01b197fd5e9b3f456384e8605 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 12 Jan 2023 16:04:30 -0500 Subject: [PATCH 128/146] [Android] Download later feature was removed Chromium change: https://github.com/chromium/chromium/commit/6e07489857ed08ff87b9ba9d7a71eaa41a707211 Clean up code related DownloadLater feature This feature is not launched, remove all related code. BUG=1337109 Change-Id: Ie602ecf5e93d16d7fdfd0229da7e13cd50fef0b5 --- .../download/settings/BraveDownloadSettings.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java b/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java index 1d9914b04383..5fee26e7437a 100644 --- a/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java +++ b/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java @@ -20,8 +20,6 @@ public class BraveDownloadSettings extends DownloadSettings implements Preference.OnPreferenceChangeListener { private static final String PREF_AUTOMATICALLY_OPEN_WHEN_POSSIBLE = "automatically_open_when_possible"; - private static final String PREF_DOWNLOAD_LATER_PROMPT_ENABLED = - "download_later_prompt_enabled"; public static final String PREF_LOCATION_PROMPT_ENABLED = "location_prompt_enabled"; private static final String PREF_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE = "download_progress_notification_bubble"; @@ -49,14 +47,6 @@ public void onCreate(Bundle savedInstanceState) { locationPromptEnabledPref.setTitle( R.string.brave_download_location_prompt_enabled_title); } - - ChromeSwitchPreference downloadLaterPromptEnabledPref = - (ChromeSwitchPreference) findPreference(PREF_DOWNLOAD_LATER_PROMPT_ENABLED); - assert downloadLaterPromptEnabledPref != null : "Upstream applied new changes!"; - - if (downloadLaterPromptEnabledPref != null) { - getPreferenceScreen().removePreference(downloadLaterPromptEnabledPref); - } } @Override From 289a7f05130d3d00303925e05bb2026a878e8313 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Fri, 13 Jan 2023 17:58:40 -0500 Subject: [PATCH 129/146] Pass appropriate MicrotaskQueue to MicrotasksScope Chromium change: https://source.chromium.org/chromium/chromium/src/+/ce31565127aa823f714e6bf7547ef48188cdc90f commit ce31565127aa823f714e6bf7547ef48188cdc90f Author: Dave Tapuska Date: Fri Dec 2 16:46:13 2022 +0000 Enable Microtask queues per WindowAgent. Each WindowAgent having its own microtask queue aligns with the specification. All code has been converted to use the EventLoop for queuing and running microtasks. This is a reland of crrev.com/01e7a24c. The original change was reverted due to a V8 Debugger issue using the wrong microtask queue to register its completion callback. That has since been fixed in v8 (https://chromium-review.googlesource.com/c/v8/v8/+/4062397). BUG=961186 --- .../brave_search_default_js_handler.cc | 2 +- .../renderer/js_ethereum_provider.cc | 8 ++++---- .../renderer/js_solana_provider.cc | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/brave_search/renderer/brave_search_default_js_handler.cc b/components/brave_search/renderer/brave_search_default_js_handler.cc index 36e72be528fa..bb5b5910e31c 100644 --- a/components/brave_search/renderer/brave_search_default_js_handler.cc +++ b/components/brave_search/renderer/brave_search_default_js_handler.cc @@ -136,7 +136,7 @@ void BraveSearchDefaultJSHandler::OnCanSetDefaultSearchProvider( v8::HandleScope handle_scope(isolate); v8::Local context = context_old->Get(isolate); v8::Context::Scope context_scope(context); - v8::MicrotasksScope microtasks(isolate, + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local resolver = promise_resolver->Get(isolate); diff --git a/components/brave_wallet/renderer/js_ethereum_provider.cc b/components/brave_wallet/renderer/js_ethereum_provider.cc index efd60818bc34..e46c17086e52 100644 --- a/components/brave_wallet/renderer/js_ethereum_provider.cc +++ b/components/brave_wallet/renderer/js_ethereum_provider.cc @@ -55,10 +55,10 @@ void JSEthereumProvider::OnIsUnlocked( v8::Isolate* isolate, bool locked) { v8::HandleScope handle_scope(isolate); - v8::MicrotasksScope microtasks(isolate, - v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local resolver = promise_resolver.Get(isolate); v8::Local context = global_context.Get(isolate); + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), + v8::MicrotasksScope::kDoNotRunMicrotasks); base::Value result = base::Value(!locked); v8::Local local_result = content::V8ValueConverter::Create()->ToV8Value(result, context); @@ -77,10 +77,10 @@ void JSEthereumProvider::SendResponse( if (!render_frame()) return; v8::HandleScope handle_scope(isolate); - v8::MicrotasksScope microtasks(isolate, - v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local context = global_context.Get(isolate); v8::Context::Scope context_scope(context); + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), + v8::MicrotasksScope::kDoNotRunMicrotasks); if (global_callback || force_json_response) { auto full_formed_response = brave_wallet::ToProviderResponse( diff --git a/components/brave_wallet/renderer/js_solana_provider.cc b/components/brave_wallet/renderer/js_solana_provider.cc index 02198c6c25a0..87f39c05cd7c 100644 --- a/components/brave_wallet/renderer/js_solana_provider.cc +++ b/components/brave_wallet/renderer/js_solana_provider.cc @@ -565,9 +565,9 @@ void JSSolanaProvider::OnConnect( const std::string& error_message, const std::string& public_key) { v8::HandleScope handle_scope(isolate); - v8::MicrotasksScope microtasks(isolate, - v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local context = global_context.Get(isolate); + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), + v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Context::Scope context_scope(context); v8::Local result; v8::Local v8_public_key; @@ -670,9 +670,9 @@ void JSSolanaProvider::OnSignTransaction( const std::string& error_message, const std::vector& serialized_tx) { v8::HandleScope handle_scope(isolate); - v8::MicrotasksScope microtasks(isolate, - v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local context = global_context.Get(isolate); + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), + v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local result; if (error == mojom::SolanaProviderError::kSuccess) { result = CreateTransaction(context, serialized_tx); @@ -694,10 +694,10 @@ void JSSolanaProvider::OnSignAllTransactions( const std::string& error_message, const std::vector>& serialized_txs) { v8::HandleScope handle_scope(isolate); - v8::MicrotasksScope microtasks(isolate, - v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local context = global_context.Get(isolate); v8::Context::Scope context_scope(context); + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), + v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local result; if (error == mojom::SolanaProviderError::kSuccess) { size_t serialized_txs_length = serialized_txs.size(); @@ -770,9 +770,9 @@ void JSSolanaProvider::SendResponse( v8::Local response, bool success) { v8::HandleScope handle_scope(isolate); - v8::MicrotasksScope microtasks(isolate, - v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Local context = global_context.Get(isolate); + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), + v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Context::Scope context_scope(context); v8::Local resolver = promise_resolver.Get(isolate); @@ -892,7 +892,7 @@ v8::Local JSSolanaProvider::CreatePublicKey( v8::Local context, const std::string& base58_str) { v8::Isolate* isolate = context->GetIsolate(); - v8::MicrotasksScope microtasks(isolate, + v8::MicrotasksScope microtasks(isolate, context->GetMicrotaskQueue(), v8::MicrotasksScope::kDoNotRunMicrotasks); v8::Context::Scope context_scope(context); From 2ba84095609a5d5af700063fd296a817ab05c8fe Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Mon, 16 Jan 2023 10:40:49 -0500 Subject: [PATCH 130/146] Exclude playlist browser tests from Android target These tests regressed in cr110. A follow up issue is created to fix them https://github.com/brave/brave-browser/issues/27837 --- android/android_browser_tests.gni | 1 + 1 file changed, 1 insertion(+) diff --git a/android/android_browser_tests.gni b/android/android_browser_tests.gni index ca30a7c21d77..ff58cdddeb28 100644 --- a/android/android_browser_tests.gni +++ b/android/android_browser_tests.gni @@ -122,6 +122,7 @@ android_test_exception_deps = [ "//brave/browser/farbling:browser_tests", "//brave/browser/net:browser_tests", "//brave/browser/permissions:browser_tests", + "//brave/browser/playlist/test:browser_tests", "//brave/browser/test:browser_tests", "//brave/browser/ui:browser_tests", "//brave/browser/ui/tabs/test:browser_tests", From 832bd5c42422dbdddb4db60a9a1c5fced618ec11 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 17 Jan 2023 10:05:26 -0500 Subject: [PATCH 131/146] Disable features flagged by privacy/security team --- app/brave_main_delegate_browsertest.cc | 19 ++++++++++++++++++- .../android_webview/common/aw_features.cc | 4 ++++ .../chrome/browser/browser_features.cc | 1 + .../chrome/browser/dips/dips_features.cc | 16 ++++++++++++++++ .../content/public/common/content_features.cc | 2 ++ .../extensions/common/extension_features.cc | 16 ++++++++++++++++ .../third_party/blink/common/features.cc | 6 ++++++ test/filters/browser_tests.filter | 4 ++++ test/filters/unit_tests.filter | 6 ++++++ 9 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 chromium_src/chrome/browser/dips/dips_features.cc create mode 100644 chromium_src/extensions/common/extension_features.cc diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index e656688ba650..7cf3a6a617fe 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -5,6 +5,8 @@ #include "brave/components/update_client/buildflags.h" #include "build/build_config.h" +#include "chrome/browser/browser_features.h" +#include "chrome/browser/dips/dips_features.h" #include "chrome/browser/domain_reliability/service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_features.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_features.h" @@ -44,11 +46,11 @@ #include "android_webview/common/aw_features.h" #include "chrome/test/base/android/android_browser_test.h" #else -#include "chrome/browser/browser_features.h" #include "chrome/browser/ui/profile_picker.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/translate/core/common/translate_util.h" +#include "extensions/common/extension_features.h" #endif using BraveMainDelegateBrowserTest = PlatformBrowserTest; @@ -86,7 +88,10 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { // Please, keep alphabetized const base::Feature* disabled_features[] = { #if BUILDFLAG(IS_ANDROID) + &android_webview::features::kWebViewAppsPackageNamesServerSideAllowlist, &android_webview::features::kWebViewClientHintsControllerDelegate, + &android_webview::features::kWebViewEnumerateDevicesCache, + &android_webview::features::kWebViewMeasureScreenCoverage, #endif &autofill::features::kAutofillEnableAccountWalletStorage, &autofill::features::kAutofillEnableOfferNotificationForPromoCodes, @@ -104,11 +109,16 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &blink::features::kCssSelectorFragmentAnchor, &blink::features::kFencedFrames, &blink::features::kFledge, + &blink::features::kFledgeConsiderKAnonymity, + &blink::features::kFledgeEnforceKAnonymity, &blink::features::kInterestGroupStorage, &blink::features::kParakeet, &blink::features::kPrerender2, + &blink::features::kPrerender2InBackground, &blink::features::kPrivacySandboxAdsAPIs, &blink::features::kSharedStorageAPI, + &blink::features::kSpeculationRulesHeaderEnableThirdPartyOriginTrial, + &blink::features::kSpeculationRulesPrefetchFuture, &blink::features::kSpeculationRulesPrefetchProxy, &blink::features::kTextFragmentAnchor, &commerce::kCommerceAllowOnDemandBookmarkUpdates, @@ -118,7 +128,11 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &commerce::kShoppingList, &commerce::kShoppingPDPMetrics, &commerce::kRetailCoupons, + &dips::kFeature, &enterprise_connectors::kLocalContentAnalysisEnabled, +#if !BUILDFLAG(IS_ANDROID) + &extensions_features::kExtensionsManifestV3Only, +#endif #if BUILDFLAG(IS_WIN) &features::kAppBoundEncryptionMetrics, #endif @@ -128,6 +142,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kDigitalGoodsApi, &features::kEarlyHintsPreloadForNavigation, &features::kFedCm, + &features::kFedCmIframeSupport, + &features::kFedCmUserInfo, + &features::kFedCmWithoutThirdPartyCookies, &features::kFirstPartySets, &features::kIdleDetection, &features::kIsolatePrerenders, diff --git a/chromium_src/android_webview/common/aw_features.cc b/chromium_src/android_webview/common/aw_features.cc index e9ae570035ba..75ec7733e732 100644 --- a/chromium_src/android_webview/common/aw_features.cc +++ b/chromium_src/android_webview/common/aw_features.cc @@ -13,7 +13,11 @@ namespace android_webview { namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kWebViewAppsPackageNamesServerSideAllowlist, + base::FEATURE_DISABLED_BY_DEFAULT}, {kWebViewClientHintsControllerDelegate, base::FEATURE_DISABLED_BY_DEFAULT}, + {kWebViewEnumerateDevicesCache, base::FEATURE_DISABLED_BY_DEFAULT}, + {kWebViewMeasureScreenCoverage, base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace features diff --git a/chromium_src/chrome/browser/browser_features.cc b/chromium_src/chrome/browser/browser_features.cc index 70a5d241107c..f8d7f5c3616a 100644 --- a/chromium_src/chrome/browser/browser_features.cc +++ b/chromium_src/chrome/browser/browser_features.cc @@ -17,6 +17,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kCopyLinkToText, base::FEATURE_DISABLED_BY_DEFAULT}, #endif {kDestroyProfileOnBrowserClose, base::FEATURE_DISABLED_BY_DEFAULT}, + {kFedCmWithoutThirdPartyCookies, base::FEATURE_DISABLED_BY_DEFAULT}, // Google has asked embedders not to enforce these pins: // https://groups.google.com/a/chromium.org/g/embedder-dev/c/XsNTwEiN1lI/m/TMXh-ZvOAAAJ {kKeyPinningComponentUpdater, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/chrome/browser/dips/dips_features.cc b/chromium_src/chrome/browser/dips/dips_features.cc new file mode 100644 index 000000000000..1b77d2384506 --- /dev/null +++ b/chromium_src/chrome/browser/dips/dips_features.cc @@ -0,0 +1,16 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "src/chrome/browser/dips/dips_features.cc" + +#include "base/feature_override.h" + +namespace dips { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kFeature, base::FEATURE_DISABLED_BY_DEFAULT}, +}}); + +} // namespace dips diff --git a/chromium_src/content/public/common/content_features.cc b/chromium_src/content/public/common/content_features.cc index 5a439281c7fe..4226dc8cb309 100644 --- a/chromium_src/content/public/common/content_features.cc +++ b/chromium_src/content/public/common/content_features.cc @@ -14,6 +14,8 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kDigitalGoodsApi, base::FEATURE_DISABLED_BY_DEFAULT}, {kEarlyHintsPreloadForNavigation, base::FEATURE_DISABLED_BY_DEFAULT}, {kFedCm, base::FEATURE_DISABLED_BY_DEFAULT}, + {kFedCmIframeSupport, base::FEATURE_DISABLED_BY_DEFAULT}, + {kFedCmUserInfo, base::FEATURE_DISABLED_BY_DEFAULT}, {kFirstPartySets, base::FEATURE_DISABLED_BY_DEFAULT}, {kIdleDetection, base::FEATURE_DISABLED_BY_DEFAULT}, {kNotificationTriggers, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/extensions/common/extension_features.cc b/chromium_src/extensions/common/extension_features.cc new file mode 100644 index 000000000000..d12bcdb3850b --- /dev/null +++ b/chromium_src/extensions/common/extension_features.cc @@ -0,0 +1,16 @@ +/* Copyright (c) 2023 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "src/extensions/common/extension_features.cc" + +#include "base/feature_override.h" + +namespace extensions_features { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kExtensionsManifestV3Only, base::FEATURE_DISABLED_BY_DEFAULT}, +}}); + +} // namespace extensions_features diff --git a/chromium_src/third_party/blink/common/features.cc b/chromium_src/third_party/blink/common/features.cc index 4cc143cba28a..8e8ef6c4bd7c 100644 --- a/chromium_src/third_party/blink/common/features.cc +++ b/chromium_src/third_party/blink/common/features.cc @@ -26,12 +26,18 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kCssSelectorFragmentAnchor, base::FEATURE_DISABLED_BY_DEFAULT}, {kFencedFrames, base::FEATURE_DISABLED_BY_DEFAULT}, {kFledge, base::FEATURE_DISABLED_BY_DEFAULT}, + {kFledgeConsiderKAnonymity, base::FEATURE_DISABLED_BY_DEFAULT}, + {kFledgeEnforceKAnonymity, base::FEATURE_DISABLED_BY_DEFAULT}, {kInterestGroupStorage, base::FEATURE_DISABLED_BY_DEFAULT}, {kParakeet, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrerender2, base::FEATURE_DISABLED_BY_DEFAULT}, + {kPrerender2InBackground, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacySandboxAdsAPIs, base::FEATURE_DISABLED_BY_DEFAULT}, {kReduceUserAgentMinorVersion, base::FEATURE_ENABLED_BY_DEFAULT}, {kSharedStorageAPI, base::FEATURE_DISABLED_BY_DEFAULT}, + {kSpeculationRulesHeaderEnableThirdPartyOriginTrial, + base::FEATURE_DISABLED_BY_DEFAULT}, + {kSpeculationRulesPrefetchFuture, base::FEATURE_DISABLED_BY_DEFAULT}, {kSpeculationRulesPrefetchProxy, base::FEATURE_DISABLED_BY_DEFAULT}, {kTextFragmentAnchor, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index 8cddbd32f804..4cfcefb050e8 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -427,6 +427,10 @@ # No binder found for interface brave_news.mojom.BraveNewsController for the frame/document scope -InteractiveBrowserTestBrowsertest.InstrumentTabsAsTestSteps +# These tests fail because we disable DIPS via dips::kFeature +-All/DIPSTabHelperBrowserTest.*/* +-DIPSBounceDetectorBrowserTest.* + # These tests fail on CI but pass locally -DeviceChooserExtensionBrowserTests/DeviceChooserExtensionBrowserTest.ChooserAnchoredToExtensionIcon/WebHid -DeviceChooserExtensionBrowserTests/DeviceChooserExtensionBrowserTest.ChooserAnchoredToExtensionIcon/WebUsb diff --git a/test/filters/unit_tests.filter b/test/filters/unit_tests.filter index c325bcc4ecd6..427bb4fd505d 100644 --- a/test/filters/unit_tests.filter +++ b/test/filters/unit_tests.filter @@ -132,6 +132,12 @@ # features::kEarlyHintsPreloadForNavigation -PreconnectManagerTest.* +# These tests fail because we disable DIPS via dips::kFeature +-All/DIPSDatabaseAllColumnTest.*/* +-All/DIPSDatabaseGarbageCollectionTest.*/* +-All/DIPSDatabaseInteractionTest.*/* +-DIPSDatabaseHistogramTest.* + # Tests below this point have not been diagnosed or had issues created yet. -AboutFlagsHistogramTest.* -AboutFlagsTest.* From 23b6f6d857d9584865d48f7a8430a7edac52eafa Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Wed, 18 Jan 2023 09:13:25 -0500 Subject: [PATCH 132/146] [Android] Add missing include file Otherwise there is incomplete type compile error. --- .../brave_vpn/renderer/android/vpn_render_frame_observer.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/components/brave_vpn/renderer/android/vpn_render_frame_observer.cc b/components/brave_vpn/renderer/android/vpn_render_frame_observer.cc index 78af813880ee..c2d1a307582e 100644 --- a/components/brave_vpn/renderer/android/vpn_render_frame_observer.cc +++ b/components/brave_vpn/renderer/android/vpn_render_frame_observer.cc @@ -17,6 +17,7 @@ #include "brave/components/skus/renderer/skus_utils.h" #include "build/build_config.h" #include "content/public/renderer/render_frame.h" +#include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/web_security_origin.h" #include "third_party/blink/public/web/web_local_frame.h" #include "url/url_util.h" From 6e8888791c4370f3eccad435f7e5f5d878cd14a8 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 18 Jan 2023 15:27:01 +0000 Subject: [PATCH 133/146] Update from Chromium 110.0.5481.30 to Chromium 110.0.5481.38. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4152a5a6d82c..926b653d8b80 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5481.30", + "tag": "110.0.5481.38", "repository": { "url": "https://github.com/chromium/chromium" } From fdfa3ce8e26ef228e9df9a04c63db65cdda3eb24 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 18 Jan 2023 15:33:00 +0000 Subject: [PATCH 134/146] Conflict-resolved patches from Chromium 110.0.5481.30 to Chromium 110.0.5481.38. --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 8204a153130d..eea789a48474 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index a5d6f98070379cc6de5e13a8a03b789946eb093d..3358f0eef225ab7d184d0c7a5abded5887b73b7a 100644 +index c2862f8efb98e3bdfa45d25cb7881198679f6d4d..c4ddd5c828f3c83223c2c03781700725d82ba3f6 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5481 --PATCH=30 +-PATCH=38 +MINOR=1 +BUILD=49 +PATCH=59 From 8c02cfd039db193a876b62af355f22d68ebb87c9 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 18 Jan 2023 15:33:11 +0000 Subject: [PATCH 135/146] Update patches from Chromium 110.0.5481.30 to Chromium 110.0.5481.38. --- ...ttings-site_settings-category_default_setting.ts.patch | 2 +- ...er-resources-settings-site_settings-constants.ts.patch | 2 +- ...owser-ui-startup-startup_browser_creator_impl.cc.patch | 4 ++-- .../chrome-browser-ui-views-tabs-new_tab_button.h.patch | 2 +- patches/chrome-browser-ui-views-tabs-tab.cc.patch | 4 ++-- patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch | 2 +- ...hrome-renderer-chrome_content_renderer_client.cc.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 2 +- patches/components-sync-BUILD.gn.patch | 2 +- patches/ios-chrome-browser-prefs-browser_prefs.mm.patch | 8 ++++---- patches/net-http-transport_security_state.cc.patch | 2 +- ...s-canvas-canvas2d-canvas_rendering_context_2d.cc.patch | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch index 25fca4d0493d..b63d5caf8b38 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts -index 23ca13f050103ec396f8e3d73e03492475182dcf..f953a49612ad4a67911bc51ac01805d310e4026e 100644 +index 23ca13f050103ec396f8e3d73e03492475182dcf..58c6628fbb8248fd02e78d404155dac089c4e38b 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts @@ -184,6 +184,7 @@ export class CategoryDefaultSettingElement extends diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 9c81279837d8..0235936d87be 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index 3e33bc32e4415928725e79305866b6e80eaa454b..73839cb91f0e7e4f61e198a946c07a21e3ea4a0b 100644 +index 3e33bc32e4415928725e79305866b6e80eaa454b..4792f21c054180f80c0baa1bd9dda626fd9827af 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts @@ -50,6 +50,7 @@ export enum ContentSettingsTypes { diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 95879582704f..f7db667e474d 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index a8e60adf0377158c3465d4f8bb9b6e0d51c68f9a..8ac085723893ca735d651d7baf4f27b88404ea11 100644 +index 0268e498ff2dbe82bf1d1d99163f36aa202d63ad..fa92e34f3f1d39558d7c6d86136477b223244dcc 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -412,6 +412,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -413,6 +413,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #elif !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch index 8a115c6db22a..97c0159b0763 100644 --- a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch +++ b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/new_tab_button.h b/chrome/browser/ui/views/tabs/new_tab_button.h -index 7c2a308b7be819c5073a212dca45f537c359164b..b6dde7c8475860c78d61851b57e56d3494e14247 100644 +index e5617ec47973d9007c496c3fe2da584f61801dd0..dd93b07c3b459128800559e4a7453e8150169c40 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.h +++ b/chrome/browser/ui/views/tabs/new_tab_button.h @@ -48,6 +48,7 @@ class NewTabButton : public views::ImageButton, diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index 856856aec5b6..84a0c86b3231 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index 579a5c2301eb675124e3309487ac924d9e5bf2e0..0f3119efafcd63275fcb554a9433e022a9d4ccb8 100644 +index fe22bf7428a51e39bb273282b5afc40f2e293748..b0e4999cf661ef3c51a5f09e4db34a429fc9be07 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -390,6 +390,7 @@ void Tab::Layout() { @@ -10,7 +10,7 @@ index 579a5c2301eb675124e3309487ac924d9e5bf2e0..0f3119efafcd63275fcb554a9433e022 } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -1012,6 +1013,7 @@ void Tab::UpdateIconVisibility() { +@@ -1010,6 +1011,7 @@ void Tab::UpdateIconVisibility() { available_width -= favicon_width; showing_close_button_ = large_enough_for_close_button; diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index 3eb92b990cba..a414f061b49b 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index c6390ac4f135445d324ff5f6dc6de8c2378e8daa..c1951064dd380085388df5df5ab8a8f6bb6d14e5 100644 +index 0a9ffa81d06d4bb284e8aa51758fbafc9e1b6644..65733ea97581eec15cfb116a5eb5d2d3f2ccb5d6 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -495,6 +495,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 898b551bbbd5..1628a135bc66 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 3d08b706ec4a05412ecda8fb7226c70881d353bb..92a5ef9d596f762ac464995c726bfc3bad38d26e 100644 +index a800280bc057b11d8ebe9dc91ab6ac6c1fd2db01..a5f5f8a0c4366b92ec7e7575f41d4801678ca22c 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -575,7 +575,7 @@ void ChromeContentRendererClient::RenderFrameCreated( diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 1429fbd91ae0..1ede8757510d 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 10e69466b090340236966c0be9c6e261f9cd232b..0a55b30c2d6fdbf25e4ea69bc9552bb67f581aad 100644 +index 628af219b64dc8d84438abc758f920402b690a76..562654dba46fa6b208990fea68157aeed934e611 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -327,6 +327,7 @@ static_library("test_support") { diff --git a/patches/components-sync-BUILD.gn.patch b/patches/components-sync-BUILD.gn.patch index a03b0972a79b..f8fa210063e9 100644 --- a/patches/components-sync-BUILD.gn.patch +++ b/patches/components-sync-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn -index aa8ab6f262c519dd22c537d682e46b6f862db113..d0086f77968d8d49cce77dbcbd941a3b03476eb2 100644 +index eb8b313ed8c20891d5e8e1ef5bb801f49b3c47c3..bb9551017d867c3fde612bb4b8276bbb79061655 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn @@ -19,6 +19,7 @@ group("sync") { diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index 8a2cdb74f038..e86e81f909c9 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index c000df9b76ed47bc4a172802562f39eb7dfba90b..17044fb3206f4b4981aa3a4d520c493bc9436db8 100644 +index 4ca1af8af6686efe3bfb5cd855dd9ab57324d2bc..2663eb2c84d76a83a931031606a3f13b2307fede 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -209,6 +209,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -210,6 +210,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { prefs::kAutofillBrandingIconAnimationRemainingCountPrefName, 2); registry->RegisterDictionaryPref(kLocalConsentsDictionary); @@ -10,7 +10,7 @@ index c000df9b76ed47bc4a172802562f39eb7dfba90b..17044fb3206f4b4981aa3a4d520c493b } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -339,6 +340,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -340,6 +341,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { base::to_underlying( prerender_prefs::NetworkPredictionSetting::kEnabledWifiOnly), user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); @@ -18,7 +18,7 @@ index c000df9b76ed47bc4a172802562f39eb7dfba90b..17044fb3206f4b4981aa3a4d520c493b } // This method should be periodically pruned of year+ old migrations. -@@ -404,4 +406,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { +@@ -405,4 +407,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { // Added 12/2022. prefs->ClearPref(reading_list::prefs::kDeprecatedReadingListHasUnseenEntries); diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index 9696341430a2..3888eacabfa3 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index 059cce8d44b076a926dc95932db4875727133657..16f4f02bb911c4697ee3d9c0fc24f6a4becac145 100644 +index 1077e9f28956c278a6a3ccc946cd26f8e79aa9cf..cd6a14913960eb14a873436d4019f275d5178146 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -382,6 +382,7 @@ TransportSecurityState::TransportSecurityState( diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index 6751fb60fa10..cfa3097c30c8 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -index e46a8fcb3057b9349720e259e29742f090c22d3a..ca8abeb2882dff5f8f2bce6ff9cc170202b2e9fe 100644 +index 020b4d97ec280fadd9a4280f840aeee8f144c96d..a27a01ec1578c960607ef7f20098d514d6fa6bc5 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -934,6 +934,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -931,6 +931,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); From d9c6e5160f7e8d91fa572fe342549561d218fdcc Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 18 Jan 2023 15:36:29 +0000 Subject: [PATCH 136/146] Updated strings for Chromium 110.0.5481.38. --- app/generated_resources.grd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/generated_resources.grd b/app/generated_resources.grd index f592c358526c..3686da068f29 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -2077,10 +2077,10 @@ are declared in tools/grit/grit_rule.gni. Downloading $152.7 MB, $2somedocument.pdf - Downloading, $133% remaining + Downloading $1somedocument.pdf, $233% remaining - Downloading, $142 mins left + Downloading $1somedocument.pdf, $242 mins left Download unsuccessful: $1somedocument.pdf From b60c23a5cf7b2d60576842a6fb753308f20eb30d Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 19 Jan 2023 07:35:45 +0000 Subject: [PATCH 137/146] Update from Chromium 110.0.5481.38 to Chromium 110.0.5481.40. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 926b653d8b80..e9c52933fdc3 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5481.38", + "tag": "110.0.5481.40", "repository": { "url": "https://github.com/chromium/chromium" } From 186f0050fd5dfd52373d8d1d8113e1e42bed7c14 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 19 Jan 2023 07:44:45 +0000 Subject: [PATCH 138/146] Conflict-resolved patches from Chromium 110.0.5481.38 to Chromium 110.0.5481.40. --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index eea789a48474..6c1d78648c42 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index c2862f8efb98e3bdfa45d25cb7881198679f6d4d..c4ddd5c828f3c83223c2c03781700725d82ba3f6 100644 +index 5b6688655d8539d49a0d017fce9cb5721e7eca32..d46b28a24c2f9544dc19730f68674d24951d2881 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5481 --PATCH=38 +-PATCH=40 +MINOR=1 +BUILD=49 +PATCH=59 From 16ba66b6f62b9429642c33ffbeb1490db453ba98 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 24 Jan 2023 14:35:02 -0500 Subject: [PATCH 139/146] No longer need to rewrite manifest file for IPFS companion extensions --- .../extensions/browser/sandboxed_unpacker.cc | 48 ------------------- .../browser/sandboxed_unpacker_unittest.cc | 37 -------------- ...nsions-browser-sandboxed_unpacker.cc.patch | 12 ----- test/BUILD.gn | 1 - 4 files changed, 98 deletions(-) delete mode 100644 chromium_src/extensions/browser/sandboxed_unpacker.cc delete mode 100644 chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc delete mode 100644 patches/extensions-browser-sandboxed_unpacker.cc.patch diff --git a/chromium_src/extensions/browser/sandboxed_unpacker.cc b/chromium_src/extensions/browser/sandboxed_unpacker.cc deleted file mode 100644 index ac5d4ef420c7..000000000000 --- a/chromium_src/extensions/browser/sandboxed_unpacker.cc +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include - -#include "base/values.h" -#include "base/json/json_reader.h" -#include "extensions/common/constants.h" - -namespace brave { - -bool BraveRewriteManifest(const std::string& extension_id, - base::Value::Dict* manifest) { - if (extension_id == ipfs_companion_extension_id || - extension_id == ipfs_companion_beta_extension_id) { - // Set appropriate sockets permissions for IPFS Companion - // extensions - std::string json = R"( - { - "udp": { - "send": "*", - "bind": "*" - }, - "tcp": { - "connect": "*" - }, - "tcpServer": { - "listen": "*:*" - } - } - )"; - - base::Value sockets = base::JSONReader::Read(json).value(); - manifest->Set("sockets", std::move(sockets)); - return true; - } - return false; -} - -} // namespace brave - -#define BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE \ - brave::BraveRewriteManifest(extension_id_, &final_manifest); - -#include "src/extensions/browser/sandboxed_unpacker.cc" -#undef BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE diff --git a/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc b/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc deleted file mode 100644 index 3880b08dc9ab..000000000000 --- a/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "base/values.h" -#include "extensions/common/constants.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace brave { -bool BraveRewriteManifest(const std::string& extension_id, - base::Value::Dict* manifest); -} - -TEST(BraveSandboxedUnpacker, DoesNotRewriteForDifferentExtension) { - base::Value::Dict manifest; - ASSERT_FALSE( - brave::BraveRewriteManifest("fffkpbalmllkdoenhmdmpbkajipdjfam", - &manifest)); -} - -TEST(BraveSandboxedUnpacker, RewriteForIPFSEExtension) { - // I would have liked to use SandboxedUnpacker here directly instead of - // brave::BraveRewriteManifest instead. But it would have required - // more patching for making that function protected or else more - // time than I am willing to spend otherwise. - base::Value::Dict manifest1; - ASSERT_TRUE( - brave::BraveRewriteManifest(ipfs_companion_extension_id, - &manifest1)); - ASSERT_TRUE(manifest1.Find("sockets")); - base::Value::Dict manifest2; - ASSERT_TRUE( - brave::BraveRewriteManifest(ipfs_companion_beta_extension_id, - &manifest2)); - ASSERT_TRUE(manifest2.Find("sockets")); -} diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch deleted file mode 100644 index 77a81b2233b3..000000000000 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index e478f9fbd15bf56d492f30615ceac7dd2b061858..50adff525284463d51252f5ab692f2464b2f9f85 100644 ---- a/extensions/browser/sandboxed_unpacker.cc -+++ b/extensions/browser/sandboxed_unpacker.cc -@@ -1044,6 +1044,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( - DCHECK(!public_key_.empty()); - base::Value::Dict final_manifest = manifest.Clone(); - final_manifest.Set(manifest_keys::kPublicKey, public_key_); -+ BRAVE_SANDBOXEDUNPACKER_REWRITEMANIFESTFILE - - { - std::string differential_fingerprint; diff --git a/test/BUILD.gn b/test/BUILD.gn index 9847b262ec3c..f986ad1f1b9c 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -478,7 +478,6 @@ test("brave_unit_tests") { "//brave/browser/extensions/chrome_content_verifier_delegate_unittest.cc", "//brave/browser/extensions/install_verifier_unittest.cc", "//brave/browser/extensions/mv2_warning_unittest.cc", - "//brave/chromium_src/extensions/browser/sandboxed_unpacker_unittest.cc", "//brave/common/importer/chrome_importer_utils_unittest.cc", "//chrome/browser/extensions/extension_service_test_base.cc", "//chrome/browser/extensions/extension_service_test_base.h", From f357ce8df2c8b3b04adfc449b685df6ef8e6a68a Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Tue, 24 Jan 2023 17:53:31 -0500 Subject: [PATCH 140/146] [Android] Replace org.chromium.base.Consumer with Java's Chromium change: https://github.com/chromium/chromium/commit/b1683dcebbe4a7f2fafa18d3a6fcf85cd5f84832 Replace org.chromium.base.Consumer with Java's (except in chromecast/) No behavior is changed. Most changes are trivial automated replacement of the imports. This was unblocked by the default min SDK being bumped to 24 in crrev.com/c/4000311. The corresponding bump in chromecast/ (crrev.com/c/3928245) needs more time to stick for sure, so org.chromium.base.Consumer is moved to org.chromium.chromecast.base.* for the moment. Bug: 1034012 --- .../QuickActionSearchAndBookmarkWidgetProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java index d99b19326b84..168bd29cabdc 100644 --- a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java +++ b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java @@ -29,7 +29,6 @@ import org.json.JSONException; import org.json.JSONObject; -import org.chromium.base.Consumer; import org.chromium.base.ContextUtils; import org.chromium.base.IntentUtils; import org.chromium.chrome.R; @@ -61,6 +60,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.function.Consumer; public class QuickActionSearchAndBookmarkWidgetProvider extends AppWidgetProvider { static class QuickActionSearchAndBookmarkWidgetProviderDelegate From deaf06f2ad49d782596e0019dfc4d7d77a12b939 Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Wed, 25 Jan 2023 11:50:11 -0500 Subject: [PATCH 141/146] [iOS] Setup default value for ledger wallet provider regions pref --- ios/browser/api/ledger/brave_ledger.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ios/browser/api/ledger/brave_ledger.mm b/ios/browser/api/ledger/brave_ledger.mm index 63ed0e0c679c..5635a0f3a45a 100644 --- a/ios/browser/api/ledger/brave_ledger.mm +++ b/ios/browser/api/ledger/brave_ledger.mm @@ -167,6 +167,10 @@ - (instancetype)initWithStateStoragePath:(NSString*)path { [self savePrefs]; } + if (!self.prefs[@"parameters.wallet_provider_regions"]) { + self.prefs[@"parameters.wallet_provider_regions"] = @{}; + } + [self handleFlags:brave_rewards::RewardsFlags::ForCurrentProcess()]; databaseQueue = base::ThreadPool::CreateSequencedTaskRunner( From 04b1d4403d0ed43d1b07b68e3eec84d80a3b8c32 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 25 Jan 2023 10:43:56 -0500 Subject: [PATCH 142/146] Update from Chromium 110.0.5481.40 to Chromium 110.0.5481.52 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9c52933fdc3..e77ecef4038f 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "110.0.5481.40", + "tag": "110.0.5481.52", "repository": { "url": "https://github.com/chromium/chromium" } From df16e27046cb6ed7e72f05f8bd3b3fcabafc51e6 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 25 Jan 2023 10:52:49 -0500 Subject: [PATCH 143/146] Conflict-resolved patches from Chromium 110.0.5481.40 to Chromium 110.0.5481.52 --- patches/chrome-VERSION.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 6c1d78648c42..3a8562019c1d 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 5b6688655d8539d49a0d017fce9cb5721e7eca32..d46b28a24c2f9544dc19730f68674d24951d2881 100644 +index bf37e2b96898513236ea695cec7919abf2702693..e7b38476153388d44d48b20eb488ab55ea33d1ac 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=110 -MINOR=0 -BUILD=5481 --PATCH=40 +-PATCH=52 +MINOR=1 +BUILD=49 +PATCH=59 From b0f4ebcf89528b58dda274b603a229bbf4373cc5 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Wed, 25 Jan 2023 10:59:09 -0500 Subject: [PATCH 144/146] Update patches from Chromium 110.0.5481.40 to Chromium 110.0.5481.52 --- patches/build-config-android-internal_rules.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 2 +- patches/chrome-android-BUILD.gn.patch | 2 +- .../components-crash-core-browser-resources-crashes.ts.patch | 2 +- patches/services-network-cookie_manager.cc.patch | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 256d13ca8451..cfc2031dafd9 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 0fa567baa1a24e6a2441a8fc8fb403c059b66367..99bd0851e1f197b87bb15ac5048676264c4c156f 100644 +index 31c20f12a1e103578fda11dac09ca73185aedd89..ff3d633ca3fa2f271d1033c11ae36d1cea0465ed 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -3799,6 +3799,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 684c7fdfadb0..b339958ddef2 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index e548492f82e2fb62d204bc47ef9f13f9c0459cd5..c67aae9012303345129e24b040409dccfe9457cf 100644 +index 7ddc160f973ef22696ccdc63b57272e46dadb96f..df3c3a0b33365f559e85332b0529fa666abfb5fc 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -574,6 +574,7 @@ if (enable_java_templates && is_android) { diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index a3c44b8ebfeb..161f1333c28d 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index f3926b696ca0fb349a00ebf0f262532af8e1d1f3..457a9bd2b112e8edaf3c4806b1c051e5b50d328f 100644 +index bf0643229638ab80fc03bee2a5af2b6454b96328..4a3048ac8825d6cc54483ab8edcdec22a5427e10 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -239,6 +239,7 @@ if (current_toolchain == default_toolchain) { diff --git a/patches/components-crash-core-browser-resources-crashes.ts.patch b/patches/components-crash-core-browser-resources-crashes.ts.patch index 17eca49e2088..e17e5a3f6e94 100644 --- a/patches/components-crash-core-browser-resources-crashes.ts.patch +++ b/patches/components-crash-core-browser-resources-crashes.ts.patch @@ -1,5 +1,5 @@ diff --git a/components/crash/core/browser/resources/crashes.ts b/components/crash/core/browser/resources/crashes.ts -index 591214145a8025abfa7a6478851f935530148521..14f6e897b6cc8477e2e4290b9a64405f88364bb4 100644 +index 591214145a8025abfa7a6478851f935530148521..7c99c663a630f7e6d82f0191efcc9f22663a3042 100644 --- a/components/crash/core/browser/resources/crashes.ts +++ b/components/crash/core/browser/resources/crashes.ts @@ -141,7 +141,7 @@ function updateCrashList({ diff --git a/patches/services-network-cookie_manager.cc.patch b/patches/services-network-cookie_manager.cc.patch index 401ee07253ca..ae55ba6c0ea2 100644 --- a/patches/services-network-cookie_manager.cc.patch +++ b/patches/services-network-cookie_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/cookie_manager.cc b/services/network/cookie_manager.cc -index 9da2056ddd3cff1c3b5ece77e9654bef1d2a40f1..b0314a9a5825f2e4d4b9dad5cb4d4fc2a7ff0b40 100644 +index 120f304fc27dbe0bcd9a78d3274f533503c2cd66..404622d0de025f7fb89441a344138d272a9ac5da 100644 --- a/services/network/cookie_manager.cc +++ b/services/network/cookie_manager.cc @@ -350,6 +350,7 @@ CookieDeletionInfo DeletionFilterToInfo(mojom::CookieDeletionFilterPtr filter) { From e75d77d0a32b993e9f8c0fa8923ef7db54113c11 Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 25 Jan 2023 11:17:34 -0500 Subject: [PATCH 145/146] Allow iOS to write to the tabs property --- ios/browser/api/opentabs/brave_opentabs_api.h | 2 +- ios/browser/api/opentabs/brave_opentabs_api.mm | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ios/browser/api/opentabs/brave_opentabs_api.h b/ios/browser/api/opentabs/brave_opentabs_api.h index 3de77150603c..be3e83c86233 100644 --- a/ios/browser/api/opentabs/brave_opentabs_api.h +++ b/ios/browser/api/opentabs/brave_opentabs_api.h @@ -52,7 +52,7 @@ OBJC_EXPORT @property(nonatomic, copy) NSString* sessionTag; @property(nonatomic, nullable, copy) NSDate* modifiedTime; @property(nonatomic) SyncDeviceFormFactor deviceFormFactor; -@property(nonatomic, strong, readonly) NSArray* tabs; +@property(nonatomic, strong) NSArray* tabs; /// Open Tab Constructor used with OpenTabSessionAPI /// @param name - This is the name of the device for the distant session diff --git a/ios/browser/api/opentabs/brave_opentabs_api.mm b/ios/browser/api/opentabs/brave_opentabs_api.mm index 3db7347b5227..c8c4f51cb16b 100644 --- a/ios/browser/api/opentabs/brave_opentabs_api.mm +++ b/ios/browser/api/opentabs/brave_opentabs_api.mm @@ -73,10 +73,6 @@ - (void)updateOpenDistantTab:(NSURL*)url title:(NSString*)title { #pragma mark - IOSOpenDistantSession -@interface IOSOpenDistantSession () -@property(nonatomic, strong) NSArray* tabs; -@end - @implementation IOSOpenDistantSession - (instancetype)initWithName:(nullable NSString*)name From 68ab8fbd26a5cc6009fd51eaa86fdc3059aa7f40 Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Wed, 25 Jan 2023 13:07:24 -0500 Subject: [PATCH 146/146] [iOS] Fix fetching synced sessions --- ios/browser/api/opentabs/brave_opentabs_api.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/browser/api/opentabs/brave_opentabs_api.mm b/ios/browser/api/opentabs/brave_opentabs_api.mm index c8c4f51cb16b..a2c08c6179e1 100644 --- a/ios/browser/api/opentabs/brave_opentabs_api.mm +++ b/ios/browser/api/opentabs/brave_opentabs_api.mm @@ -221,7 +221,7 @@ - (void)removeObserver:(id)observer { } // Don't display sessions with no tabs. - if (![distant_session.tabs count]) { + if ([distant_session.tabs count] > 0) { [sessions_list addObject:distant_session]; } }