sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/chromium: update to 125.0.6422.76 and implement selectable audio backend support

Browse source 
with these changes, chromium now automatically selects which
audio backend to use in the following order:

pulse (if running) -> sndio -> alsa -> fake

an additional command line option has been also implemented so
that the user can force which backend to use:

--audio-backend={auto,sndio,pulse,alsa}

Security:	https://vuxml.freebsd.org/freebsd/8247af0d-183b-11ef-9f97-a8a1599412c6.html
PR:		246449
This commit is contained in:
Robert Nagy 2024-05-22 13:21:19 +02:00
parent 7cf9cbe6d5
commit 6acad34cb2
350 changed files with 1736 additions and 1693 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
www/chromium/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= chromium PORTNAME= chromium
PORTVERSION= 124.0.6367.207 PORTVERSION= 125.0.6422.76
CATEGORIES= www wayland CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external https://nerd.hu/distfiles/:external
@ -34,8 +34,10 @@ BUILD_DEPENDS= bash:shells/bash \
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
libatspi.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \
libspeechd.so:accessibility/speech-dispatcher \ libspeechd.so:accessibility/speech-dispatcher \
libasound.so:audio/alsa-lib \
libFLAC.so:audio/flac \ libFLAC.so:audio/flac \
libopus.so:audio/opus \ libopus.so:audio/opus \
libsndio.so:audio/sndio \
libspeex.so:audio/speex \ libspeex.so:audio/speex \
libdbus-1.so:devel/dbus \ libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \ libdbus-glib-1.so:devel/dbus-glib \
@ -126,6 +128,11 @@ GN_ARGS+= clang_use_chrome_plugins=false \
extra_ldflags="${LDFLAGS}" \ extra_ldflags="${LDFLAGS}" \
ffmpeg_branding="${FFMPEG_BRAND}" ffmpeg_branding="${FFMPEG_BRAND}"
# Audio backends
GN_ARGS+= use_alsa=true \
use_pulseaudio=true \
use_sndio=true
# TODO: investigate building with these options: # TODO: investigate building with these options:
# use_system_minigbm # use_system_minigbm
GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles
@ -140,10 +147,8 @@ SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}" SUB_LIST+= COMMENT="${COMMENT}"
OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE
OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
OPTIONS_RADIO= KERBEROS OPTIONS_RADIO= KERBEROS
OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT
OPTIONS_SUB= yes OPTIONS_SUB= yes
@ -153,12 +158,6 @@ HEIMDAL_BASE_DESC= Heimdal Kerberos (base)
HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal)
MIT_DESC= MIT Kerberos (security/krb5) MIT_DESC= MIT Kerberos (security/krb5)
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
alsa-lib>=1.1.1_1:audio/alsa-lib
ALSA_VARS= GN_ARGS+=use_alsa=true
ALSA_VARS_OFF= GN_ARGS+=use_alsa=false
CODECS_VARS= GN_ARGS+=proprietary_codecs=true \ CODECS_VARS= GN_ARGS+=proprietary_codecs=true \
FFMPEG_BRAND="Chrome" FFMPEG_BRAND="Chrome"
CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \
@ -202,18 +201,6 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \
PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \
GN_ARGS+=rtc_link_pipewire=false GN_ARGS+=rtc_link_pipewire=false
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
# With SNDIO=on we exclude audio_manager_linux from the build (see
# media/audio/BUILD.gn) and use audio_manager_openbsd which does not
# support falling back to ALSA or PulseAudio.
SNDIO_PREVENTS= ALSA PULSEAUDIO
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content
WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm
@ -229,8 +216,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif .endif
.if ${COMPILER_VERSION} < 170 .if ${COMPILER_VERSION} < 180
LLVM_DEFAULT= 17 LLVM_DEFAULT= 18
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@ -258,7 +245,7 @@ PLIST_SUB+= NOT_AARCH64=""
FFMPEG_TARGET= ia32 FFMPEG_TARGET= ia32
.endif .endif
FFMPEG_BDIR= ${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND} FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET} FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
# Allow relocations against read-only segments (override lld default) # Allow relocations against read-only segments (override lld default)
@ -296,8 +283,8 @@ pre-configure:
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus || ${FALSE} libusb libwebp libxml libxslt openh264 opus || ${FALSE}
# Chromium uses an unreleased version of FFmpeg, so configure it # Chromium uses an unreleased version of FFmpeg, so configure it
cd ${WRKSRC}/third_party/ffmpeg && \ cd ${WRKSRC}/media/ffmpeg && \
${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \ ${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
--config-only --branding=${FFMPEG_BRAND} --config-only --branding=${FFMPEG_BRAND}
cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
${MKDIR} ${FFMPEG_CDIR} ${MKDIR} ${FFMPEG_CDIR}

14
www/chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1715673268 TIMESTAMP = 1716384244
SHA256 (chromium-124.0.6367.207.tar.xz) = 6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5 SHA256 (chromium-125.0.6422.76.tar.xz) = 4167218463d2848f4a0fe35f60d062a8e7e5c7ce5bc8c8c2260a80186b1deccf
SIZE (chromium-124.0.6367.207.tar.xz) = 3450794132 SIZE (chromium-125.0.6422.76.tar.xz) = 3460108576
SHA256 (chrome-linux-124.0.6367.207-llvm17.profdata.tar.xz) = 43953cf8958c1f8d6b700635a4d209fe27ea4487e26ac12bc5f2ee56c28cb0c5 SHA256 (chrome-linux-125.0.6422.76-llvm17.profdata.tar.xz) = 1deb7a9fe593b338629a97630e96716d968882d272998aa87f39f3f1a81df0e9
SIZE (chrome-linux-124.0.6367.207-llvm17.profdata.tar.xz) = 30059564 SIZE (chrome-linux-125.0.6422.76-llvm17.profdata.tar.xz) = 30245500
SHA256 (chromium-124.0.6367.207-testdata.tar.xz) = d30386a73719a64fdd191f7b51709185e4d3fc49888b04a390506d4370e69b06 SHA256 (chromium-125.0.6422.76-testdata.tar.xz) = ec7a7743180fd986c37913032074bd2a14b3bb40fb79927db94fab97aba26a77
SIZE (chromium-124.0.6367.207-testdata.tar.xz) = 277899644 SIZE (chromium-125.0.6422.76-testdata.tar.xz) = 277440240
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

20
www/chromium/files/patch-BUILD.gn
View file

@ -1,6 +1,6 @@
--- BUILD.gn.orig 2024-04-19 13:02:56 UTC --- BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ BUILD.gn +++ BUILD.gn
@@ -64,7 +64,7 @@ declare_args() { @@ -65,7 +65,7 @@ declare_args() {
root_extra_deps = [] root_extra_deps = []
} }
@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times) # An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work. # build doesn't make sense and usually doesn't work.
assert(!is_component_build) assert(!is_component_build)
@@ -96,7 +96,6 @@ group("gn_all") { @@ -97,7 +97,6 @@ group("gn_all") {
"//codelabs", "//codelabs",
"//components:components_unittests", "//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests", "//components/gwp_asan:gwp_asan_unittests",
@ -17,7 +17,7 @@
"//net:net_unittests", "//net:net_unittests",
"//sandbox:sandbox_unittests", "//sandbox:sandbox_unittests",
"//services:services_unittests", "//services:services_unittests",
@@ -427,7 +426,7 @@ group("gn_all") { @@ -428,7 +427,7 @@ group("gn_all") {
} }
} }
@ -26,7 +26,7 @@
deps += [ deps += [
"//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump", "//third_party/breakpad:core-2-minidump",
@@ -627,6 +626,15 @@ group("gn_all") { @@ -624,6 +623,15 @@ group("gn_all") {
} }
} }
@ -42,7 +42,7 @@
if (is_mac) { if (is_mac) {
deps += [ deps += [
"//third_party/breakpad:dump_syms", "//third_party/breakpad:dump_syms",
@@ -673,7 +681,7 @@ group("gn_all") { @@ -670,7 +678,7 @@ group("gn_all") {
host_os == "win") { host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
} }
@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
} }
@@ -1094,7 +1102,7 @@ if (use_blink && !is_cronet_build) { @@ -1090,7 +1098,7 @@ if (use_blink && !is_cronet_build) {
] ]
} }
@ -60,7 +60,7 @@
script_test("chrome_wpt_tests") { script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py" script = "//third_party/blink/tools/run_wpt_tests.py"
args = [ args = [
@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) { @@ -1183,7 +1191,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
} }
@ -69,7 +69,7 @@
data_deps += data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
} }
@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) { @@ -1192,7 +1200,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
} }
@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
} }
@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { @@ -1652,7 +1660,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ] data_deps += [ "//chrome/test:performance_browser_tests" ]
} }

22
www/chromium/files/patch-base_BUILD.gn
View file

