diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 31f8295fae7..0605a97eefa 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 723f40c2d26..9e4a98cba6e 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 99a84a043eb..1801e8b205b 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 40a09591686..de02a3ed98b 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 618afbccf3c..f7ab52dc8d9 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 }