@ -1,4 +1,4 @@
--- base/BUILD.gn.orig 2024-04-19 13:02:56 UTC --- base/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ base/BUILD.gn +++ base/BUILD.gn
@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") { @@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ] flags = [ "CRONET_BUILD=$is_cronet_build" ]
@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") { buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h" header = "message_pump_buildflags.h"
header_dir = "base/message_loop" header_dir = "base/message_loop"
@@ -1131,11 +1131,23 @@ component("base") { @@ -1141,11 +1141,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if # Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a # building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this. # more robust check for this.
@ -34,7 +34,7 @@
if (use_allocator_shim) { if (use_allocator_shim) {
if (is_apple) { if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ] sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1155,7 +1167,7 @@ component("base") { @@ -1165,7 +1177,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8 # Allow more direct string conversions on platforms with native utf8
# strings # strings
@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ] defines += [ "SYSTEM_NATIVE_UTF8" ]
} }
@@ -2113,6 +2125,22 @@ component("base") { @@ -2125,6 +2137,22 @@ component("base") {
] ]
} }
@ -66,7 +66,7 @@
# iOS # iOS
if (is_ios) { if (is_ios) {
sources += [ sources += [
@@ -2249,6 +2277,33 @@ component("base") { @@ -2270,6 +2298,33 @@ component("base") {
} }
} }
@ -100,7 +100,7 @@
if (use_blink) { if (use_blink) {
sources += [ sources += [
"files/file_path_watcher.cc", "files/file_path_watcher.cc",
@@ -2259,7 +2314,7 @@ component("base") { @@ -2280,7 +2335,7 @@ component("base") {
} }
if (dep_libevent) { if (dep_libevent) {
@ -109,7 +109,7 @@
} }
if (use_libevent) { if (use_libevent) {
@@ -3072,7 +3127,7 @@ if (is_apple) { @@ -3093,7 +3148,7 @@ if (is_apple) {
} }
} }
@ -118,7 +118,7 @@
# This test must compile with -fstack-protector-all # This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") { source_set("stack_canary_linux_unittests") {
testonly = true testonly = true
@@ -3716,7 +3771,7 @@ test("base_unittests") { @@ -3745,7 +3800,7 @@ test("base_unittests") {
] ]
} }
@ -127,7 +127,7 @@
sources += [ sources += [
"debug/proc_maps_linux_unittest.cc", "debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc", "files/scoped_file_linux_unittest.cc",
@@ -3743,7 +3798,7 @@ test("base_unittests") { @@ -3772,7 +3827,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc", "posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc", "posix/unix_domain_socket_unittest.cc",
] ]
@ -136,7 +136,7 @@
sources += [ sources += [
"profiler/stack_base_address_posix_unittest.cc", "profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc", "profiler/stack_copier_signal_unittest.cc",
@@ -3754,7 +3809,7 @@ test("base_unittests") { @@ -3783,7 +3838,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8 # Allow more direct string conversions on platforms with native utf8
# strings # strings
@ -145,7 +145,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ] defines += [ "SYSTEM_NATIVE_UTF8" ]
} }
@@ -4022,7 +4077,7 @@ test("base_unittests") { @@ -4051,7 +4106,7 @@ test("base_unittests") {
} }
} }

4
www/chromium/files/patch-base_allocator_dispatcher_tls.h
View file

@ -1,6 +1,6 @@
--- base/allocator/dispatcher/tls.h.orig 2024-04-19 13:02:56 UTC --- base/allocator/dispatcher/tls.h.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/dispatcher/tls.h +++ base/allocator/dispatcher/tls.h
@@ -76,7 +76,7 @@ struct BASE_EXPORT MMapAllocator { @@ -77,7 +77,7 @@ struct BASE_EXPORT MMapAllocator {
constexpr static size_t AllocationChunkSize = 16384; constexpr static size_t AllocationChunkSize = 16384;
#elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS) #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
constexpr static size_t AllocationChunkSize = 16384; constexpr static size_t AllocationChunkSize = 16384;

4
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-04-19 13:02:56 UTC --- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni +++ base/allocator/partition_allocator/partition_alloc.gni
@@ -33,7 +33,7 @@ if (is_nacl) { @@ -33,7 +33,7 @@ if (is_nacl) {
use_large_empty_slot_span_ring = is_mac use_large_empty_slot_span_ring = is_mac
@ -9,7 +9,7 @@
declare_args() { declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually, # Causes all the allocations to be routed via allocator_shim.cc. Usually,
@@ -351,7 +351,7 @@ declare_args() { @@ -354,7 +354,7 @@ declare_args() {
# dependencies that use partition_allocator are compiled in AOSP against a # dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers. # version of glibc that does not include pkeys syscall numbers.
enable_pkeys = enable_pkeys =

4
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-04-19 13:02:56 UTC --- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -851,7 +851,7 @@ if (is_clang_or_gcc) { @@ -850,7 +850,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ] configs -= [ "//build/config/compiler:enable_arc" ]
} }
} }

10
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-04-19 13:02:56 UTC --- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@ -9,12 +9,12 @@
// We shouldn't allocate system pages at all for sanitizer builds. However, // We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges // we do, and if random hint addresses interfere with address ranges
@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { @@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) {
return AslrAddress(0x20000000ULL); return AslrAddress(0x20000000ULL);
} }
#elif defined(ARCH_CPU_ARM64)
- #elif BUILDFLAG(IS_LINUX) - #if BUILDFLAG(IS_LINUX)
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
// page size and number of levels of translation pages used. We use // page size and number of levels of translation pages used. We use

6
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-04-19 13:02:56 UTC --- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false; @@ -231,7 +231,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after. // On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future. // This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \ #define PA_CONFIG_HAS_ATFORK_HANDLER() \
@ -9,7 +9,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork. // PartitionRoots at BeforeFork and to release at AfterFork.
@@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false; @@ -278,7 +278,7 @@ constexpr bool kUseLazyCommit = false;
// //
// Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
// to larger slot spans. // to larger slot spans.

4
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-04-19 13:02:56 UTC --- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
@@ -313,7 +313,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; @@ -316,7 +316,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools). // 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS) #if BUILDFLAG(HAS_64_BIT_POINTERS)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \

8
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-19 13:02:56 UTC --- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -47,7 +47,7 @@ @@ -48,7 +48,7 @@
#include "wow64apiset.h" #include "wow64apiset.h"
#endif #endif
@ -9,7 +9,7 @@
#include <pthread.h> #include <pthread.h>
#endif #endif
@@ -279,7 +279,7 @@ void PartitionAllocMallocInitOnce() { @@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
return; return;
} }
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the // When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is // child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock. // called, we have a deadlock.
@@ -950,7 +950,7 @@ void PartitionRoot::Init(PartitionOptions opts) { @@ -954,7 +954,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes. // apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14))); (internal::SystemPageSize() == (size_t{1} << 14)));

4
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc → www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
View file

@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc.orig 2023-12-10 06:10:27 UTC --- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc +++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc
@@ -18,6 +18,10 @@ @@ -18,6 +18,10 @@
#include <pthread.h> #include <pthread.h>
#endif #endif

18
www/chromium/files/patch-base_debug_stack__trace.cc
View file

@ -1,6 +1,6 @@
--- base/debug/stack_trace.cc.orig 2024-04-19 13:02:56 UTC --- base/debug/stack_trace.cc.orig 2024-05-21 18:07:39 UTC
+++ base/debug/stack_trace.cc +++ base/debug/stack_trace.cc
@@ -247,7 +247,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { @@ -249,7 +249,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
// Symbols are not expected to be reliable when gn args specifies // Symbols are not expected to be reliable when gn args specifies
// symbol_level=0. // symbol_level=0.
return false; return false;
@ -9,16 +9,16 @@
// StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
// See https://crbug.com/706728 // See https://crbug.com/706728
return false; return false;
@@ -291,7 +291,7 @@ std::string StackTrace::ToString() const { @@ -311,7 +311,7 @@ std::string StackTrace::ToString() const {
}
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
std::stringstream stream; std::stringstream stream;
-#if !defined(__UCLIBC__) && !defined(_AIX) -#if !defined(__UCLIBC__) && !defined(_AIX)
+#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) +#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
if (ShouldSuppressOutput()) { OutputToStreamWithPrefix(&stream, prefix_string);
return "Backtrace suppressed."; #endif
} return stream.str();
@@ -301,7 +301,7 @@ std::string StackTrace::ToStringWithPrefix(const char* @@ -335,7 +335,7 @@ bool StackTrace::ShouldSuppressOutput() {
} }
std::ostream& operator<<(std::ostream& os, const StackTrace& s) { std::ostream& operator<<(std::ostream& os, const StackTrace& s) {

20
www/chromium/files/patch-base_features.cc Normal file
View file

@ -0,0 +1,20 @@
--- base/features.cc.orig 2024-05-21 18:07:39 UTC
+++ base/features.cc
@@ -9,7 +9,7 @@
#include "base/threading/platform_thread.h"
#include "build/buildflag.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "base/message_loop/message_pump_libevent.h"
#endif
@@ -98,7 +98,7 @@ void Init(EmitThreadControllerProfilerMetadata
sequence_manager::internal::ThreadController::InitializeFeatures(
emit_thread_controller_profiler_metadata);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
MessagePumpLibevent::InitializeFeatures();
#endif

4
www/chromium/files/patch-base_files_file__util__posix.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig 2024-04-19 13:02:56 UTC --- base/files/file_util_posix.cc.orig 2024-05-21 18:07:39 UTC
+++ base/files/file_util_posix.cc +++ base/files/file_util_posix.cc
@@ -816,33 +816,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p @@ -810,33 +810,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) { File::Error* error) {
ScopedBlockingCall scoped_blocking_call( ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().

6
www/chromium/files/patch-base_files_file__util__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2024-04-19 13:02:56 UTC --- base/files/file_util_unittest.cc.orig 2024-05-21 18:07:39 UTC
+++ base/files/file_util_unittest.cc +++ base/files/file_util_unittest.cc
@@ -3870,7 +3870,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { @@ -3772,7 +3772,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
} }
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo"); FilePath file_path("/proc/cpuinfo");
std::string data = "temp"; std::string data = "temp";
@@ -4651,7 +4651,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles @@ -4553,7 +4553,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL); NULL);
#else #else
size_t bytes_written = size_t bytes_written =

12
www/chromium/files/patch-base_linux__util.cc
View file

@ -1,14 +1,6 @@
--- base/linux_util.cc.orig 2023-12-10 06:10:27 UTC --- base/linux_util.cc.orig 2024-05-21 18:07:39 UTC
+++ base/linux_util.cc +++ base/linux_util.cc
@@ -15,6 +15,7 @@ @@ -154,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) {
#include <iomanip>
#include <memory>
+#include <sstream>
#include "base/base_export.h"
#include "base/files/dir_reader_posix.h"
@@ -153,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) {
} }
bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {

6
www/chromium/files/patch-base_process_internal__linux.h
View file

@ -1,6 +1,6 @@
--- base/process/internal_linux.h.orig 2024-04-19 13:02:56 UTC --- base/process/internal_linux.h.orig 2024-05-21 18:07:39 UTC
+++ base/process/internal_linux.h +++ base/process/internal_linux.h
@@ -138,6 +138,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); @@ -140,6 +140,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
// arguments to the lambda. // arguments to the lambda.
template <typename Lambda> template <typename Lambda>
void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) {
@ -10,7 +10,7 @@
// Iterate through the different threads tracked in /proc/<pid>/task. // Iterate through the different threads tracked in /proc/<pid>/task.
FilePath fd_path = GetProcPidDir(process).Append("task"); FilePath fd_path = GetProcPidDir(process).Append("task");
@@ -157,6 +160,7 @@ void ForEachProcessTask(base::ProcessHandle process, L @@ -159,6 +162,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
FilePath task_path = fd_path.Append(tid_str); FilePath task_path = fd_path.Append(tid_str);
lambda(tid, task_path); lambda(tid, task_path);
} }

8
www/chromium/files/patch-base_process_process__metrics.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_metrics.cc.orig 2024-04-19 13:02:56 UTC --- base/process/process_metrics.cc.orig 2024-05-21 18:07:39 UTC
+++ base/process/process_metrics.cc +++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base { @@ -17,7 +17,7 @@ namespace base {
namespace { namespace {
@ -35,9 +35,9 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage( double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) { TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now(); TimeTicks time = TimeTicks::Now();
@@ -130,10 +129,9 @@ std::optional<double> ProcessMetrics::GetPlatformIndep @@ -129,10 +128,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() {
} return GetPlatformIndependentCPUUsage(cpu_usage);
return GetPlatformIndependentCPUUsage(cpu_usage.value()); });
} }
-#endif -#endif

24
www/chromium/files/patch-base_process_process__metrics.h
View file

@ -1,4 +1,4 @@
--- base/process/process_metrics.h.orig 2024-04-19 13:02:56 UTC --- base/process/process_metrics.h.orig 2024-05-21 18:07:39 UTC
+++ base/process/process_metrics.h +++ base/process/process_metrics.h
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
#endif #endif
@ -18,7 +18,7 @@
// Minor and major page fault counts since the process creation. // Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes. // Both counts are process-wide, and exclude child processes.
// //
@@ -103,7 +103,7 @@ class BASE_EXPORT ProcessMetrics { @@ -116,7 +116,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics(). // convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@ -27,8 +27,8 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not // Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms. // attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const; BASE_EXPORT size_t GetResidentSetSize() const;
@@ -137,7 +137,7 @@ class BASE_EXPORT ProcessMetrics { @@ -150,7 +150,7 @@ class BASE_EXPORT ProcessMetrics {
[[nodiscard]] std::optional<TimeDelta> GetCumulativeCPUUsage(); base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX) - BUILDFLAG(IS_AIX)
@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they // Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents). // were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of // Threads that have already terminated will not be reported. Thus, the sum of
@@ -182,7 +182,7 @@ class BASE_EXPORT ProcessMetrics { @@ -195,7 +195,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const; int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX) #endif // BUILDFLAG(IS_POSIX)
@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status. // Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const; uint64_t GetVmSwapBytes() const;
@@ -203,7 +203,7 @@ class BASE_EXPORT ProcessMetrics { @@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC) #endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif #endif
#if BUILDFLAG(IS_APPLE) #if BUILDFLAG(IS_APPLE)
@@ -225,12 +225,10 @@ class BASE_EXPORT ProcessMetrics { @@ -238,12 +238,10 @@ class BASE_EXPORT ProcessMetrics {
// Used to store the previous times and CPU usage counts so we can // Used to store the previous times and CPU usage counts so we can
// compute the CPU usage between calls. // compute the CPU usage between calls.
TimeTicks last_cpu_time_; TimeTicks last_cpu_time_;
@ -68,7 +68,7 @@
// Same thing for idle wakeups. // Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_; TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_; uint64_t last_absolute_idle_wakeups_;
@@ -271,7 +269,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de @@ -284,7 +282,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@ -77,7 +77,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on // Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS. // Windows, Mac, Linux, Android and Chrome OS.
// //
@@ -306,7 +304,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { @@ -319,7 +317,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif #endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -86,7 +86,7 @@
// This provides an estimate of available memory as described here: // This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
@@ -321,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { @@ -334,7 +332,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif #endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -95,7 +95,7 @@
int buffers = 0; int buffers = 0;
int cached = 0; int cached = 0;
int active_anon = 0; int active_anon = 0;
@@ -358,7 +356,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK @@ -371,7 +369,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA) // BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -104,7 +104,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the // Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error. // CPU-related ticks. Returns -1 on parse error.
// Exposed for testing. // Exposed for testing.
@@ -552,7 +550,7 @@ class BASE_EXPORT SystemMetrics { @@ -566,7 +564,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_; size_t committed_memory_;

25
www/chromium/files/patch-base_process_process__metrics__freebsd.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics_freebsd.cc.orig 2024-04-20 08:27:55 UTC --- base/process/process_metrics_freebsd.cc.orig 2024-05-22 05:19:32 UTC
+++ base/process/process_metrics_freebsd.cc +++ base/process/process_metrics_freebsd.cc
@@ -3,42 +3,57 @@ @@ -3,44 +3,58 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "base/process/process_metrics.h" #include "base/process/process_metrics.h"
@ -45,8 +45,10 @@
return WrapUnique(new ProcessMetrics(process)); return WrapUnique(new ProcessMetrics(process));
} }
-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() { -base::expected<double, ProcessCPUUsageError>
+std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { -ProcessMetrics::GetPlatformIndependentCPUUsage() {
+base::expected<TimeDelta, ProcessCPUUsageError>
+ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info; struct kinfo_proc info;
- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
- size_t length = sizeof(info); - size_t length = sizeof(info);
@ -56,22 +58,23 @@
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
+ +
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return std::nullopt; - return base::unexpected(ProcessCPUUsageError::kSystemError);
+ return std::optional(TimeDelta()); + return base::ok(TimeDelta());
- return std::optional(double{info.ki_pctcpu} / FSCALE * 100.0); - return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0);
+ return std::optional(Microseconds(info.ki_runtime)); + return base::ok(Microseconds(info.ki_runtime));
} }
-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { -base::expected<TimeDelta, ProcessCPUUsageError>
-ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED(); - NOTREACHED();
- return std::nullopt; - return base::unexpected(ProcessCPUUsageError::kNotImplemented);
-} -}
- -
size_t GetSystemCommitCharge() { size_t GetSystemCommitCharge() {
int mib[2], pagesize; int mib[2], pagesize;
unsigned long mem_total, mem_free, mem_inactive; unsigned long mem_total, mem_free, mem_inactive;
@@ -60,6 +75,230 @@ size_t GetSystemCommitCharge() { @@ -62,6 +76,230 @@ size_t GetSystemCommitCharge() {
pagesize = getpagesize(); pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);

38
www/chromium/files/patch-base_process_process__metrics__openbsd.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics_openbsd.cc.orig 2024-04-19 13:02:56 UTC --- base/process/process_metrics_openbsd.cc.orig 2024-05-21 18:07:39 UTC
+++ base/process/process_metrics_openbsd.cc +++ base/process/process_metrics_openbsd.cc
@@ -6,73 +6,49 @@ @@ -6,75 +6,50 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -8,11 +8,11 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
+#include <sys/vmmeter.h> +#include <sys/vmmeter.h>
#include <optional>
+#include <kvm.h> +#include <kvm.h>
+ +
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/types/expected.h"
+#include "base/values.h" +#include "base/values.h"
+#include "base/notreached.h" +#include "base/notreached.h"
@ -21,8 +21,9 @@
-namespace { -namespace {
+ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} +ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
-static std::optional<int> GetProcessCPU(pid_t pid) { -base::expected<int, ProcessCPUUsageError> GetProcessCPU(pid_t pid) {
+std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { +base::expected<TimeDelta, ProcessCPUUsageError>
+ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info; struct kinfo_proc info;
- size_t length; - size_t length;
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
@ -31,7 +32,7 @@
+ struct timeval tv; + struct timeval tv;
- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { - if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
- return std::nullopt; - return base::unexpected(ProcessCPUUsageError::kSystemError);
- } - }
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
+ sizeof(struct kinfo_proc), 1 }; + sizeof(struct kinfo_proc), 1 };
@ -39,15 +40,14 @@
- mib[5] = (length / sizeof(struct kinfo_proc)); - mib[5] = (length / sizeof(struct kinfo_proc));
- -
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
- return std::nullopt; return base::unexpected(ProcessCPUUsageError::kSystemError);
+ return std::optional(TimeDelta());
} }
- return std::optional(info.p_pctcpu); - return base::ok(info.p_pctcpu);
+ tv.tv_sec = info.p_rtime_sec; + tv.tv_sec = info.p_rtime_sec;
+ tv.tv_usec = info.p_rtime_usec; + tv.tv_usec = info.p_rtime_usec;
+ +
+ return std::optional(Microseconds(TimeValToMicroseconds(tv))); + return base::ok(Microseconds(TimeValToMicroseconds(tv)));
} }
-} // namespace -} // namespace
@ -58,27 +58,29 @@
return WrapUnique(new ProcessMetrics(process)); return WrapUnique(new ProcessMetrics(process));
} }
-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() { -base::expected<double, ProcessCPUUsageError>
-ProcessMetrics::GetPlatformIndependentCPUUsage() {
- TimeTicks time = TimeTicks::Now(); - TimeTicks time = TimeTicks::Now();
- -
- if (last_cpu_time_.is_zero()) { - if (last_cpu_time_.is_zero()) {
- // First call, just set the last values. - // First call, just set the last values.
- last_cpu_time_ = time; - last_cpu_time_ = time;
- return std::optional(0.0); - return base::ok(0.0);
- } - }
- -
- const std::optional<int> cpu = GetProcessCPU(process_); - const base::expected<int, ProcessCPUUsageError> cpu = GetProcessCPU(process_);
- if (!cpu.has_value()) { - if (!cpu.has_value()) {
- return std::nullopt; - return base::unexpected(cpu.error());
- } - }
- -
- last_cpu_time_ = time; - last_cpu_time_ = time;
- return std::optional(double{cpu.value()} / FSCALE * 100.0); - return base::ok(double{cpu.value()} / FSCALE * 100.0);
-} -}
- -
-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { -base::expected<TimeDelta, ProcessCPUUsageError>
-ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED(); - NOTREACHED();
- return std::nullopt; - return base::unexpected(ProcessCPUUsageError::kNotImplemented);
-} -}
- -
-ProcessMetrics::ProcessMetrics(ProcessHandle process) -ProcessMetrics::ProcessMetrics(ProcessHandle process)
@ -92,7 +94,7 @@
struct vmtotal vmtotal; struct vmtotal vmtotal;
unsigned long mem_total, mem_free, mem_inactive; unsigned long mem_total, mem_free, mem_inactive;
size_t len = sizeof(vmtotal); size_t len = sizeof(vmtotal);
@@ -84,9 +60,136 @@ size_t GetSystemCommitCharge() { @@ -86,9 +61,136 @@ size_t GetSystemCommitCharge() {
mem_free = vmtotal.t_free; mem_free = vmtotal.t_free;
mem_inactive = vmtotal.t_vm - vmtotal.t_avm; mem_inactive = vmtotal.t_vm - vmtotal.t_avm;

4
www/chromium/files/patch-base_process_process__metrics__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics_unittest.cc.orig 2024-04-19 13:02:56 UTC --- base/process/process_metrics_unittest.cc.orig 2024-05-21 18:07:39 UTC
+++ base/process/process_metrics_unittest.cc +++ base/process/process_metrics_unittest.cc
@@ -56,7 +56,8 @@ @@ -57,7 +57,8 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \

10
www/chromium/files/patch-base_process_process__posix.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_posix.cc.orig 2023-09-13 12:11:42 UTC --- base/process/process_posix.cc.orig 2024-05-21 18:07:39 UTC
+++ base/process/process_posix.cc +++ base/process/process_posix.cc
@@ -23,10 +23,15 @@ @@ -23,10 +23,15 @@
#include "base/trace_event/base_tracing.h" #include "base/trace_event/base_tracing.h"
@ -17,16 +17,16 @@
#if BUILDFLAG(CLANG_PROFILING) #if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h" #include "base/test/clang_profiling.h"
#endif #endif
@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, @@ -99,7 +104,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
return ret_pid > 0;
} }
#endif
-#if BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
// Using kqueue on Mac so that we can wait on non-child processes. // Using kqueue on Mac so that we can wait on non-child processes.
// We can't use kqueues on child processes because we need to reap // We can't use kqueues on child processes because we need to reap
// our own children using wait. // our own children using wait.
@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha @@ -376,7 +381,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process
const bool exited = (parent_pid < 0); const bool exited = (parent_pid < 0);
if (!exited && parent_pid != our_pid) { if (!exited && parent_pid != our_pid) {
@ -35,7 +35,7 @@
// On Mac we can wait on non child processes. // On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout); return WaitForSingleNonChildProcess(handle, timeout);
#else #else
@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const { @@ -413,7 +418,56 @@ void Process::Exited(int exit_code) const {
int Process::GetOSPriority() const { int Process::GetOSPriority() const {
DCHECK(IsValid()); DCHECK(IsValid());

6
www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
View file

@ -1,9 +1,9 @@
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-03-22 08:19:40 UTC --- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-05-21 18:07:39 UTC
+++ base/profiler/stack_sampling_profiler_unittest.cc +++ base/profiler/stack_sampling_profiler_unittest.cc
@@ -42,7 +42,7 @@ @@ -43,7 +43,7 @@
#include <intrin.h> #include <intrin.h>
#include <malloc.h> #include <malloc.h>
#include <windows.h>
-#else -#else
+#elif !BUILDFLAG(IS_BSD) +#elif !BUILDFLAG(IS_BSD)
#include <alloca.h> #include <alloca.h>

6
www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/strings/safe_sprintf_unittest.cc.orig 2023-03-09 06:31:50 UTC --- base/strings/safe_sprintf_unittest.cc.orig 2024-05-21 18:07:39 UTC
+++ base/strings/safe_sprintf_unittest.cc +++ base/strings/safe_sprintf_unittest.cc
@@ -733,6 +733,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { @@ -735,6 +735,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
#endif #endif
} }
@ -8,7 +8,7 @@
TEST(SafeSPrintfTest, EmitNULL) { TEST(SafeSPrintfTest, EmitNULL) {
char buf[40]; char buf[40];
#if defined(__GNUC__) #if defined(__GNUC__)
@@ -749,6 +750,7 @@ TEST(SafeSPrintfTest, EmitNULL) { @@ -751,6 +752,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
} }

6
www/chromium/files/patch-base_synchronization_lock__impl.h
View file

@ -1,6 +1,6 @@
--- base/synchronization/lock_impl.h.orig 2024-04-19 13:02:56 UTC --- base/synchronization/lock_impl.h.orig 2024-05-21 18:07:39 UTC
+++ base/synchronization/lock_impl.h +++ base/synchronization/lock_impl.h
@@ -107,6 +107,10 @@ void LockImpl::Unlock() { @@ -106,6 +106,10 @@ void LockImpl::Unlock() {
} }
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@ -11,7 +11,7 @@
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv); BASE_EXPORT void dcheck_trylock_result(int rv);
@@ -127,6 +131,9 @@ void LockImpl::Unlock() { @@ -126,6 +130,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv); dcheck_unlock_result(rv);
#endif #endif
} }

6
www/chromium/files/patch-base_system_sys__info.h
View file

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2024-04-19 13:02:56 UTC --- base/system/sys_info.h.orig 2024-05-21 18:07:39 UTC
+++ base/system/sys_info.h +++ base/system/sys_info.h
@@ -322,6 +322,8 @@ class BASE_EXPORT SysInfo { @@ -325,6 +325,8 @@ class BASE_EXPORT SysInfo {
static void ResetCpuSecurityMitigationsEnabledForTesting(); static void ResetCpuSecurityMitigationsEnabledForTesting();
#endif #endif
@ -9,7 +9,7 @@
private: private:
friend class test::ScopedAmountOfPhysicalMemoryOverride; friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
@@ -334,7 +336,7 @@ class BASE_EXPORT SysInfo { @@ -337,7 +339,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync(); static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

19
www/chromium/files/patch-base_threading_platform__thread__posix.cc
View file

@ -1,13 +1,12 @@
--- base/threading/platform_thread_posix.cc.orig 2024-04-19 13:02:56 UTC --- base/threading/platform_thread_posix.cc.orig 2024-05-21 18:07:39 UTC
+++ base/threading/platform_thread_posix.cc +++ base/threading/platform_thread_posix.cc
@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) { @@ -77,11 +77,11 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable) if (!thread_params->joinable)
base::DisallowSingleton(); base::DisallowSingleton();
-#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) -#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD) +#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD)
partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated();
partition_alloc::internal::GetStackPointer());
#endif #endif
-#if !BUILDFLAG(IS_NACL) -#if !BUILDFLAG(IS_NACL)
@ -15,7 +14,7 @@
#if BUILDFLAG(IS_APPLE) #if BUILDFLAG(IS_APPLE)
PlatformThread::SetCurrentThreadRealtimePeriodValue( PlatformThread::SetCurrentThreadRealtimePeriodValue(
delegate->GetRealtimePeriod()); delegate->GetRealtimePeriod());
@@ -267,6 +267,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { @@ -265,6 +265,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
return reinterpret_cast<int32_t>(pthread_self()); return reinterpret_cast<int32_t>(pthread_self());
#elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
return pthread_self(); return pthread_self();
@ -24,7 +23,7 @@
#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
return reinterpret_cast<int64_t>(pthread_self()); return reinterpret_cast<int64_t>(pthread_self());
#endif #endif
@@ -357,7 +359,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t @@ -355,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
// static // static
bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@ -33,7 +32,7 @@
return false; return false;
#else #else
if (from >= to) { if (from >= to) {
@@ -378,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, @@ -376,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) { MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL) #if BUILDFLAG(IS_NACL)
NOTIMPLEMENTED(); NOTIMPLEMENTED();
@ -43,7 +42,7 @@
#else #else
if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
return; return;
@@ -400,7 +405,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, @@ -398,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
// static // static
ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {

8
www/chromium/files/patch-base_threading_platform__thread__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/threading/platform_thread_unittest.cc.orig 2023-11-03 10:09:45 UTC --- base/threading/platform_thread_unittest.cc.orig 2024-05-21 18:07:39 UTC
+++ base/threading/platform_thread_unittest.cc +++ base/threading/platform_thread_unittest.cc
@@ -32,7 +32,7 @@ @@ -33,7 +33,7 @@
#include "base/time/time.h" #include "base/time/time.h"
#endif #endif
@ -9,7 +9,7 @@
#include <pthread.h> #include <pthread.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/types.h> #include <sys/types.h>
@@ -423,7 +423,7 @@ TEST(PlatformThreadTest, @@ -424,7 +424,7 @@ TEST(PlatformThreadTest,
// and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
// proprerty changes for a given platform. // proprerty changes for a given platform.
TEST(PlatformThreadTest, CanChangeThreadType) { TEST(PlatformThreadTest, CanChangeThreadType) {
@ -18,7 +18,7 @@
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level unless we are root (euid == 0). // able to increase priority to any level unless we are root (euid == 0).
bool kCanIncreasePriority = false; bool kCanIncreasePriority = false;
@@ -706,12 +706,16 @@ INSTANTIATE_TEST_SUITE_P( @@ -708,12 +708,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE) #endif // BUILDFLAG(IS_APPLE)

8
www/chromium/files/patch-build_config_BUILDCONFIG.gn
View file

@ -1,4 +1,4 @@
--- build/config/BUILDCONFIG.gn.orig 2023-01-11 09:17:16 UTC --- build/config/BUILDCONFIG.gn.orig 2024-05-21 18:07:39 UTC
+++ build/config/BUILDCONFIG.gn +++ build/config/BUILDCONFIG.gn
@@ -136,7 +136,8 @@ declare_args() { @@ -136,7 +136,8 @@ declare_args() {
is_official_build = false is_official_build = false
@ -10,7 +10,7 @@
(current_cpu != "s390x" && current_cpu != "s390" && (current_cpu != "s390x" && current_cpu != "s390" &&
current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "ppc64" && current_cpu != "ppc" &&
current_cpu != "mips" && current_cpu != "mips64" && current_cpu != "mips" && current_cpu != "mips64" &&
@@ -225,6 +226,10 @@ if (host_toolchain == "") { @@ -231,6 +232,10 @@ if (host_toolchain == "") {
host_toolchain = "//build/toolchain/aix:$host_cpu" host_toolchain = "//build/toolchain/aix:$host_cpu"
} else if (host_os == "zos") { } else if (host_os == "zos") {
host_toolchain = "//build/toolchain/zos:$host_cpu" host_toolchain = "//build/toolchain/zos:$host_cpu"
@ -21,7 +21,7 @@
} else { } else {
assert(false, "Unsupported host_os: $host_os") assert(false, "Unsupported host_os: $host_os")
} }
@@ -268,6 +273,8 @@ if (target_os == "android") { @@ -274,6 +279,8 @@ if (target_os == "android") {
_default_toolchain = "//build/toolchain/aix:$target_cpu" _default_toolchain = "//build/toolchain/aix:$target_cpu"
} else if (target_os == "zos") { } else if (target_os == "zos") {
_default_toolchain = "//build/toolchain/zos:$target_cpu" _default_toolchain = "//build/toolchain/zos:$target_cpu"
@ -30,7 +30,7 @@
} else { } else {
assert(false, "Unsupported target_os: $target_os") assert(false, "Unsupported target_os: $target_os")
} }
@@ -302,7 +309,11 @@ is_android = current_os == "android" @@ -308,7 +315,11 @@ is_android = current_os == "android"
is_chromeos = current_os == "chromeos" is_chromeos = current_os == "chromeos"
is_fuchsia = current_os == "fuchsia" is_fuchsia = current_os == "fuchsia"
is_ios = current_os == "ios" is_ios = current_os == "ios"

4
www/chromium/files/patch-build_config_clang_BUILD.gn
View file

@ -1,6 +1,6 @@
--- build/config/clang/BUILD.gn.orig 2024-04-19 13:02:56 UTC --- build/config/clang/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ build/config/clang/BUILD.gn +++ build/config/clang/BUILD.gn
@@ -203,7 +203,7 @@ template("clang_lib") { @@ -212,7 +212,7 @@ template("clang_lib") {
# Adds a dependency on the Clang runtime library clang_rt.builtins. # Adds a dependency on the Clang runtime library clang_rt.builtins.
clang_lib("compiler_builtins") { clang_lib("compiler_builtins") {

30
www/chromium/files/patch-build_config_compiler_BUILD.gn
View file

@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig 2024-04-19 13:02:56 UTC --- build/config/compiler/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn
@@ -204,7 +204,7 @@ declare_args() { @@ -203,7 +203,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of # This greatly reduces the size of debug builds, at the cost of
# debugging information which is required by some specialized # debugging information which is required by some specialized
# debugging tools. # debugging tools.
@ -9,7 +9,7 @@
} }
declare_args() { declare_args() {
@@ -268,13 +268,16 @@ config("default_include_dirs") { @@ -265,13 +265,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in # Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time. # the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") { config("no_unresolved_symbols") {
@ -27,7 +27,7 @@
} }
# compiler --------------------------------------------------------------------- # compiler ---------------------------------------------------------------------
@@ -515,6 +518,10 @@ config("compiler") { @@ -512,6 +515,10 @@ config("compiler") {
} }
} }
@ -38,7 +38,7 @@
# Linux-specific compiler flags setup. # Linux-specific compiler flags setup.
# ------------------------------------ # ------------------------------------
if (use_gold) { if (use_gold) {
@@ -590,7 +597,7 @@ config("compiler") { @@ -587,7 +594,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ] ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
} }
@ -47,7 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) { if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [ ldflags += [
@@ -1180,7 +1187,7 @@ config("compiler_cpu_abi") { @@ -1198,7 +1205,7 @@ config("compiler_cpu_abi") {
] ]
} }
} else if (current_cpu == "arm") { } else if (current_cpu == "arm") {
@ -56,7 +56,7 @@
!(is_chromeos_lacros && is_chromeos_device)) { !(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ] cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") { @@ -1213,7 +1220,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ] cflags += [ "-mtune=$arm_tune" ]
} }
} else if (current_cpu == "arm64") { } else if (current_cpu == "arm64") {
@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) { !(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ] cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1530,7 +1537,7 @@ config("compiler_deterministic") { @@ -1548,7 +1555,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if # different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag. # we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them. # Other paths are already given in relative, no need to normalize them.
@ -74,7 +74,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [ cflags += [
"-Xclang", "-Xclang",
@@ -1582,7 +1589,7 @@ config("compiler_deterministic") { @@ -1600,7 +1607,7 @@ config("compiler_deterministic") {
} }
config("clang_revision") { config("clang_revision") {
@ -83,7 +83,7 @@
update_args = [ update_args = [
"--print-revision", "--print-revision",
"--verify-version=$clang_version", "--verify-version=$clang_version",
@@ -1890,9 +1897,6 @@ config("default_warnings") { @@ -1914,9 +1921,6 @@ config("default_warnings") {
# TODO(crbug.com/1494809): Evaluate and possibly enable. # TODO(crbug.com/1494809): Evaluate and possibly enable.
"-Wno-vla-extension", "-Wno-vla-extension",
@ -93,7 +93,7 @@
] ]
cflags_cc += [ cflags_cc += [
@@ -1900,7 +1904,7 @@ config("default_warnings") { @@ -1924,7 +1928,7 @@ config("default_warnings") {
"-Wenum-compare-conditional", "-Wenum-compare-conditional",
] ]
@ -102,7 +102,7 @@
cflags_cc += [ cflags_cc += [
# TODO(https://crbug.com/1513724): Fix and re-enable. # TODO(https://crbug.com/1513724): Fix and re-enable.
"-Wno-c++11-narrowing-const-reference", "-Wno-c++11-narrowing-const-reference",
@@ -2089,7 +2093,7 @@ config("no_chromium_code") { @@ -2113,7 +2117,7 @@ config("no_chromium_code") {
# third-party libraries. # third-party libraries.
"-Wno-c++11-narrowing", "-Wno-c++11-narrowing",
] ]
@ -111,7 +111,7 @@
cflags += [ cflags += [
# Disabled for similar reasons as -Wunused-variable. # Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable", "-Wno-unused-but-set-variable",
@@ -2597,7 +2601,7 @@ config("afdo_optimize_size") { @@ -2638,7 +2642,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate # There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target. # config to allow AFDO to be disabled per-target.
config("afdo") { config("afdo") {
@ -120,7 +120,7 @@
cflags = [] cflags = []
if (clang_emit_debug_info_for_profiling) { if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling. # Add the following flags to generate debug info for profiling.
@@ -2624,7 +2628,7 @@ config("afdo") { @@ -2665,7 +2669,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ] cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ] inputs = [ _clang_sample_profile ]
} }
@ -129,7 +129,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ] cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ] inputs = [ auto_profile_path ]
} }
@@ -2788,7 +2792,8 @@ config("symbols") { @@ -2829,7 +2833,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ] configs += [ "//build/config:compress_debug_sections" ]
} }

4
www/chromium/files/patch-build_config_rust.gni
View file

@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2024-04-19 13:02:56 UTC --- build/config/rust.gni.orig 2024-05-21 18:07:39 UTC
+++ build/config/rust.gni +++ build/config/rust.gni
@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) { @@ -272,6 +272,10 @@ if (is_linux || is_chromeos) {
} }
} }

4
www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
View file

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2024-03-22 08:19:40 UTC --- build/toolchain/gcc_toolchain.gni.orig 2024-05-21 18:07:39 UTC
+++ build/toolchain/gcc_toolchain.gni +++ build/toolchain/gcc_toolchain.gni
@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) { @@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os") "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc # This template defines a toolchain for something that works like gcc
# (including clang). # (including clang).
# #
@@ -890,22 +897,12 @@ template("gcc_toolchain") { @@ -879,22 +886,12 @@ template("gcc_toolchain") {
# use_gold too. # use_gold too.
template("clang_toolchain") { template("clang_toolchain") {
gcc_toolchain(target_name) { gcc_toolchain(target_name) {

6
www/chromium/files/patch-cc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2024-04-19 13:02:56 UTC --- cc/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ cc/BUILD.gn +++ cc/BUILD.gn
@@ -681,7 +681,7 @@ cc_test_static_library("test_support") { @@ -677,7 +677,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) { if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ] deps += [ "//gpu/vulkan/init" ]
} }
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ] data_deps = [ "//third_party/mesa_headers" ]
} }
if (skia_use_dawn) { if (skia_use_dawn) {
@@ -940,7 +940,6 @@ cc_test("cc_unittests") { @@ -936,7 +936,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ] data = [ "//components/test/data/viz/" ]
data_deps = [ data_deps = [
"//testing/buildbot/filters:cc_unittests_filters", "//testing/buildbot/filters:cc_unittests_filters",

46
www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2024-05-01 07:03:57 UTC --- chrome/app/chrome_main_delegate.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc
@@ -146,7 +146,7 @@ @@ -137,7 +137,7 @@
#include "components/about_ui/credit_utils.h" #include "components/about_ui/credit_utils.h"
#endif #endif
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h" #include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif #endif
@@ -189,20 +189,20 @@ @@ -180,21 +180,21 @@
#include "v8/include/v8.h" #include "v8/include/v8.h"
#endif #endif
@ -21,6 +21,7 @@
-#if BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/nix/scoped_xdg_activation_token_injector.h" #include "base/nix/scoped_xdg_activation_token_injector.h"
#include "ui/linux/display_server_utils.h"
#endif #endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@ -34,7 +35,7 @@
#include "chrome/browser/policy/policy_path_parser.h" #include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h" #include "components/crash/core/app/crashpad.h"
#endif #endif
@@ -249,7 +249,7 @@ @@ -241,7 +241,7 @@
#include "base/scoped_add_feature_flags.h" #include "base/scoped_add_feature_flags.h"
#include "ui/base/ui_base_features.h" #include "ui/base/ui_base_features.h"
#include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/ozone_platform.h"
@ -43,7 +44,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#endif #endif
#endif // BUILDFLAG(IS_OZONE) #endif // BUILDFLAG(IS_OZONE)
@@ -349,7 +349,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty @@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded. // and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) { bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return return
@ -52,7 +53,7 @@
// The zygote process opens the resources for the renderers. // The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess || process_type == switches::kZygoteProcess ||
#endif #endif
@@ -434,7 +434,7 @@ bool HandleVersionSwitches(const base::CommandLine& co @@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
@ -61,7 +62,7 @@
// Show the man page if --help or -h is on the command line. // Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) { void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) || if (command_line.HasSwitch(switches::kHelp) ||
@@ -480,7 +480,7 @@ void SetCrashpadUploadConsentPostLogin() { @@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() {
} }
#endif // BUILDFLAG(IS_CHROMEOS_LACROS) #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -70,7 +71,7 @@
void SIGTERMProfilingShutdown(int signal) { void SIGTERMProfilingShutdown(int signal) {
content::Profiling::Stop(); content::Profiling::Stop();
struct sigaction sigact; struct sigaction sigact;
@@ -562,7 +562,7 @@ std::optional<int> AcquireProcessSingleton( @@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton(
// process can be exited. // process can be exited.
ChromeProcessSingleton::CreateInstance(user_data_dir); ChromeProcessSingleton::CreateInstance(user_data_dir);
@ -79,7 +80,7 @@
// Read the xdg-activation token and set it in the command line for the // Read the xdg-activation token and set it in the command line for the
// duration of the notification in order to ensure this is propagated to an // duration of the notification in order to ensure this is propagated to an
// already running browser process if it exists. // already running browser process if it exists.
@@ -646,7 +646,7 @@ void InitializeUserDataDir(base::CommandLine* command_ @@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type = std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType); command_line->GetSwitchValueASCII(switches::kProcessType);
@ -88,7 +89,7 @@
// On Linux, Chrome does not support running multiple copies under different // On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to // DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case. // support the virtual desktop use-case.
@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat @@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif #endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -97,17 +98,17 @@
// Record the startup process creation time on supported platforms. On Android // Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid. // this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -964,7 +964,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia @@ -962,7 +962,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
#if BUILDFLAG(IS_OZONE) #if BUILDFLAG(IS_OZONE)
// Initialize Ozone platform and add required feature flags as per platform's // Initialize Ozone platform and add required feature flags as per platform's
// properties. // properties.
-#if BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint(); ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
#endif #endif
ui::OzonePlatform::PreEarlyInitialization(); ui::OzonePlatform::PreEarlyInitialization();
@@ -1162,7 +1162,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv @@ -1155,7 +1155,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
chrome::GetChannel() == version_info::Channel::DEV; const bool is_canary_dev = IsCanaryDev();
const bool emit_crashes = const bool emit_crashes =
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) - BUILDFLAG(IS_WIN)
@ -115,16 +116,7 @@
is_canary_dev; is_canary_dev;
#else #else
false; false;
@@ -1181,7 +1181,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv @@ -1310,7 +1310,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// for more context.
base::sequence_manager::internal::ThreadController::InitializeFeatures(
/*record_sample_metadata=*/is_canary_dev);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1330,7 +1330,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// TODO(crbug.com/1052397): Revisit the macro expression once build flag // TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete. // switch of lacros-chrome is complete.
@ -133,7 +125,7 @@
// This will directly exit if the user asked for help. // This will directly exit if the user asked for help.
HandleHelpSwitches(command_line); HandleHelpSwitches(command_line);
#endif #endif
@@ -1360,7 +1360,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom @@ -1340,7 +1340,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
#if BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider(); chromeos::dbus_paths::RegisterPathProvider();
#endif #endif
@ -142,7 +134,7 @@
nacl::RegisterPathProvider(); nacl::RegisterPathProvider();
#endif #endif
@@ -1757,7 +1757,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1735,7 +1735,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
} }
@ -151,7 +143,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote(). // Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) { if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1858,7 +1858,7 @@ absl::variant<int, content::MainFunctionParams> Chrome @@ -1836,7 +1836,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader // This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead. // process is launched via nacl_helper instead.

4
www/chromium/files/patch-chrome_browser_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2024-04-25 21:17:54 UTC --- chrome/browser/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -6554,6 +6554,13 @@ static_library("browser") { @@ -6630,6 +6630,13 @@ static_library("browser") {
} }
} }

75
www/chromium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/about_flags.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/about_flags.cc +++ chrome/browser/about_flags.cc
@@ -234,7 +234,7 @@ @@ -236,7 +236,7 @@
#include "ui/ui_features.h" #include "ui/ui_features.h"
#include "url/url_features.h" #include "url/url_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h" #include "base/allocator/buildflags.h"
#endif #endif
@@ -322,7 +322,7 @@ @@ -324,7 +324,7 @@
#include "device/vr/public/cpp/features.h" #include "device/vr/public/cpp/features.h"
#endif #endif
@ -18,7 +18,7 @@
#include "ui/ozone/public/ozone_switches.h" #include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -331,7 +331,7 @@ @@ -333,7 +333,7 @@
#include "chrome/browser/win/titlebar_config.h" #include "chrome/browser/win/titlebar_config.h"
#endif #endif
@ -27,7 +27,7 @@
#include "chrome/browser/enterprise/profile_management/profile_management_features.h" #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#include "components/supervised_user/core/common/features.h" #include "components/supervised_user/core/common/features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -489,7 +489,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap @@ -491,7 +491,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif #endif
@ -36,7 +36,16 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto, {flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1384,7 +1384,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 @@ -1294,7 +1294,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
{"AtKeywordAcceleration", "true"},
};
@@ -1424,7 +1424,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
nullptr}}; nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -45,7 +54,7 @@
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"},
@@ -3704,7 +3704,7 @@ const flags_ui::FeatureEntry::FeatureVariation @@ -3793,7 +3793,7 @@ const flags_ui::FeatureEntry::FeatureVariation
std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
}; };
@ -54,7 +63,7 @@
const flags_ui::FeatureEntry::FeatureParam const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
const flags_ui::FeatureEntry::FeatureParam const flags_ui::FeatureEntry::FeatureParam
@@ -4495,7 +4495,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -4583,7 +4583,7 @@ const FeatureEntry kFeatureEntries[] = {
}, },
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
@ -63,7 +72,7 @@
{ {
"fluent-overlay-scrollbars", "fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName, flag_descriptions::kFluentOverlayScrollbarsName,
@@ -4936,7 +4936,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -5038,7 +5038,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
#endif // !BUILDFLAG(IS_ANDROID) #endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -72,7 +81,7 @@
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
flag_descriptions::kShortcutsNotAppsDescription, flag_descriptions::kShortcutsNotAppsDescription,
kOsMac | kOsWin | kOsLinux | kOsFuchsia, kOsMac | kOsWin | kOsLinux | kOsFuchsia,
@@ -5061,7 +5061,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -5163,7 +5163,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)}, FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -81,7 +90,7 @@
{"pulseaudio-loopback-for-cast", {"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5077,7 +5077,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -5179,7 +5179,7 @@ const FeatureEntry kFeatureEntries[] = {
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
#endif // BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_LINUX)
@ -90,7 +99,7 @@
{"skip-undecryptable-passwords", {"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription, flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5981,7 +5981,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -6087,7 +6087,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -99,16 +108,16 @@
{"omnibox-domain-suggestions", {"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6852,7 +6852,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -6407,7 +6407,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll, "OrganicRepeatableQueries")},
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
{"enable-async-dns", flag_descriptions::kAsyncDnsName, + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
FEATURE_VALUE_TYPE(net::features::kAsyncDns)}, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
@@ -7857,7 +7857,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
@@ -7950,7 +7950,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)}, FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -117,7 +126,7 @@
{"enable-network-service-sandbox", {"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription, flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -7881,7 +7881,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -7974,7 +7974,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
#endif #endif
@ -126,7 +135,7 @@
{"enable-family-link-extensions-permissions", {"enable-family-link-extensions-permissions",
flag_descriptions:: flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -8733,7 +8733,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -8842,7 +8842,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -135,7 +144,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription, flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux, kOsCrOS | kOsLacros | kOsLinux,
@@ -8775,7 +8775,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -8890,7 +8890,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -144,7 +153,7 @@
{ {
"ui-debug-tools", "ui-debug-tools",
flag_descriptions::kUIDebugToolsName, flag_descriptions::kUIDebugToolsName,
@@ -9044,7 +9044,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -9116,7 +9116,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -153,7 +162,7 @@
{"policy-indication-for-managed-default-search", {"policy-indication-for-managed-default-search",
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
@@ -9340,7 +9340,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -9423,7 +9423,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -162,7 +171,7 @@
{"media-session-enter-picture-in-picture", {"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription, flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -10280,7 +10280,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -10339,7 +10339,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid, kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@ -171,7 +180,7 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription, flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10318,7 +10318,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -10377,7 +10377,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -180,16 +189,16 @@
{"site-search-settings-policy", {"site-search-settings-policy",
flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyName,
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
@@ -10452,7 +10452,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -10490,7 +10490,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)}, flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
#endif FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"third-party-profile-management", {"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription, flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10804,7 +10804,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -10836,7 +10836,7 @@ const FeatureEntry kFeatureEntries[] = {
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
#endif #endif
@ -198,7 +207,7 @@
{"restart-to-gain-access-to-keychain", {"restart-to-gain-access-to-keychain",
flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainName,
flag_descriptions::kRestartToGainAccessToKeychainDescription, flag_descriptions::kRestartToGainAccessToKeychainDescription,
@@ -11078,7 +11078,7 @@ const FeatureEntry kFeatureEntries[] = { @@ -11114,7 +11114,7 @@ const FeatureEntry kFeatureEntries[] = {
// Controls the view mode for (history) sync screen. // Controls the view mode for (history) sync screen.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \

4
www/chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-03-22 08:19:40 UTC --- chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/accessibility/pdf_ocr_controller.cc +++ chrome/browser/accessibility/pdf_ocr_controller.cc
@@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) { @@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) {
// TODO(crbug.com/1442928): Sending announcements results in a failure in // TODO(crbug.com/333398721): Sending announcements results in a failure in
// `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and // `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and
// flaky fail when running Chrome. // flaky fail when running Chrome.
-#if !BUILDFLAG(IS_LINUX) -#if !BUILDFLAG(IS_LINUX)

4
www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2023-03-09 06:31:50 UTC --- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
@@ -90,7 +90,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch @@ -88,7 +88,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
return metrics::OmniboxInputType::QUERY; return metrics::OmniboxInputType::QUERY;
case ExternalProtocolHandler::UNKNOWN: { case ExternalProtocolHandler::UNKNOWN: {

6
www/chromium/files/patch-chrome_browser_browser__features.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_features.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/browser_features.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/browser_features.cc +++ chrome/browser/browser_features.cc
@@ -76,7 +76,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel @@ -78,7 +78,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
BASE_FEATURE(kDestroyProfileOnBrowserClose, BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose", "DestroyProfileOnBrowserClose",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -9,7 +9,7 @@
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);
#else #else
base::FEATURE_DISABLED_BY_DEFAULT); base::FEATURE_DISABLED_BY_DEFAULT);
@@ -337,7 +337,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, @@ -359,7 +359,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
BASE_FEATURE(kSupportSearchSuggestionForPrerender2, BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
"SupportSearchSuggestionForPrerender2", "SupportSearchSuggestionForPrerender2",
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \

8
www/chromium/files/patch-chrome_browser_browser__process__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2024-03-22 08:19:40 UTC --- chrome/browser/browser_process_impl.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/browser_process_impl.cc +++ chrome/browser/browser_process_impl.cc
@@ -220,7 +220,7 @@ @@ -226,7 +226,7 @@
#include "chrome/browser/ui/profiles/profile_picker.h" #include "chrome/browser/ui/profiles/profile_picker.h"
#endif #endif
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif #endif
@@ -1253,7 +1253,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { @@ -1268,7 +1268,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy(); ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create(); ChromeJsErrorReportProcessor::Create();
#endif #endif
@@ -1533,7 +1533,7 @@ void BrowserProcessImpl::Unpin() { @@ -1593,7 +1593,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported. // Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete. // complete.

4
www/chromium/files/patch-chrome_browser_browser__process__impl.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.h.orig 2024-02-23 21:04:38 UTC --- chrome/browser/browser_process_impl.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/browser_process_impl.h +++ chrome/browser/browser_process_impl.h
@@ -389,7 +389,7 @@ class BrowserProcessImpl : public BrowserProcess, @@ -397,7 +397,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.

23
www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc +++ chrome/browser/chrome_browser_interface_binders.cc
@@ -129,13 +129,13 @@ @@ -129,13 +129,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING) #endif // BUILDFLAG(FULL_SAFE_BROWSING)
@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif #endif
@@ -224,7 +224,7 @@ @@ -226,7 +226,7 @@
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +25,7 @@
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h"
@@ -834,7 +834,7 @@ void BindScreen2xMainContentExtractor( @@ -850,7 +850,7 @@ void BindScreen2xMainContentExtractor(
#endif #endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -34,25 +34,16 @@
void BindVisualSuggestionsModelProvider( void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host, content::RenderFrameHost* frame_host,
mojo::PendingReceiver< mojo::PendingReceiver<
@@ -1030,7 +1030,7 @@ void PopulateChromeFrameBinders( @@ -1046,7 +1046,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) - BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -1038,7 +1038,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) { !render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need // The service binder will reject non-primary main frames, but we still need
@@ -1125,7 +1125,7 @@ void PopulateChromeWebUIFrameBinders( @@ -1128,7 +1128,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map); commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +52,7 @@
RegisterWebUIControllerInterfaceBinder< RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler, connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map); enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders( @@ -1140,7 +1140,7 @@ void PopulateChromeWebUIFrameBinders(
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -70,7 +61,7 @@
RegisterWebUIControllerInterfaceBinder< RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif #endif
@@ -1704,7 +1704,7 @@ void PopulateChromeWebUIFrameBinders( @@ -1732,7 +1732,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

10
www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/chrome_browser_main.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/chrome_browser_main.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc
@@ -246,15 +246,15 @@ @@ -246,15 +246,15 @@
@ -80,7 +80,7 @@
metrics::DesktopSessionDurationTracker::Initialize(); metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize(); ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize( TouchModeStatsTracker::Initialize(
@@ -1328,7 +1328,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* @@ -1322,7 +1322,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -89,7 +89,7 @@
// Delete the media history database if it still exists. // Delete the media history database if it still exists.
// TODO(crbug.com/1198344): Remove this. // TODO(crbug.com/1198344): Remove this.
base::ThreadPool::PostTask( base::ThreadPool::PostTask(
@@ -1377,7 +1377,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* @@ -1371,7 +1371,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile)); *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -98,7 +98,7 @@
if (headless::IsHeadlessMode()) { if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics(); headless::ReportHeadlessActionMetrics();
} }
@@ -1485,7 +1485,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( @@ -1481,7 +1481,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding // In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been // any platform specific SelectFileDialog implementation that may have been
// set. // set.
@ -107,7 +107,7 @@
if (headless::IsHeadlessMode()) { if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp(); headless::HeadlessSelectFileDialogFactory::SetUp();
} }
@@ -2030,7 +2030,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat @@ -2026,7 +2026,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from // Drop the request if headless mode is in effect or the request is from
// a headless Chrome process. // a headless Chrome process.

8
www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-05-01 07:03:57 UTC --- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
@@ -175,7 +175,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar @@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
// static // static
void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() { void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
-#if BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On the desktop, we fix the platform name if necessary.
// See https://crbug.com/1246928.
auto* const command_line = base::CommandLine::ForCurrentProcess(); auto* const command_line = base::CommandLine::ForCurrentProcess();
auto env = base::Environment::Create();
std::string desktop_startup_id;

40
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/chrome_content_browser_client.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -460,7 +460,7 @@ @@ -467,7 +467,7 @@
#include "storage/browser/file_system/external_mount_points.h" #include "storage/browser/file_system/external_mount_points.h"
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#elif BUILDFLAG(IS_ANDROID) #elif BUILDFLAG(IS_ANDROID)
@@ -569,12 +569,12 @@ @@ -577,12 +577,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h" #include "components/crash/core/app/crashpad.h"
#endif #endif
@@ -585,7 +585,7 @@ @@ -593,7 +593,7 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
#endif #endif
@ -33,7 +33,7 @@
#include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
#include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
#include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
@@ -593,7 +593,7 @@ @@ -601,7 +601,7 @@
#endif #endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -42,7 +42,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH) // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -609,7 +609,7 @@ @@ -617,7 +617,7 @@
#include "components/lens/lens_features.h" #include "components/lens/lens_features.h"
#endif #endif
@ -51,7 +51,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE) #elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1474,7 +1474,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre @@ -1511,7 +1511,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
#if BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
#endif // BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_CHROMEOS)
@ -60,7 +60,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true); true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1598,7 +1598,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo @@ -1635,7 +1635,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS) #elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_); is_integration_test, &startup_data_);
@ -69,7 +69,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_); is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID) #elif BUILDFLAG(IS_ANDROID)
@@ -1635,7 +1635,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo @@ -1672,7 +1672,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
@ -78,7 +78,7 @@
main_parts->AddParts( main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else #else
@@ -1656,7 +1656,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo @@ -1693,7 +1693,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif #endif
@ -87,7 +87,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE) #elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1675,7 +1675,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo @@ -1712,7 +1712,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get()); chrome::AddMetricsExtraParts(main_parts.get());
@ -96,7 +96,7 @@
main_parts->AddParts( main_parts->AddParts(
std::make_unique< std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2515,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin @@ -2549,7 +2549,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
client_info->client_id); client_info->client_id);
} }
#elif BUILDFLAG(IS_POSIX) #elif BUILDFLAG(IS_POSIX)
@ -105,16 +105,16 @@
pid_t pid; pid_t pid;
if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
command_line->AppendSwitchASCII( command_line->AppendSwitchASCII(
@@ -2847,7 +2847,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin @@ -2881,7 +2881,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( GetProfileParamsProcess(*command_line));
command_line); }
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD)
// Opt into a hardened stack canary mitigation if it hasn't already been // Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled. // force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4551,7 +4551,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst @@ -4633,7 +4633,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
} }
} }
@ -123,7 +123,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line, const base::CommandLine& command_line,
int child_process_id, int child_process_id,
@@ -5109,7 +5109,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati @@ -5187,7 +5187,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles); &throttles);
} }
@ -132,7 +132,7 @@
MaybeAddThrottle( MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles); &throttles);
@@ -5123,7 +5123,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati @@ -5201,7 +5201,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -141,7 +141,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle), MaybeCreateThrottleFor(handle),
&throttles); &throttles);
@@ -5162,7 +5162,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati @@ -5240,7 +5240,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle)); handle));
} }
@ -150,7 +150,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle), MaybeCreateThrottleFor(handle),
&throttles); &throttles);
@@ -7137,7 +7137,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS @@ -7210,7 +7210,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be // This enterprise policy is supported on Android, but the feature will not be
// launched there. // launched there.

4
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2024-04-19 13:02:56 UTC --- chrome/browser/chrome_content_browser_client.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h
@@ -500,7 +500,7 @@ class ChromeContentBrowserClient : public content::Con @@ -503,7 +503,7 @@ class ChromeContentBrowserClient : public content::Con
bool IsPluginAllowedToUseDevChannelAPIs( bool IsPluginAllowedToUseDevChannelAPIs(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
const GURL& url) override; const GURL& url) override;

21
www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
View file

@ -1,15 +1,15 @@
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-03-27 13:31:02 UTC --- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -40,7 +40,7 @@ @@ -41,7 +41,7 @@
#include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/buildflags.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/path_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
#endif @@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
const char ImageLoaderComponentName[] = "WidevineCdm"; const char ImageLoaderComponentName[] = "WidevineCdm";
#endif #endif
@ -18,7 +18,16 @@
// On Linux and ChromeOS the Widevine CDM is loaded at startup before the // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
// zygote is locked down. As a result there is no need to register the CDM // zygote is locked down. As a result there is no need to register the CDM
// with Chrome as it can't be used until Chrome is restarted. // with Chrome as it can't be used until Chrome is restarted.
@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat @@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version
}
#endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// On Linux and ChromeOS the Widevine CDM is loaded at startup before the
// zygote is locked down. To locate the Widevine CDM at startup, a hint file
// is used. Update the hint file with the new Widevine CDM path.
@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
return; return;
} }

10
www/chromium/files/patch-chrome_browser_devtools_BUILD.gn
View file

@ -1,10 +0,0 @@
--- chrome/browser/devtools/BUILD.gn.orig 2024-04-30 23:46:45 UTC
+++ chrome/browser/devtools/BUILD.gn
@@ -113,6 +113,7 @@ static_library("devtools") {
"//chrome/browser/autofill:autofill",
"//components/autofill/content/browser:browser",
"//components/autofill/core/browser:browser",
+ "//components/enterprise/buildflags",
"//components/paint_preview/buildflags:buildflags",
"//content/public/browser",
"//net",

8
www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc +++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1700,7 +1700,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe @@ -1707,7 +1707,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
const base::FilePath& path) { const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader(); return !download_prefs_->ShouldOpenPdfInSystemReader();
} }
@@ -1819,7 +1819,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow @@ -1853,7 +1853,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) { content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
// Don't download pdf if it is a file URL, as that might cause an infinite // Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer. // download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1865,7 +1865,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl @@ -1899,7 +1899,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload()); DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

4
www/chromium/files/patch-chrome_browser_download_download__commands.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_commands.h.orig 2023-12-10 06:10:27 UTC --- chrome/browser/download/download_commands.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/download/download_commands.h +++ chrome/browser/download/download_commands.h
@@ -63,7 +63,7 @@ class DownloadCommands { @@ -66,7 +66,7 @@ class DownloadCommands {
void ExecuteCommand(Command command); void ExecuteCommand(Command command);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

8
www/chromium/files/patch-chrome_browser_download_download__item__model.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/download/download_item_model.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/download/download_item_model.cc +++ chrome/browser/download/download_item_model.cc
@@ -752,7 +752,7 @@ bool DownloadItemModel::IsCommandChecked( @@ -798,7 +798,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_); download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE: case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) { if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader(); return prefs->ShouldOpenPdfInSystemReader();
@@ -798,7 +798,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand @@ -846,7 +846,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE); DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) { if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked); prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked); SetShouldPreferOpeningInBrowser(is_checked);
@@ -1189,7 +1189,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe @@ -1235,7 +1235,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return; return;
} }

4
www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc +++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -564,7 +564,7 @@ bool ConnectorsService::ConnectorsEnabled() const { @@ -569,7 +569,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_); Profile* profile = Profile::FromBrowserContext(context_);

6
www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/watermark/watermark_view.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/enterprise/watermark/watermark_view.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/enterprise/watermark/watermark_view.cc +++ chrome/browser/enterprise/watermark/watermark_view.cc
@@ -33,7 +33,7 @@ const gfx::Font& WatermarkFont() { @@ -36,7 +36,7 @@ gfx::Font WatermarkFont() {
"Segoe UI", "Segoe UI",
#elif BUILDFLAG(IS_MAC) #elif BUILDFLAG(IS_MAC)
"SF Pro Text", "SF Pro Text",
@ -9,7 +9,7 @@
"Ubuntu", "Ubuntu",
#elif BUILDFLAG(IS_CHROMEOS) #elif BUILDFLAG(IS_CHROMEOS)
"Google Sans", "Google Sans",
@@ -45,7 +45,7 @@ const gfx::Font& WatermarkFont() { @@ -47,7 +47,7 @@ gfx::Font WatermarkFont() {
} }
gfx::Font::Weight WatermarkFontWeight() { gfx::Font::Weight WatermarkFontWeight() {

4
www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2024-04-19 13:02:56 UTC --- chrome/browser/extensions/BUILD.gn.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/extensions/BUILD.gn +++ chrome/browser/extensions/BUILD.gn
@@ -1384,6 +1384,10 @@ static_library("extensions") { @@ -1376,6 +1376,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ] deps += [ "//chrome/services/printing/public/mojom" ]
} }

10
www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-02-23 21:04:38 UTC --- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@ @@ -33,7 +33,7 @@
#include "components/reporting/util/statusor.h" #include "components/reporting/util/statusor.h"
#endif #endif
@ -9,7 +9,7 @@
#include <optional> #include <optional>
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte @@ -150,7 +150,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
return info; return info;
} }
@ -18,7 +18,7 @@
device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalsAggregationRequest CreateAggregationRequest(
device_signals::SignalName signal_name) { device_signals::SignalName signal_name) {
@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: @@ -211,7 +211,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret // getPersistentSecret
@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default; EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: @@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
} }
#endif #endif

4
www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel @@ -405,7 +405,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
apps::LaunchContainer launch_container = apps::LaunchContainer launch_container =
GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
Profile* profile = Profile::FromBrowserContext(context); Profile* profile = Profile::FromBrowserContext(context);

4
www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem @@ -606,7 +606,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
} }
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

4
www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist @@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] = (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::kBoolean; settings_api::PrefType::kBoolean;
#endif #endif
@@ -213,7 +213,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist @@ -215,7 +215,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// Appearance settings. // Appearance settings.
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;

4
www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -934,7 +934,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: @@ -892,7 +892,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
#if BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS)
RequestExtensionApproval(contents); RequestExtensionApproval(contents);
return; return;

33
www/chromium/files/patch-chrome_browser_flag__descriptions.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/flag_descriptions.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/flag_descriptions.cc +++ chrome/browser/flag_descriptions.cc
@@ -2946,7 +2946,7 @@ const char kCbdTimeframeRequiredDescription[] = @@ -2868,7 +2868,7 @@ const char kCbdTimeframeRequiredDescription[] =
"value to the list."; "value to the list.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
const char kPolicyIndicationForManagedDefaultSearchName[] = const char kPolicyIndicationForManagedDefaultSearchName[] =
"Enable policy indication for managed Default Search provider"; "Enable policy indication for managed Default Search provider";
const char kPolicyIndicationForManagedDefaultSearchDescription[] = const char kPolicyIndicationForManagedDefaultSearchDescription[] =
@@ -3259,7 +3259,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] @@ -3171,7 +3171,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
"but in the same SiteInstanceGroup, and thus the same process."; "but in the same SiteInstanceGroup, and thus the same process.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
const char kSiteSearchSettingsPolicyDescription[] = const char kSiteSearchSettingsPolicyDescription[] =
"Allow site search engines to be defined by the SiteSearchSettings policy."; "Allow site search engines to be defined by the SiteSearchSettings policy.";
@@ -7496,7 +7496,7 @@ const char kLacrosMergeIcuDataFileDescription[] = @@ -7443,7 +7443,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros."; "Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -27,7 +27,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] = const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens " "When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7756,7 +7756,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] @@ -7709,7 +7709,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
// Linux ----------------------------------------------------------------------- // Linux -----------------------------------------------------------------------
@ -36,7 +36,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11"; const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7804,7 +7804,7 @@ const char kZeroCopyVideoCaptureDescription[] = @@ -7757,7 +7757,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -45,16 +45,16 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] = const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel."; "Enables the following feed in the sidepanel.";
@@ -7819,7 +7819,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] @@ -7770,7 +7770,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"Calls to Classify URL RPC will use Protocol Buffer format in resposnes, "
"instead of JSON."; "instead of JSON.";
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kEnableNetworkServiceSandboxName[] = const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox."; "Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] = const char kEnableNetworkServiceSandboxDescription[] =
@@ -7851,7 +7851,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti @@ -7802,7 +7802,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth"; "Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,16 +63,7 @@
const char kSkipUndecryptablePasswordsName[] = const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable " "Skip undecryptable passwords to use the available decryptable "
"passwords."; "passwords.";
@@ -7871,7 +7871,7 @@ const char kRestartToGainAccessToKeychainDescription[] @@ -7918,7 +7918,7 @@ const char kElementCaptureDescription[] =
"to restart Chrome to gain access to computer's password manager.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7972,7 +7972,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -81,8 +72,8 @@
const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] = const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging."; "Enables additional keyboard shortcuts to help debugging.";
@@ -8021,7 +8021,7 @@ const char kComposeTextSelectionDescription[] = @@ -7975,7 +7975,7 @@ const char kComposeProactiveNudgeDescription[] =
"Enables feature for different heuristics for selecting text for Compose"; "Enables proactive nudging for Compose";
#endif // BUILDFLAG(ENABLE_COMPOSE) #endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

31
www/chromium/files/patch-chrome_browser_flag__descriptions.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2024-04-19 13:02:56 UTC --- chrome/browser/flag_descriptions.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/flag_descriptions.h +++ chrome/browser/flag_descriptions.h
@@ -1709,7 +1709,7 @@ extern const char kCbdTimeframeRequiredName[]; @@ -1679,7 +1679,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[]; extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif #endif
@@ -1890,7 +1890,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] @@ -1854,7 +1854,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[]; extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[]; extern const char kSiteSearchSettingsPolicyDescription[];
#endif #endif
@@ -4323,7 +4323,7 @@ extern const char kLacrosMergeIcuDataFileName[]; @@ -4317,7 +4317,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[]; extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -27,7 +27,7 @@
extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[]; extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4471,7 +4471,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip @@ -4468,7 +4468,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux --------------------------------------------------------------------- // Linux ---------------------------------------------------------------------
@ -36,7 +36,7 @@
extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[]; extern const char kOzonePlatformHintChoiceX11[];
@@ -4513,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa @@ -4510,7 +4510,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[]; extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -45,32 +45,25 @@
extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[]; extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4524,13 +4524,13 @@ extern const char kRestartToGainAccessToKeychainName[] @@ -4522,7 +4522,7 @@ extern const char kRestartToGainAccessToKeychainDescri
extern const char kRestartToGainAccessToKeychainDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const char kAsyncDnsName[];
extern const char kAsyncDnsDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) - BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[]; extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4541,7 +4541,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; @@ -4531,7 +4531,7 @@ extern const char kFollowingFeedSidepanelDescription[]
extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[]; extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[]; extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4618,7 +4618,7 @@ extern const char kElementCaptureDescription[]; @@ -4608,7 +4608,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -79,8 +72,8 @@
extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[]; extern const char kUIDebugToolsDescription[];
@@ -4652,7 +4652,7 @@ extern const char kComposeTextSelectionName[]; @@ -4648,7 +4648,7 @@ extern const char kComposeProactiveNudgeName[];
extern const char kComposeTextSelectionDescription[]; extern const char kComposeProactiveNudgeDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE) #endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

4
www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-01-30 07:53:34 UTC --- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -100,7 +100,7 @@ std::string GetLogUploadProduct() { @@ -101,7 +101,7 @@ std::string GetLogUploadProduct() {
const char product[] = "Chrome_Mac"; const char product[] = "Chrome_Mac";
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.

4
www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-01-30 07:53:34 UTC --- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
@@ -25,10 +25,10 @@ @@ -25,10 +25,10 @@
#include "components/webrtc_logging/browser/text_log_list.h" #include "components/webrtc_logging/browser/text_log_list.h"
@ -30,4 +30,4 @@
+#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void WebRtcLoggingController::OnRtpPacket( void WebRtcLoggingController::OnRtpPacket(
std::unique_ptr<uint8_t[]> packet_header, base::HeapArray<uint8_t> packet_header,

20
www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc +++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -194,7 +194,7 @@ @@ -195,7 +195,7 @@
#include "chrome/notification_helper/notification_helper_constants.h" #include "chrome/notification_helper/notification_helper_constants.h"
#endif #endif
@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h" #include "components/metrics/motherboard_metrics_provider.h"
#endif #endif
@@ -211,7 +211,7 @@ @@ -212,7 +212,7 @@
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
#endif #endif
@ -18,7 +18,7 @@
#include "chrome/browser/metrics/bluetooth_metrics_provider.h" #include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -577,7 +577,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg @@ -574,7 +574,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -27,7 +27,7 @@
metrics::structured::StructuredMetricsService::RegisterPrefs(registry); metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
#if !BUILDFLAG(IS_CHROMEOS_ASH) #if !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -749,7 +749,7 @@ void ChromeMetricsServiceClient::Initialize() { @@ -746,7 +746,7 @@ void ChromeMetricsServiceClient::Initialize() {
RegisterUKMProviders(); RegisterUKMProviders();
} }
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -36,7 +36,7 @@
metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
base::SequencedTaskRunner::GetCurrentDefault()); base::SequencedTaskRunner::GetCurrentDefault());
#endif #endif
@@ -796,7 +796,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic @@ -797,7 +797,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider( metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>()); std::make_unique<metrics::CPUMetricsProvider>());
@ -45,7 +45,7 @@
metrics_service_->RegisterMetricsProvider( metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>()); std::make_unique<metrics::MotherboardMetricsProvider>());
#endif #endif
@@ -881,7 +881,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic @@ -882,7 +882,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@ -54,7 +54,7 @@
metrics_service_->RegisterMetricsProvider( metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -991,7 +991,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic @@ -984,7 +984,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>()); std::make_unique<PowerMetricsProvider>());
#endif #endif
@ -63,7 +63,7 @@
metrics_service_->RegisterMetricsProvider( metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider()); metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1170,7 +1170,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve @@ -1167,7 +1167,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@ -72,7 +72,7 @@
// This creates the DesktopProfileSessionDurationsServices if it didn't exist // This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already. // already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
@@ -1513,7 +1513,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri @@ -1514,7 +1514,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
recorder = recorder =
std::make_unique<metrics::structured::AshStructuredMetricsRecorder>( std::make_unique<metrics::structured::AshStructuredMetricsRecorder>(
cros_system_profile_provider_.get()); cros_system_profile_provider_.get());

4
www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2023-02-08 09:03:45 UTC --- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/metrics/perf/cpu_identity.cc +++ chrome/browser/metrics/perf/cpu_identity.cc
@@ -141,7 +141,7 @@ CPUIdentity GetCPUIdentity() { @@ -142,7 +142,7 @@ CPUIdentity GetCPUIdentity() {
result.release = result.release =
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
base::SysInfo::KernelVersion(); base::SysInfo::KernelVersion();

10
www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/metrics/power/process_monitor.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/metrics/power/process_monitor.cc +++ chrome/browser/metrics/power/process_monitor.cc
@@ -61,7 +61,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet @@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
metrics.cpu_usage = process_metrics.GetPlatformIndependentCPUUsage(); process_metrics.GetPlatformIndependentCPUUsage());
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX) - BUILDFLAG(IS_AIX)
@ -9,7 +9,7 @@
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif #endif
#if BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_MAC)
@@ -79,7 +79,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do @@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
} }
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
metrics->idle_wakeups *= factor; metrics->idle_wakeups *= factor;
#endif #endif
@@ -167,7 +167,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me @@ -170,7 +170,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
} }
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

4
www/chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc → www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
View file

@ -1,5 +1,5 @@
--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-09-13 12:11:42 UTC --- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/new_tab_page/modules/drive/drive_service.cc +++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/resource_request.h"

6
www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc +++ chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -468,7 +468,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin @@ -480,7 +480,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin
bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling( bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling(
device_reauth::DeviceAuthenticator* authenticator) { device_reauth::DeviceAuthenticator* authenticator) {
@ -9,7 +9,7 @@
if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
return false; return false;
} }
@@ -691,7 +691,7 @@ void ChromePasswordManagerClient::NotifyUserCredential @@ -703,7 +703,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
} }
void ChromePasswordManagerClient::NotifyKeychainError() { void ChromePasswordManagerClient::NotifyKeychainError() {

56
www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -233,19 +233,20 @@ @@ -233,19 +233,20 @@
#include "components/spellcheck/browser/pref_names.h" #include "components/spellcheck/browser/pref_names.h"
@ -58,8 +58,8 @@
{ key::kFullscreenAllowed, { key::kFullscreenAllowed,
prefs::kFullscreenAllowed, prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -1657,7 +1658,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1662,7 +1663,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
}, base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX)
@ -67,7 +67,7 @@
{ key::kGSSAPILibraryName, { key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName, prefs::kGSSAPILibraryName,
base::Value::Type::STRING }, base::Value::Type::STRING },
@@ -1705,7 +1706,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1713,7 +1714,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
@ -76,7 +76,7 @@
{ key::kNetworkServiceSandboxEnabled, { key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -1731,12 +1732,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1739,12 +1740,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb, prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER }, base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -91,8 +91,8 @@
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled, { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -1748,7 +1749,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1753,7 +1754,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::STRING }, base::Value::Type::LIST },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
- || BUILDFLAG(IS_FUCHSIA) - || BUILDFLAG(IS_FUCHSIA)
@ -100,7 +100,7 @@
{ key::kDefaultBrowserSettingEnabled, { key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -1761,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1766,7 +1767,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA) // || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@ -109,7 +109,7 @@
{ key::kAutoplayAllowed, { key::kAutoplayAllowed,
prefs::kAutoplayAllowed, prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -1862,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1867,7 +1868,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -118,16 +118,16 @@
{ key::kAlternativeBrowserPath, { key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING }, base::Value::Type::STRING },
@@ -1969,7 +1970,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1972,7 +1973,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST }, base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ key::kAuthNegotiateDelegateByKdcPolicy, { key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -1994,7 +1995,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -1997,7 +1998,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(ENABLE_EXTENSIONS) #endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -136,7 +136,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled, { key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -2052,7 +2053,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -2055,7 +2056,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername, ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING }, base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -145,16 +145,16 @@
{ key::kTabDiscardingExceptions, { key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST }, base::Value::Type::LIST },
@@ -2080,7 +2081,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -2086,7 +2087,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled, prefs::kUiAutomationProviderEnabled,
base::Value::Type::INTEGER }, base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kOutOfProcessSystemDnsResolutionEnabled, { key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -2109,7 +2110,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -2115,7 +2116,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedPrivateNetworkAccessRestrictionsEnabled, prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
@ -163,7 +163,7 @@
{ key::kExtensionInstallTypeBlocklist, { key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST}, base::Value::Type::LIST},
@@ -2130,7 +2131,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = @@ -2136,7 +2137,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed,
base::Value::Type::INTEGER}, base::Value::Type::INTEGER},
#endif #endif
@ -172,7 +172,7 @@
{ key::kChromeForTestingAllowed, { key::kChromeForTestingAllowed,
prefs::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed,
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
@@ -2251,7 +2252,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -2257,7 +2258,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End // Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -181,7 +181,7 @@
handlers->AddHandler( handlers->AddHandler(
std::make_unique<performance_manager::MemorySaverPolicyHandler>()); std::make_unique<performance_manager::MemorySaverPolicyHandler>());
// Note: This needs to be created after `DefaultSearchPolicyHandler`. // Note: This needs to be created after `DefaultSearchPolicyHandler`.
@@ -2259,7 +2260,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -2265,7 +2266,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// BUILDFLAG(IS_CHROMEOS_ASH) // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -190,7 +190,7 @@
handlers->AddHandler( handlers->AddHandler(
std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
@@ -2468,7 +2469,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -2474,7 +2475,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -199,7 +199,7 @@
handlers->AddHandler( handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler( handlers->AddHandler(
@@ -2526,7 +2527,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -2532,7 +2533,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema)); chrome_schema));
@ -208,7 +208,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler( handlers->AddHandler(
@@ -2575,7 +2576,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -2607,7 +2608,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED))); SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)));
@ -217,7 +217,7 @@
handlers->AddHandler( handlers->AddHandler(
std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema)); std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2613,7 +2614,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -2645,7 +2646,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>> std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies; signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -226,7 +226,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin, key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN)); base::Value::Type::BOOLEAN));
@@ -2970,7 +2971,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -3004,7 +3005,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif #endif
#if BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(ENABLE_SPELLCHECK)
@ -235,7 +235,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler( handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2978,7 +2979,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -3012,7 +3013,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK) #endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -244,7 +244,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>( handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN)); base::Value::Type::BOOLEAN));
@@ -2995,7 +2996,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -3029,7 +3030,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
/*new_policy_handler=*/std::make_unique< /*new_policy_handler=*/std::make_unique<
first_party_sets::FirstPartySetsOverridesPolicyHandler>( first_party_sets::FirstPartySetsOverridesPolicyHandler>(
key::kRelatedWebsiteSetsOverrides, chrome_schema))); key::kRelatedWebsiteSetsOverrides, chrome_schema)));
@ -253,7 +253,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -3022,7 +3023,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH @@ -3054,7 +3055,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN))); base::Value::Type::BOOLEAN)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

10
www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-05-01 07:03:57 UTC --- chrome/browser/prefs/browser_prefs.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc
@@ -488,18 +488,18 @@ @@ -487,18 +487,18 @@
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -22,7 +22,7 @@
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#endif #endif
@@ -534,7 +534,7 @@ @@ -533,7 +533,7 @@
#include "chrome/browser/sessions/session_service_log.h" #include "chrome/browser/sessions/session_service_log.h"
#endif #endif
@ -31,7 +31,7 @@
#include "ui/color/system_theme.h" #include "ui/color/system_theme.h"
#endif #endif
@@ -1722,7 +1722,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) @@ -1771,7 +1771,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true); registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true);
#endif #endif
@ -40,7 +40,7 @@
registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
#endif #endif
@@ -2067,12 +2067,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync @@ -2118,12 +2118,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = { @@ -185,7 +185,7 @@ const char* const kPersistentPrefNames[] = {
prefs::kShowFullscreenToolbar, prefs::kShowFullscreenToolbar,
#endif #endif

8
www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc +++ chrome/browser/printing/print_backend_service_manager.cc
@@ -34,7 +34,7 @@ @@ -35,7 +35,7 @@
#include "printing/printing_context.h" #include "printing/printing_context.h"
#include "printing/printing_features.h" #include "printing/printing_features.h"
@ -9,7 +9,7 @@
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#endif #endif
@@ -861,7 +861,7 @@ PrintBackendServiceManager::GetServiceFromBundle( @@ -862,7 +862,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
host.BindNewPipeAndPassReceiver(), host.BindNewPipeAndPassReceiver(),
content::ServiceProcessHost::Options() content::ServiceProcessHost::Options()
.WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
@ -18,7 +18,7 @@
.WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
#endif #endif
.Pass()); .Pass());
@@ -1038,7 +1038,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate @@ -1039,7 +1039,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout; return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi: case ClientType::kQueryWithUi:

20
www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -321,7 +321,7 @@ @@ -326,7 +326,7 @@
#include "chromeos/constants/chromeos_features.h" #include "chromeos/constants/chromeos_features.h"
#endif #endif
@ -9,8 +9,8 @@
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
#endif #endif
@@ -412,18 +412,18 @@ @@ -410,18 +410,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH) - BUILDFLAG(IS_CHROMEOS_ASH)
@ -31,7 +31,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
#include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
@@ -658,7 +658,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -657,7 +657,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance(); DiceBoundSessionCookieServiceFactory::GetInstance();
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
@ -40,7 +40,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif #endif
browser_sync::UserEventServiceFactory::GetInstance(); browser_sync::UserEventServiceFactory::GetInstance();
@@ -781,29 +781,29 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -779,29 +779,29 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance(); enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -76,7 +76,7 @@
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif #endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE) #if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -927,7 +927,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -925,7 +925,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif #endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
@ -85,7 +85,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif #endif
@@ -1034,7 +1034,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -1032,7 +1032,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance(); policy::PolicyCertServiceFactory::GetInstance();
#endif #endif
@ -94,7 +94,7 @@
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
policy::UserPolicyOidcSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance();
#endif #endif
@@ -1076,7 +1076,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -1074,7 +1074,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
ProfileStatisticsFactory::GetInstance(); ProfileStatisticsFactory::GetInstance();
#endif #endif
@ -103,7 +103,7 @@
ProfileTokenWebSigninInterceptorFactory::GetInstance(); ProfileTokenWebSigninInterceptorFactory::GetInstance();
OidcAuthenticationSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance();
#endif #endif
@@ -1095,7 +1095,7 @@ void ChromeBrowserMainExtraPartsProfiles:: @@ -1093,7 +1093,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif #endif
ReduceAcceptLanguageFactory::GetInstance(); ReduceAcceptLanguageFactory::GetInstance();
RendererUpdaterFactory::GetInstance(); RendererUpdaterFactory::GetInstance();

8
www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/profiles/profile_impl.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc
@@ -267,6 +267,10 @@ @@ -263,6 +263,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/browser/spellchecker/spellcheck_service.h"
#endif #endif
@ -11,7 +11,7 @@
using bookmarks::BookmarkModel; using bookmarks::BookmarkModel;
using content::BrowserThread; using content::BrowserThread;
using content::DownloadManagerDelegate; using content::DownloadManagerDelegate;
@@ -600,7 +604,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async @@ -597,7 +601,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else #else
{ {
#endif // BUILDFLAG(IS_CHROMEOS_LACROS) #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -20,7 +20,7 @@
ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry = ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage() profile_manager->GetProfileAttributesStorage()
@@ -893,7 +897,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) @@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
} }
base::FilePath ProfileImpl::last_selected_directory() { base::FilePath ProfileImpl::last_selected_directory() {

4
www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-01-30 07:53:34 UTC --- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
#include "net/base/url_util.h" #include "net/base/url_util.h"
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif #endif
@@ -417,7 +417,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil @@ -423,7 +423,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile, Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) { const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms. // Local content analysis is supported only on desktop platforms.

20
www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc
View file

@ -1,20 +0,0 @@
--- chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc
@@ -11,7 +11,7 @@
#include "components/country_codes/country_codes.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_process.h"
#include "components/variations/service/variations_service.h"
#endif
@@ -21,7 +21,7 @@ namespace {
std::unique_ptr<KeyedService> BuildSearchEngineChoiceService(
content::BrowserContext* context) {
int variations_country_id = country_codes::kCountryIDUnknown;
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (g_browser_process->variations_service()) {
variations_country_id =
country_codes::CountryStringToCountryID(base::ToUpperASCII(

8
www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2024-02-23 21:04:38 UTC --- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/sharing/sharing_handler_registry_impl.cc +++ chrome/browser/sharing/sharing_handler_registry_impl.cc
@@ -23,7 +23,7 @@ @@ -22,7 +22,7 @@
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,8 +9,8 @@
#include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl @@ -74,7 +74,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
} #endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) - BUILDFLAG(IS_CHROMEOS)

6
www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
@@ -305,7 +305,7 @@ void SupervisedUserExtensionsManager:: @@ -346,7 +346,7 @@ void SupervisedUserExtensionsManager::
ActivateManagementPolicyAndUpdateRegistration() { ActivateManagementPolicyAndUpdateRegistration() {
SetActiveForSupervisedUsers(); SetActiveForSupervisedUsers();
UpdateManagementPolicyRegistration(); UpdateManagementPolicyRegistration();
@ -9,7 +9,7 @@
MaybeMarkExtensionsLocallyParentApproved(); MaybeMarkExtensionsLocallyParentApproved();
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
} }
@@ -417,7 +417,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten @@ -458,7 +458,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
return false; return false;
} }

30
www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/sync/chrome_sync_client.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/sync/chrome_sync_client.cc +++ chrome/browser/sync/chrome_sync_client.cc
@@ -112,7 +112,7 @@ @@ -108,7 +108,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK) #endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -8,17 +8,17 @@
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || #elif BUILDFLAG(IS_ANDROID)
@@ -460,7 +460,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy @@ -463,7 +463,7 @@ ChromeSyncClient::CreateModelTypeControllers(
#endif // !BUILDFLAG(IS_ANDROID) // platforms.
bool enable_tab_group_sync = false;
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) - BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { enable_tab_group_sync = true;
controllers.push_back(std::make_unique<syncer::ModelTypeController>( #elif BUILDFLAG(IS_ANDROID)
syncer::SAVED_TAB_GROUP, enable_tab_group_sync =
@@ -473,7 +473,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy @@ -481,7 +481,7 @@ ChromeSyncClient::CreateModelTypeControllers(
// Chrome prefers OS provided spell checkers where they exist. So only sync the // Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one. // custom dictionary on platforms that typically don't provide one.
@ -27,12 +27,12 @@
// Dictionary sync is enabled by default. // Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back( controllers.push_back(
@@ -629,7 +629,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> @@ -638,7 +638,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) { switch (type) {
case syncer::SAVED_TAB_GROUP: {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) - BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
case syncer::SAVED_TAB_GROUP: { auto* keyed_service =
DCHECK(base::FeatureList::IsEnabled(features::kTabGroupsSave)); tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_);
return tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_) CHECK(keyed_service);

16
www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
View file

@ -1,15 +1,15 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/sync/sync_service_factory.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/sync/sync_service_factory.cc +++ chrome/browser/sync/sync_service_factory.cc
@@ -84,7 +84,7 @@ @@ -81,7 +81,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) - BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || #elif BUILDFLAG(IS_ANDROID)
// BUILDFLAG(IS_WIN) #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h"
@@ -130,7 +130,7 @@ std::unique_ptr<KeyedService> BuildSyncService( @@ -132,7 +132,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be // TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is // included in lacros-chrome once build flag switch of lacros-chrome is
// complete. // complete.
@ -18,12 +18,12 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs()); syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
@@ -264,7 +264,7 @@ SyncServiceFactory::SyncServiceFactory() @@ -267,7 +267,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(ProfilePasswordStoreFactory::GetInstance());
DependsOn(PowerBookmarkServiceFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance());
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) - BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance()); DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance());
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || #elif BUILDFLAG(IS_ANDROID)
// BUILDFLAG(IS_WIN) DependsOn(tab_groups::TabGroupSyncServiceFactory::GetInstance());

4
www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/sync/sync_service_util.cc.orig 2023-12-10 06:10:27 UTC --- chrome/browser/sync/sync_service_util.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/sync/sync_service_util.cc +++ chrome/browser/sync/sync_service_util.cc
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
#include "components/sync/base/features.h" #include "components/sync/base/features.h"
@ -9,7 +9,7 @@
#include "components/variations/service/variations_service.h" #include "components/variations/service/variations_service.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN) // BUILDFLAG(IS_WIN)
@@ -22,7 +22,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() { @@ -21,7 +21,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() {
} }
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

6
www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
@@ -25,7 +25,7 @@ namespace autofill::payments { @@ -44,7 +44,7 @@ gfx::Rect GetPopupSizeForVcn3ds() {
DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
ContentAutofillClient* client) ContentAutofillClient* client)
: client_(CHECK_DEREF(client)) { : client_(CHECK_DEREF(client)) {
@ -9,7 +9,7 @@
scoped_observation_.Observe(BrowserList::GetInstance()); scoped_observation_.Observe(BrowserList::GetInstance());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
} }
@@ -48,7 +48,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye @@ -72,7 +72,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
} }
} }

14
www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
@@ -11,7 +11,7 @@ @@ -13,7 +13,7 @@
#include "components/autofill/core/browser/payments/payments_window_manager.h" #include "components/autofill/core/browser/payments/payments_window_manager.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
@ -9,7 +9,7 @@
#include "base/scoped_observation.h" #include "base/scoped_observation.h"
#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/browser_list_observer.h"
@@ -30,7 +30,7 @@ namespace payments { @@ -34,7 +34,7 @@ class PaymentsWindowUserConsentDialogControllerImpl;
// WebContents of the original tab that the pop-up is created in. If there is a // WebContents of the original tab that the pop-up is created in. If there is a
// pop-up currently present, `this` will observe the WebContents of that pop-up. // pop-up currently present, `this` will observe the WebContents of that pop-up.
class DesktopPaymentsWindowManager : public PaymentsWindowManager, class DesktopPaymentsWindowManager : public PaymentsWindowManager,
@ -18,7 +18,7 @@
public BrowserListObserver, public BrowserListObserver,
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
public content::WebContentsObserver { public content::WebContentsObserver {
@@ -47,7 +47,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi @@ -51,7 +51,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
// content::WebContentsObserver: // content::WebContentsObserver:
void WebContentsDestroyed() override; void WebContentsDestroyed() override;
@ -27,9 +27,9 @@
// BrowserListObserver: // BrowserListObserver:
void OnBrowserSetLastActive(Browser* browser) override; void OnBrowserSetLastActive(Browser* browser) override;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -99,7 +99,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi @@ -118,7 +118,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
// ContentAutofillClient that owns `this`. std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl>
const raw_ref<ContentAutofillClient> client_; payments_window_user_consent_dialog_controller_;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)

4
www/chromium/files/patch-chrome_browser_ui_browser.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser.h.orig 2024-02-23 21:04:38 UTC --- chrome/browser/ui/browser.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h
@@ -309,7 +309,7 @@ class Browser : public TabStripModelObserver, @@ -327,7 +327,7 @@ class Browser : public TabStripModelObserver,
std::optional<int64_t> display_id; std::optional<int64_t> display_id;
#endif #endif

12
www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2024-03-22 08:19:40 UTC --- chrome/browser/ui/browser_command_controller.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc
@@ -121,7 +121,7 @@ @@ -124,7 +124,7 @@
#include "components/user_manager/user_manager.h" #include "components/user_manager/user_manager.h"
#endif #endif
@ -9,7 +9,7 @@
#include "ui/base/ime/text_input_flags.h" #include "ui/base/ime/text_input_flags.h"
#include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui.h"
#endif #endif
@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( @@ -306,7 +306,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif #endif
} }
@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then // If this key was registered by the user as a content editing hotkey, then
// it is not reserved. // it is not reserved.
auto* linux_ui = ui::LinuxUi::instance(); auto* linux_ui = ui::LinuxUi::instance();
@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo @@ -558,7 +558,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW: case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize(); browser_->window()->Minimize();
break; break;
@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo @@ -570,7 +570,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break; break;
#endif #endif
@ -36,7 +36,7 @@
case IDC_USE_SYSTEM_TITLE_BAR: { case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = profile()->GetPrefs(); PrefService* prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame, prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -1231,12 +1231,12 @@ void BrowserCommandController::InitCommandState() { @@ -1260,12 +1260,12 @@ void BrowserCommandController::InitCommandState() {
#endif #endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.

4
www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/browser_ui_prefs.cc +++ chrome/browser/ui/browser_ui_prefs.cc
@@ -168,7 +168,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry @@ -175,7 +175,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);

6
www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/chrome_pages.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/chrome_pages.cc +++ chrome/browser/ui/chrome_pages.cc
@@ -82,7 +82,7 @@ @@ -85,7 +85,7 @@
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h" #include "chrome/browser/web_applications/web_app_utils.h"
#endif #endif
@@ -716,7 +716,7 @@ void ShowShortcutCustomizationApp(Profile* profile, @@ -720,7 +720,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
} }
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/chrome_pages.h.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/chrome_pages.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/chrome_pages.h +++ chrome/browser/ui/chrome_pages.h
@@ -38,7 +38,7 @@ enum class ConsentLevel; @@ -38,7 +38,7 @@ enum class ConsentLevel;
} // namespace signin } // namespace signin
@ -9,7 +9,7 @@
namespace web_app { namespace web_app {
enum class AppSettingsPageEntryPoint; enum class AppSettingsPageEntryPoint;
} // namespace web_app } // namespace web_app
@@ -262,7 +262,7 @@ void ShowShortcutCustomizationApp(Profile* profile, @@ -263,7 +263,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

6
www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -88,7 +88,7 @@ int ManagePasswordsUIController::save_fallback_timeout @@ -92,7 +92,7 @@ int ManagePasswordsUIController::save_fallback_timeout
namespace { namespace {
@ -9,7 +9,7 @@
// Should be kept in sync with constant declared in // Should be kept in sync with constant declared in
// bubble_controllers/relaunch_chrome_bubble_controller.cc. // bubble_controllers/relaunch_chrome_bubble_controller.cc.
constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
@@ -477,7 +477,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor @@ -481,7 +481,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
} }
void ManagePasswordsUIController::OnKeychainError() { void ManagePasswordsUIController::OnKeychainError() {

4
www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/signin/signin_view_controller.cc +++ chrome/browser/ui/signin/signin_view_controller.cc
@@ -255,7 +255,7 @@ void SigninViewController::ShowModalManagedUserNoticeD @@ -337,7 +337,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
bool show_link_data_option, bool show_link_data_option,
signin::SigninChoiceCallback callback) { signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc +++ chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -105,7 +105,7 @@ const char* const kBadFlags[] = { @@ -106,7 +106,7 @@ const char* const kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.

10
www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc +++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -135,7 +135,7 @@ @@ -136,7 +136,7 @@
#include "chrome/credential_provider/common/gcp_strings.h" #include "chrome/credential_provider/common/gcp_strings.h"
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h" #include "components/headless/policy/headless_mode_policy.h"
@@ -962,7 +962,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( @@ -964,7 +964,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line); ComputeAndRecordLaunchMode(command_line);
@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() && if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled( headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) { g_browser_process->local_state())) {
@@ -1060,7 +1060,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( @@ -1077,7 +1077,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true; silent_launch = true;
} }
@ -27,7 +27,7 @@
// Writes open and installed web apps to the specified file without // Writes open and installed web apps to the specified file without
// launching a new browser window or tab. // launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1270,7 +1270,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( @@ -1287,7 +1287,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
<< "Failed launch with app: couldn't pick a profile"; << "Failed launch with app: couldn't pick a profile";
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);

6
www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/tab_helpers.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/tab_helpers.cc +++ chrome/browser/ui/tab_helpers.cc
@@ -233,7 +233,7 @@ @@ -236,7 +236,7 @@
#endif #endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h" #include "chrome/browser/ui/hats/hats_helper.h"
@@ -673,12 +673,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con @@ -681,12 +681,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \

4
www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2023-12-10 06:10:27 UTC --- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r @@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
? stringifier_->backgrounded_string() ? stringifier_->backgrounded_string()
@ -18,7 +18,7 @@
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int proc1_fd_count = const int proc1_fd_count =
observed_task_manager()->GetOpenFdCount(tasks_[row1]); observed_task_manager()->GetOpenFdCount(tasks_[row1]);
@@ -799,7 +799,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col @@ -806,7 +806,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
type = REFRESH_TYPE_KEEPALIVE_COUNT; type = REFRESH_TYPE_KEEPALIVE_COUNT;
break; break;

4
www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-08-17 07:33:31 UTC --- chrome/browser/ui/test/test_browser_ui.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/test/test_browser_ui.cc +++ chrome/browser/ui/test/test_browser_ui.cc
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
@ -10,7 +10,7 @@
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "ui/base/test/skia_gold_matching_algorithm.h" #include "ui/base/test/skia_gold_matching_algorithm.h"
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
// TODO(https://crbug.com/958242) support Mac for pixel tests. // TODO(crbug.com/40625383) support Mac for pixel tests.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))

4
www/chromium/files/patch-chrome_browser_ui_ui__features.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/ui_features.cc.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/ui_features.cc.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/ui_features.cc +++ chrome/browser/ui/ui_features.cc
@@ -410,7 +410,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, @@ -426,7 +426,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
"TopChromeWebUIUsesSpareRenderer", "TopChromeWebUIUsesSpareRenderer",
base::FEATURE_ENABLED_BY_DEFAULT); base::FEATURE_ENABLED_BY_DEFAULT);

4
www/chromium/files/patch-chrome_browser_ui_ui__features.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/ui_features.h.orig 2024-04-19 13:02:56 UTC --- chrome/browser/ui/ui_features.h.orig 2024-05-21 18:07:39 UTC
+++ chrome/browser/ui/ui_features.h +++ chrome/browser/ui/ui_features.h
@@ -264,7 +264,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); @@ -279,7 +279,7 @@ bool IsToolbarPinningEnabled();
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);

Some files were not shown because too many files have changed in this diff Show more