diff --git a/www/iridium/Makefile b/www/iridium/Makefile index e6d4c84d13ef..9e9b8e94aa5f 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,360 +1,360 @@ PORTNAME= iridium -PORTVERSION= 2025.04.135.2 +PORTVERSION= 2025.05.136 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= -browser DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ pulseaudio-${PULSEV}.tar.gz:pulseaudio MAINTAINER= chromium@FreeBSD.org COMMENT= Iridium browser WWW= https://iridiumbrowser.de/ LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ bindgen:devel/rust-bindgen-cli \ gperf:devel/gperf \ flock:sysutils/flock \ node:www/node \ rustc:lang/rust \ xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${LOCALBASE}/include/va/va.h:multimedia/libva \ ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \ ${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \ ${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libepoll-shim.so:devel/libepoll-shim \ libffi.so:devel/libffi \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libdav1d.so:multimedia/dav1d \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon \ libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \ python:build qt:5 shebangfix tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome USE_GL= gbm gl USE_GNOME= atk dconf gdkpixbuf glib20 gtk30 libxml2 libxslt USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_QT= buildtools:build SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome BINARY_ALIAS= python3=${PYTHON_CMD} \ moc=${PREFIX}/bin/moc-qt5 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ chrome_pgo_phase=0 \ enable_backup_ref_ptr_support=false \ enable_hangout_services_extension=true \ enable_nacl=false \ enable_remoting=false \ fatal_linker_warnings=false \ icu_use_data_file=false \ is_clang=true \ optimize_webui=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=true \ use_custom_libunwind=true \ use_lld=true \ use_partition_alloc=true \ use_partition_alloc_as_malloc=false \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libffi=true \ use_system_libjpeg=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles SUB_FILES= iridium-browser.desktop iridium SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS LTO PIPEWIRE OPTIONS_DEFAULT= CODECS CUPS KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes CODECS_DESC= Compile and enable patented codecs like H.264 HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) 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 \ FFMPEG_BRAND="Chrome" CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ FFMPEG_BRAND="Chromium" CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="60 GB" \ WANTMEM="32 GB" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ WANTSPACE="35 GB" \ WANTMEM="8 GB" HEIMDAL_LIB_DEPENDS= libkrb.so.26:security/heimdal KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false LTO_VARS= GN_ARGS+=use_thin_lto=true \ GN_ARGS+=thin_lto_enable_optimizations=true \ WANTSPACE="40 GB" \ WANTMEM="16 GB" LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 PIPEWIRE_DESC= Screen capture via PipeWire PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ GN_ARGS+=rtc_link_pipewire=true PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true \ PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include .include # for COMPILER_VERSION .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif LLVM_DEFAULT= 19 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} # - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only # - map ffmpeg target to ${ARCH} .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " FFMPEG_TARGET= arm64 .elif ${ARCH} == amd64 BUILD_DEPENDS+= nasm:devel/nasm PLIST_SUB+= NOT_AARCH64="" FFMPEG_TARGET= x64 .elif ${ARCH} == i386 BUILD_DEPENDS+= nasm:devel/nasm PLIST_SUB+= NOT_AARCH64="" FFMPEG_TARGET= ia32 .endif 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} # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include # rust RUSTC_VERSION!= rustc -V 2>/dev/null || true MAKE_ENV+= RUSTC_BOOTSTRAP=1 GN_ARGS+= enable_rust=true \ rust_sysroot_absolute="${LOCALBASE}" \ rustc_version="${RUSTC_VERSION}" pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build ${PORTNAME}, you should have at least:" @${ECHO_MSG} "- ${WANTMEM} of memory" @${ECHO_MSG} "- ${WANTSPACE} of free disk space" @${ECHO_MSG} "- 1.5 million free inodes" @${ECHO_MSG} pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ dav1d flac fontconfig harfbuzz-ng libdrm libpng \ libusb libwebp libxml libxslt openh264 opus || ${FALSE} # Iridium uses an unreleased version of FFmpeg, so configure it cd ${WRKSRC}/media/ffmpeg && \ ${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \ --config-only --branding=${FFMPEG_BRAND} cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h ${MKDIR} ${FFMPEG_CDIR} .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ ${WRKSRC}/build/rust/rust_bindgen.gni \ ${WRKSRC}/build/rust/rust_bindgen_generator.gni do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node # Setup buildtools/freebsd @${MKDIR} ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd ${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${PREFIX}/share/man/man1/iridium.1 @${SED} -i "" -e 's,\@\@PACKAGE\@\@,chromium,g;s,\@\@MENUNAME\@\@,Iridium Web Browser,g' \ ${STAGEDIR}${PREFIX}/share/man/man1/iridium.1 ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/iridium.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor .for d in snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR}/iridium cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/iridium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin # ANGLE, EGL, Vk .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \ ${STAGEDIR}${DATADIR}/libvulkan.so .if ${BUILDTYPE} == Debug ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR} .endif # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/vk_swiftshader_icd.json ${STAGEDIR}${DATADIR} .endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} .include diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 4f92424776df..dbf00976ab06 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1745557935 -SHA256 (iridium-browser-2025.04.135.2.tar.xz) = e7d90794da9fb086fd56dc0aaa19d4c4c2b4652bdde0ceabf3fd981d4aa896ed -SIZE (iridium-browser-2025.04.135.2.tar.xz) = 2985921092 +TIMESTAMP = 1746603498 +SHA256 (iridium-browser-2025.05.136.tar.xz) = d75bea5e33d144d35f684a73720f0d191d8beae811845aedb0ef92e2bfdc597f +SIZE (iridium-browser-2025.05.136.tar.xz) = 3044323008 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 4320cea3fdb7..5999930ba76c 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,98 +1,98 @@ ---- BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ BUILD.gn @@ -71,7 +71,7 @@ declare_args() { root_extra_deps = [] } -if (is_official_build) { +if (is_official_build && !is_bsd) { # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) @@ -103,7 +103,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", - "//infra/orchestrator:orchestrator_all", "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -448,7 +447,7 @@ group("gn_all") { +@@ -449,7 +448,7 @@ group("gn_all") { } } - if (is_linux || is_chromeos || is_android) { + if ((is_linux && !is_bsd) || is_chromeos || is_android) { deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -638,6 +637,15 @@ group("gn_all") { +@@ -636,6 +635,15 @@ group("gn_all") { } } + if (is_bsd) { + deps -= [ + "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", + "//third_party/breakpad:microdump_stackwalk($host_system_allocator_toolchain)", + "//third_party/breakpad:minidump_dump($host_system_allocator_toolchain)", + "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)", + ] + } + if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -686,7 +694,7 @@ group("gn_all") { +@@ -684,7 +692,7 @@ group("gn_all") { } } - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -721,7 +729,7 @@ group("gn_all") { +@@ -719,7 +727,7 @@ group("gn_all") { ] } - if (is_mac || is_win || is_android || is_linux || is_chromeos) { + if (!is_bsd && (is_mac || is_win || is_android || is_linux || is_chromeos)) { deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -1126,7 +1134,7 @@ if (use_blink && !is_cronet_build) { +@@ -1128,7 +1136,7 @@ if (use_blink && !is_cronet_build) { + "//third_party/blink/public:all_blink", ] - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && -- !is_castos) { -+ !is_castos && !is_bsd) { +- if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) { ++ if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { deps += [ ":chrome_wpt_tests", ":headless_shell_wpt", -@@ -1273,7 +1281,7 @@ if (use_blink && !is_cronet_build) { +@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1287,7 +1295,7 @@ if (use_blink && !is_cronet_build) { +@@ -1289,7 +1297,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } - if (is_linux || is_chromeos) { + if ((is_linux && !is_bsd) || is_chromeos) { # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1757,7 +1765,7 @@ group("chromium_builder_perf") { +@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } - if (!is_win) { + if (!is_win && !is_bsd) { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)" ] } } diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 43fe9551f298..0df8368607d4 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,150 +1,150 @@ ---- base/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- base/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ base/BUILD.gn -@@ -1094,11 +1094,26 @@ component("base") { +@@ -1104,11 +1104,26 @@ component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && + if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } + # *BSD needs libkvm + if (is_bsd) { + libs += [ + "kvm", + "epoll-shim", + ] + } + + if (is_freebsd) { + libs += [ + "execinfo", + "util", + ] + } + if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1118,7 +1133,7 @@ component("base") { +@@ -1128,7 +1143,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings - if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { + if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2142,6 +2157,22 @@ component("base") { +@@ -2152,6 +2167,22 @@ component("base") { ] } + if (is_openbsd) { + sources += [ + "process/process_handle_openbsd.cc", + "process/process_iterator_openbsd.cc", + "process/process_metrics_openbsd.cc", + "system/sys_info_openbsd.cc", + ] + } else if (is_freebsd) { + sources += [ + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", + "system/sys_info_freebsd.cc", + ] + } + # iOS if (is_ios) { sources += [ -@@ -2300,6 +2331,33 @@ component("base") { +@@ -2312,6 +2343,33 @@ component("base") { } } + if (is_bsd) { + sources -= [ + "files/file_path_watcher_inotify.cc", + "files/scoped_file_linux.cc", + "process/set_process_title_linux.cc", + "process/set_process_title_linux.h", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", + "process/process_linux.cc", + "process/process_metrics_linux.cc", + "process/process_handle_linux.cc", + "profiler/stack_copier_signal.cc", + "profiler/stack_copier_signal.h", + "profiler/thread_delegate_posix.cc", + "profiler/thread_delegate_posix.h", + "threading/platform_thread_linux.cc", + "stack_canary_linux.cc", + "stack_canary_linux.h", + ] + sources += [ + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "files/file_path_watcher_bsd.cc", + "threading/platform_thread_bsd.cc", + ] + } + if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2649,7 +2707,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2690,7 +2748,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" - protected_memory_enabled = !is_component_build && is_clang && + protected_memory_enabled = !is_openbsd && !is_component_build && is_clang && (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3122,7 +3180,7 @@ if (is_apple) { +@@ -3163,7 +3221,7 @@ if (is_apple) { } } -if (!is_nacl && (is_linux || is_chromeos)) { +if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) { # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3808,7 +3866,7 @@ test("base_unittests") { +@@ -3851,7 +3909,7 @@ test("base_unittests") { ] } - if (is_linux || is_chromeos) { + if (!is_bsd && (is_linux || is_chromeos)) { sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3836,7 +3894,7 @@ test("base_unittests") { +@@ -3879,7 +3937,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3847,7 +3905,7 @@ test("base_unittests") { +@@ -3890,7 +3948,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings - if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { + if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4037,7 +4095,7 @@ test("base_unittests") { +@@ -4080,7 +4138,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } - if (is_fuchsia || is_linux || is_chromeos) { + if ((is_fuchsia || is_linux || is_chromeos) && !is_bsd) { sources += [ "debug/elf_reader_unittest.cc", "debug/test_elf_image_builder.cc", diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index bf1bcd159fcf..fa97d288bda7 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,29 +1,29 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-03-18 16:46:04 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-05-07 06:48:23 UTC +++ base/allocator/partition_allocator/partition_alloc.gni @@ -89,7 +89,7 @@ if (is_nacl) { + # TODO(crbug.com/329199197): Clean this up when experiments are complete. use_large_empty_slot_span_ring = true - has_memory_tagging = -- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) -+ current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) +-has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && ++has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && + !is_hwasan && (is_linux || is_android) declare_args() { - # Debug configuration. -@@ -347,7 +347,7 @@ declare_args() { +@@ -348,7 +348,7 @@ declare_args() { declare_args() { # Shadow metadata is still under development and only supports Linux # for now. - enable_shadow_metadata = is_linux && has_64_bit_pointers + enable_shadow_metadata = !is_bsd && is_linux && has_64_bit_pointers } declare_args() { -@@ -490,7 +490,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -491,7 +491,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = - (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build + !is_bsd && (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build declare_args() { enable_pkeys = is_pkeys_available } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index 0b789186f2d5..a2b07a07ede7 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -884,7 +884,7 @@ if (is_clang_or_gcc) { +@@ -886,7 +886,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } - if (is_chromeos || is_linux) { + if ((is_chromeos || is_linux) && !is_bsd) { shim_headers += [ "shim/allocator_shim_override_cpp_symbols.h", "shim/allocator_shim_override_glibc_weak_symbols.h", diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc index ee58d0297aef..73cfc961e32d 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-02-22 18:06:53 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-05-07 06:48:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc @@ -18,7 +18,7 @@ #include "partition_alloc/partition_alloc_base/logging.h" #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h" -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include - #include + #endif diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc index adb24c89d670..60e03248a5c4 100644 --- a/www/iridium/files/patch-base_files_file__util__posix.cc +++ b/www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,49 +1,48 @@ ---- base/files/file_util_posix.cc.orig 2025-04-16 18:18:42 UTC +--- base/files/file_util_posix.cc.orig 2025-05-07 06:48:23 UTC +++ base/files/file_util_posix.cc -@@ -902,6 +902,8 @@ bool CreateNewTempDirectory(const FilePath::StringType +@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePath::StringType bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). + const FilePath kFileSystemRoot("/"); -+ + // Avoid checking subdirs if directory already exists. if (DirectoryExists(full_path)) { - return true; -@@ -910,8 +912,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p // Collect a list of all missing directories. std::vector missing_subpaths({full_path}); FilePath last_path = full_path; - for (FilePath path = full_path.DirName(); path.value() != last_path.value(); - path = path.DirName()) { + for (FilePath path = full_path.DirName(); (path.value() != last_path.value() && + (path != kFileSystemRoot)); path = path.DirName()) { if (DirectoryExists(path)) { break; } -@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p + } + #endif // BUILDFLAG(IS_CHROMEOS) - // Iterate through the missing directories and create. - for (const FilePath& subpath : base::Reversed(missing_subpaths)) { -- if (mkdir(subpath.value().c_str(), 0700) == 0) { +- if (mkdir(subpath.value().c_str(), mode) == 0) { - continue; - } - // Mkdir failed, but it might have failed with EEXIST, or some other error - // due to the directory appearing out of thin air. This can occur if - // two processes are trying to create the same file system tree at the same - // time. Check to see if it exists and make sure it is a directory. - int saved_errno = errno; - if (!DirectoryExists(subpath)) { - if (error) { -+ if ((mkdir(subpath.value().c_str(), 0700) == -1) && ++ if ((mkdir(subpath.value().c_str(), mode) == -1) && + ((full_path != subpath) ? (errno != ENOENT) : (-1))) { + int saved_errno = errno; + if (error) *error = File::OSErrorToFileError(saved_errno); - } - errno = saved_errno; return false; } + errno = 0; } return true; } diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index aa891a646d72..5db923b197a7 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2024-06-25 12:08:48 UTC +--- base/i18n/icu_util.cc.orig 2025-05-07 06:48:23 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() { +@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); -#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) +#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc index 62555f77c5b3..bb7e6f40220a 100644 --- a/www/iridium/files/patch-base_logging__unittest.cc +++ b/www/iridium/files/patch-base_logging__unittest.cc @@ -1,31 +1,31 @@ ---- base/logging_unittest.cc.orig 2025-04-16 18:18:42 UTC +--- base/logging_unittest.cc.orig 2025-05-07 06:48:23 UTC +++ base/logging_unittest.cc @@ -40,7 +40,7 @@ #include "base/posix/eintr_wrapper.h" #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) #include #endif -@@ -588,14 +588,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; -#if BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FREEBSD) crash_addr = reinterpret_cast(info->si_addr); #else // OS_* ucontext_t* context = reinterpret_cast(context_ptr); #if defined(ARCH_CPU_X86) crash_addr = static_cast(context->uc_mcontext.gregs[REG_EIP]); #elif defined(ARCH_CPU_X86_64) +#if BUILDFLAG(IS_OPENBSD) + crash_addr = static_cast(context->sc_rip); +#else crash_addr = static_cast(context->uc_mcontext.gregs[REG_RIP]); +#endif #elif defined(ARCH_CPU_ARMEL) crash_addr = static_cast(context->uc_mcontext.arm_pc); #elif defined(ARCH_CPU_ARM64) diff --git a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc index 67a46f746e33..cf0c2b4b7ff6 100644 --- a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc +++ b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc @@ -1,59 +1,59 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2025-04-16 18:18:42 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2025-05-07 06:48:23 UTC +++ base/profiler/stack_base_address_posix.cc -@@ -17,6 +17,10 @@ +@@ -18,6 +18,10 @@ #include "base/files/scoped_file.h" #endif +#if BUILDFLAG(IS_BSD) +#include +#endif + #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -47,7 +51,21 @@ std::optional GetAndroidMainThreadStackBase +@@ -49,7 +53,21 @@ std::optional GetAndroidMainThreadStackBase #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { +#if BUILDFLAG(IS_OPENBSD) + stack_t ss; + void *address; + size_t size; + if (pthread_stackseg_np(pthread_id, &ss) != 0) + return 0; + size = ss.ss_size; + address = (void*)((size_t) ss.ss_sp - ss.ss_size); +#else pthread_attr_t attr; +#if BUILDFLAG(IS_FREEBSD) + int result; + pthread_attr_init(&attr); + pthread_attr_get_np(pthread_id, &attr); +#else // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox // and pthread_id refers to a different thread, due to the use of // sched_getaffinity(). -@@ -60,12 +78,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr +@@ -62,12 +80,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr << logging::SystemErrorCodeToString(result); // See crbug.com/617730 for limitations of this approach on Linux-like // systems. +#endif void* address; size_t size; result = pthread_attr_getstack(&attr, &address, &size); CHECK_EQ(result, 0) << "pthread_attr_getstack returned " << logging::SystemErrorCodeToString(result); pthread_attr_destroy(&attr); +#endif const uintptr_t base_address = reinterpret_cast(address) + size; return base_address; } -@@ -82,7 +102,7 @@ std::optional GetThreadStackBaseAddress(Pla +@@ -84,7 +104,7 @@ std::optional GetThreadStackBaseAddress(Pla // trying to work around the problem. return std::nullopt; #else - const bool is_main_thread = id.raw() == GetCurrentProcId(); + const bool is_main_thread = id.raw() == (checked_cast(GetCurrentProcId())); if (is_main_thread) { #if BUILDFLAG(IS_ANDROID) // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h index 25c260641b9e..14a7b6f9ef8e 100644 --- a/www/iridium/files/patch-base_rand__util.h +++ b/www/iridium/files/patch-base_rand__util.h @@ -1,11 +1,11 @@ ---- base/rand_util.h.orig 2025-03-18 16:46:04 UTC +--- base/rand_util.h.orig 2025-05-07 06:48:23 UTC +++ base/rand_util.h -@@ -209,7 +209,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } -#if BUILDFLAG(IS_POSIX) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD) BASE_EXPORT int GetUrandomFD(); #endif diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc index 6ded913ac652..751d23d50a91 100644 --- a/www/iridium/files/patch-base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_rand__util__posix.cc @@ -1,62 +1,62 @@ ---- base/rand_util_posix.cc.orig 2025-03-18 16:46:04 UTC +--- base/rand_util_posix.cc.orig 2025-05-07 06:48:23 UTC +++ base/rand_util_posix.cc -@@ -28,7 +28,7 @@ +@@ -29,7 +29,7 @@ #include "base/time/time.h" #include "build/build_config.h" -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -44,6 +44,7 @@ namespace base { +@@ -45,6 +45,7 @@ namespace base { namespace { +#if !BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -68,10 +69,11 @@ class URandomFd { +@@ -69,10 +70,11 @@ class URandomFd { private: const int fd_; }; +#endif #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_ANDROID)) && \ - !BUILDFLAG(IS_NACL) + !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // TODO(pasko): Unify reading kernel version numbers in: - // mojo/core/channel_linux.cc - // chrome/browser/android/seccomp_support_detector.cc -@@ -156,6 +158,7 @@ bool UseBoringSSLForRandBytes() { + + bool KernelSupportsGetRandom() { + return base::SysInfo::KernelVersionNumber::Current() >= +@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span output, bool avoid_allocation) { +#if !BUILDFLAG(IS_BSD) #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -190,6 +193,9 @@ void RandBytesInternal(span output, bool avoi +@@ -163,6 +166,9 @@ void RandBytesInternal(span output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); +#else + arc4random_buf(output.data(), output.size()); +#endif } } // namespace -@@ -209,9 +215,11 @@ void RandBytes(span output) { +@@ -182,9 +188,11 @@ void RandBytes(span output) { RandBytesInternal(output, /*avoid_allocation=*/false); } +#if !BUILDFLAG(IS_BSD) int GetUrandomFD() { static NoDestructor urandom_fd; return urandom_fd->fd(); } +#endif } // namespace base diff --git a/www/iridium/files/patch-base_synchronization_lock__impl.h b/www/iridium/files/patch-base_synchronization_lock__impl.h index 10dd083aa6ba..dec4ea589880 100644 --- a/www/iridium/files/patch-base_synchronization_lock__impl.h +++ b/www/iridium/files/patch-base_synchronization_lock__impl.h @@ -1,23 +1,23 @@ ---- base/synchronization/lock_impl.h.orig 2024-08-27 06:28:16 UTC +--- base/synchronization/lock_impl.h.orig 2025-05-07 06:48:23 UTC +++ base/synchronization/lock_impl.h -@@ -109,6 +109,10 @@ void LockImpl::Unlock() { +@@ -110,6 +110,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FREEBSD) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" +#endif #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -129,6 +133,9 @@ void LockImpl::Unlock() { +@@ -130,6 +134,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } +#if BUILDFLAG(IS_FREEBSD) +#pragma GCC diagnostic pop +#endif #endif // This is an implementation used for AutoLock templated on the lock type. diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h index 6778c9e5c175..01e59a4edf86 100644 --- a/www/iridium/files/patch-base_system_sys__info.h +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -1,20 +1,20 @@ ---- base/system/sys_info.h.orig 2025-03-18 16:46:04 UTC +--- base/system/sys_info.h.orig 2025-05-07 06:48:23 UTC +++ base/system/sys_info.h -@@ -332,6 +332,8 @@ class BASE_EXPORT SysInfo { +@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif + static uint64_t MaxSharedMemorySize(); + private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -344,7 +346,7 @@ class BASE_EXPORT SysInfo { +@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) static uint64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); #endif diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index 2f83be1da31b..12884cf495f8 100644 --- a/www/iridium/files/patch-base_system_sys__info__posix.cc +++ b/www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,29 +1,29 @@ ---- base/system/sys_info_posix.cc.orig 2025-03-18 16:46:04 UTC +--- base/system/sys_info_posix.cc.orig 2025-05-07 06:48:23 UTC +++ base/system/sys_info_posix.cc -@@ -124,7 +124,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* major_version, namespace base { -#if !BUILDFLAG(IS_OPENBSD) +#if !BUILDFLAG(IS_BSD) // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -180,7 +180,7 @@ int SysInfo::NumberOfProcessors() { +@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -268,6 +268,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; + } else if (arch == "arm64") { + arch = "aarch64"; } else if (std::string(info.sysname) == "AIX") { arch = "ppc64"; } diff --git a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 77093e601a3a..090206ee768c 100644 --- a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,20 +1,20 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2025-03-18 16:46:04 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2025-05-07 06:48:23 UTC +++ base/task/thread_pool/environment_config_unittest.cc -@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) - EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread()); - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ +@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio + base::FeatureList::IsEnabled( + FeatureControllingBackgroundPriorityWorkerThreads())); + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block -@@ -23,7 +23,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio +@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread()); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) EXPECT_FALSE(CanUseUtilityThreadTypeForWorkerThread()); #else #error Platform doesn't match any block diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index 655297e96d0a..2941b0421d93 100644 --- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,45 +1,45 @@ ---- build/config/BUILDCONFIG.gn.orig 2025-02-22 18:06:53 UTC +--- build/config/BUILDCONFIG.gn.orig 2025-05-07 06:48:23 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || + is_clang = current_os != "linux" || current_os == "openbsd" || + current_os == "freebsd" || (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -234,6 +235,10 @@ if (host_toolchain == "") { +@@ -235,6 +236,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" + } else if (host_os == "openbsd") { + host_toolchain = "//build/toolchain/openbsd:clang_$host_cpu" + } else if (host_os == "freebsd") { + host_toolchain = "//build/toolchain/freebsd:clang_$host_cpu" } else { assert(false, "Unsupported host_os: $host_os") } -@@ -278,6 +283,8 @@ if (target_os == "android") { +@@ -279,6 +284,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" +} else if (target_os == "openbsd" || target_os == "freebsd") { + _default_toolchain = host_toolchain } else { assert(false, "Unsupported target_os: $target_os") } -@@ -312,7 +319,11 @@ is_android = current_os == "android" +@@ -313,7 +320,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" -is_linux = current_os == "linux" +is_linux = current_os == "linux" || current_os == "openbsd" || + current_os == "freebsd" +is_openbsd = current_os == "openbsd" +is_freebsd = current_os == "freebsd" +is_bsd = current_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" - is_watchos = current_os == "watchos" + is_wasm = current_os == "emscripten" diff --git a/www/iridium/files/patch-build_config_clang_BUILD.gn b/www/iridium/files/patch-build_config_clang_BUILD.gn index 2cb8c0bcbda0..9d9ec1d3c295 100644 --- a/www/iridium/files/patch-build_config_clang_BUILD.gn +++ b/www/iridium/files/patch-build_config_clang_BUILD.gn @@ -1,16 +1,16 @@ ---- build/config/clang/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- build/config/clang/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ build/config/clang/BUILD.gn -@@ -251,7 +251,12 @@ template("clang_lib") { +@@ -252,7 +252,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { - if (is_mac) { + if (is_bsd) { + # Since there's no Rust in the toolchain, there's no concern that we'll use + # the Rust stdlib's intrinsics here. + # + # Don't define libname which makes this target do nothing. + } else if (is_mac) { libname = "osx" } else if (is_ios) { - if (target_environment == "simulator") { + if (target_platform == "iphoneos") { diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index b07cbc4dc8e4..faa794dcc771 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,137 +1,131 @@ ---- build/config/compiler/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- build/config/compiler/BUILD.gn.orig 2025-05-07 13:10:49 UTC +++ build/config/compiler/BUILD.gn -@@ -198,7 +198,7 @@ declare_args() { +@@ -197,7 +197,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. - simple_template_names = is_clang && !is_nacl && !is_win && !is_apple + simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd } declare_args() { -@@ -255,13 +255,16 @@ config("default_include_dirs") { +@@ -254,13 +254,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { - if (!using_sanitizer && + if (!using_sanitizer && !is_bsd && (is_linux || is_chromeos || is_android || is_fuchsia)) { ldflags = [ "-Wl,-z,defs", "-Wl,--as-needed", ] } + if (current_cpu == "x86" && is_openbsd) { + ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ] + } } # compiler --------------------------------------------------------------------- -@@ -519,6 +522,10 @@ config("compiler") { +@@ -508,6 +511,10 @@ config("compiler") { } } + if (is_openbsd) { + ldflags += [ "-Wl,-z,wxneeded" ] + } + # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -578,7 +585,7 @@ config("compiler") { +@@ -567,7 +574,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } - if (is_clang && !is_nacl) { + if (is_clang && !is_nacl && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") { +@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { - if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { + if (is_clang && !is_android && !is_nacl && !is_chromeos_device && !is_bsd) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1238,7 +1245,7 @@ config("compiler_cpu_abi") { +@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && - !is_chromeos_device) { + !is_chromeos_device && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1572,7 +1579,7 @@ config("compiler_deterministic") { +@@ -1561,7 +1568,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. - if (is_nacl) { + if (is_nacl || is_bsd) { # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1630,7 +1637,7 @@ config("compiler_deterministic") { +@@ -1619,7 +1626,7 @@ config("compiler_deterministic") { } config("clang_revision") { - if (is_clang && clang_base_path == default_clang_base_path && + if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && current_os != "zos") { update_args = [ "--print-revision", -@@ -1960,23 +1967,12 @@ config("default_warnings") { - ] - } +@@ -1652,7 +1659,7 @@ config("clang_revision") { + # e.g. by setting in the the project's .gn file. + config("clang_warning_suppression") { + # Some build configs use older versions of clang that don't support WSMs +- if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && ++ if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" && + !llvm_android_mainline && is_clang && + clang_warning_suppression_file != "") { + from_build_root = +@@ -1985,9 +1992,6 @@ config("default_warnings") { -- cflags += [ -- # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. -- "-Wno-cast-function-type", -- -- # TODO(crbug.com/40284799): Fix and re-enable. -- "-Wno-thread-safety-reference-return", + # TODO(crbug.com/40284799): Fix and re-enable. + "-Wno-thread-safety-reference-return", - - # TODO(crbug.com/376641662): Fix and re-enable. - "-Wno-nontrivial-memcall", -- ] -- - cflags_cc += [ - # TODO(crbug.com/328490295): Fix and re-enable for C flags. - "-Wenum-compare-conditional", ] -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - cflags_cc += [ - # TODO(crbug.com/41486292): Fix and re-enable. - "-Wno-c++11-narrowing-const-reference", -@@ -2742,7 +2738,7 @@ config("afdo_optimize_size") { + cflags_cc += [ +@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { - if (is_clang) { + if (is_clang && !is_bsd) { cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2769,7 +2765,7 @@ config("afdo") { +@@ -2803,7 +2807,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } - } else if (auto_profile_path != "" && is_a_target_toolchain) { + } else if (auto_profile_path != "" && is_a_target_toolchain && !is_bsd) { cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2946,7 +2942,7 @@ config("symbols") { +@@ -2980,7 +2984,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } - if (is_clang && (!is_nacl || is_nacl_saigo)) { + if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) { if (is_apple) { # TODO(crbug.com/40117949): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. diff --git a/www/iridium/files/patch-build_config_ozone.gni b/www/iridium/files/patch-build_config_ozone.gni index 8b71da74b934..7ee2990192c0 100644 --- a/www/iridium/files/patch-build_config_ozone.gni +++ b/www/iridium/files/patch-build_config_ozone.gni @@ -1,19 +1,19 @@ ---- build/config/ozone.gni.orig 2025-04-16 18:18:42 UTC +--- build/config/ozone.gni.orig 2025-05-07 06:48:23 UTC +++ build/config/ozone.gni -@@ -81,7 +81,15 @@ declare_args() { +@@ -80,7 +80,15 @@ declare_args() { ozone_platform = "x11" ozone_platform_drm = true ozone_platform_x11 = true - } else if (is_linux) { + } else if (is_linux && !is_bsd) { + ozone_platform = "x11" + ozone_platform_wayland = true + ozone_platform_x11 = true + } else if (is_openbsd) { + ozone_platform = "x11" + ozone_platform_wayland = false + ozone_platform_x11 = true + } else if (is_freebsd) { ozone_platform = "x11" ozone_platform_wayland = true ozone_platform_x11 = true diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni index 00a7a6f73648..9bb3bfd26cff 100644 --- a/www/iridium/files/patch-build_config_rust.gni +++ b/www/iridium/files/patch-build_config_rust.gni @@ -1,13 +1,13 @@ ---- build/config/rust.gni.orig 2025-02-22 18:06:53 UTC +--- build/config/rust.gni.orig 2025-05-07 06:48:23 UTC +++ build/config/rust.gni -@@ -297,6 +297,10 @@ if (is_linux || is_chromeos) { +@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) { } } +if (is_bsd) { + rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) +} + assert(!toolchain_has_rust || rust_abi_target != "") # This variable is passed to the Rust libstd build. diff --git a/www/iridium/files/patch-build_rust_std_BUILD.gn b/www/iridium/files/patch-build_rust_std_BUILD.gn index 45d8c394faa5..d0b722a2cab3 100644 --- a/www/iridium/files/patch-build_rust_std_BUILD.gn +++ b/www/iridium/files/patch-build_rust_std_BUILD.gn @@ -1,19 +1,32 @@ ---- build/rust/std/BUILD.gn.orig 2025-03-18 16:46:04 UTC +--- build/rust/std/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ build/rust/std/BUILD.gn -@@ -89,7 +89,7 @@ if (toolchain_has_rust) { +@@ -89,13 +89,20 @@ if (toolchain_has_rust) { # These are no longer present in the Windows toolchain. stdlib_files += [ "addr2line", - "adler2", -+ "adler", "gimli", "libc", "memchr", -@@ -115,7 +115,6 @@ if (toolchain_has_rust) { + "miniz_oxide", + "object", + ] ++ ++ rust_revision_pieces = string_split(rustc_revision, " ") ++ rust_version_pieces = string_split(rust_revision_pieces[1], ".") ++ if (rust_version_pieces[1] == "85") { ++ stdlib_files += [ "adler" ] ++ } else { ++ stdlib_files += [ "adler2" ] ++ } + } + + if (toolchain_for_rust_host_build_tools) { +@@ -115,7 +122,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [ - "profiler_builtins", "rustc_std_workspace_alloc", "rustc_std_workspace_core", "rustc_std_workspace_std", diff --git a/www/iridium/files/patch-build_toolchain_toolchain.gni b/www/iridium/files/patch-build_toolchain_toolchain.gni index 64dd88aa0248..956b9a58f7cd 100644 --- a/www/iridium/files/patch-build_toolchain_toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_toolchain.gni @@ -1,11 +1,11 @@ ---- build/toolchain/toolchain.gni.orig 2025-04-16 18:18:42 UTC +--- build/toolchain/toolchain.gni.orig 2025-05-07 06:48:23 UTC +++ build/toolchain/toolchain.gni -@@ -72,7 +72,7 @@ if (host_os == "mac") { +@@ -75,7 +75,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" -} else if (host_os == "linux" || host_os == "aix" || host_os == "zos") { +} else if (is_posix) { host_shlib_extension = ".so" } else { assert(false, "Host platform not supported") diff --git a/www/iridium/files/patch-cc_base_features.cc b/www/iridium/files/patch-cc_base_features.cc index 41ac54f25618..37daa223cf4f 100644 --- a/www/iridium/files/patch-cc_base_features.cc +++ b/www/iridium/files/patch-cc_base_features.cc @@ -1,11 +1,11 @@ ---- cc/base/features.cc.orig 2025-02-22 18:06:53 UTC +--- cc/base/features.cc.orig 2025-05-07 06:48:23 UTC +++ cc/base/features.cc -@@ -43,7 +43,7 @@ const base::FeatureParam kDeferImplInvalidationFr +@@ -48,7 +48,7 @@ const base::FeatureParam kDeferImplInvalidationFr // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 639d4b12c935..e38af5ff3f40 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,147 +1,147 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/app/chrome_main_delegate.cc @@ -147,7 +147,7 @@ #include "components/webui/about/credit_utils.h" #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif @@ -188,17 +188,17 @@ #include "v8/include/v8.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/environment.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/nix/scoped_xdg_activation_token_injector.h" #include "ui/linux/display_server_utils.h" #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif @@ -316,7 +316,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif @@ -399,7 +399,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || @@ -411,7 +411,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif // BUILDFLAG(IS_LINUX) -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; @@ -493,7 +493,7 @@ std::optional AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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 // already running browser process if it exists. @@ -571,7 +571,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. @@ -667,7 +667,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( @@ -826,7 +826,7 @@ std::optional ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); @@ -983,7 +983,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) is_canary_dev; #else false; @@ -1131,7 +1131,7 @@ std::optional ChromeMainDelegate::BasicStartupCom return 0; // Got a --credits switch; exit with a success error code. } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif @@ -1156,7 +1156,7 @@ std::optional ChromeMainDelegate::BasicStartupCom ash::RegisterPathProvider(); chromeos::dbus_paths::RegisterPathProvider(); #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) nacl::RegisterPathProvider(); #endif @@ -1444,7 +1444,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1532,13 +1532,13 @@ absl::variant Chrome +@@ -1532,13 +1532,13 @@ std::variant ChromeM #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ - !BUILDFLAG(IS_CHROMEOS)) + !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) static const MainFunction kMainFunctions[] = { #if BUILDFLAG(IS_MAC) {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain}, {switches::kCodeSignCloneCleanupProcess, code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain}, -#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. {switches::kNaClLoaderProcess, NaClMain}, diff --git a/www/iridium/files/patch-chrome_browser_BUILD.gn b/www/iridium/files/patch-chrome_browser_BUILD.gn index ca0c5a41a56a..233158193287 100644 --- a/www/iridium/files/patch-chrome_browser_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_BUILD.gn @@ -1,16 +1,16 @@ ---- chrome/browser/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/BUILD.gn -@@ -6819,6 +6819,13 @@ static_library("browser") { +@@ -6866,6 +6866,13 @@ static_library("browser") { [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ] } + if (is_bsd) { + sources -= [ + "metrics/bluetooth_metrics_provider.cc", + "metrics/bluetooth_metrics_provider.h", + ] + } + if (use_dbus) { sources += [ "dbus_memory_pressure_evaluator_linux.cc", diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index 1cf698356235..12835627d5e0 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,334 +1,379 @@ ---- chrome/browser/about_flags.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/about_flags.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/about_flags.cc -@@ -258,7 +258,7 @@ +@@ -260,7 +260,7 @@ #include "extensions/common/extension_features.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/allocator/buildflags.h" #endif -@@ -344,7 +344,7 @@ +@@ -349,7 +349,7 @@ #include "device/vr/public/cpp/switches.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -354,7 +354,7 @@ +@@ -359,7 +359,7 @@ #include "chrome/browser/win/mica_titlebar.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck #include "chrome/browser/enterprise/profile_management/profile_management_features.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -365,7 +365,7 @@ + #include "chrome/browser/enterprise/webstore/features.h" +@@ -371,7 +371,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -520,7 +520,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -423,7 +423,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = { + #endif // USE_AURA + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + + const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = { + {"LocalNetworkAccessChecksWarn", "false"}}; +@@ -539,7 +539,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -821,6 +821,26 @@ const FeatureEntry::FeatureVariation +@@ -852,6 +852,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; +#if BUILDFLAG(IS_BSD) +const FeatureEntry::FeatureParam kAudioBackendPulseAudio[] = { + { "audio-backend", "pulseaudio" }}; +const FeatureEntry::FeatureParam kAudioBackendSndio[] = { + { "audio-backend", "sndio" }}; +const FeatureEntry::FeatureParam kAudioBackendAlsa[] = { + { "audio-backend", "alsa" }}; +const FeatureEntry::FeatureVariation + kAudioBackendVariations[] = { + {"using PulseAudio by default if available", kAudioBackendPulseAudio, + std::size(kAudioBackendPulseAudio), + nullptr}, + {"using sndio by default if available", kAudioBackendSndio, + std::size(kAudioBackendSndio), + nullptr}, + {"using ALSA by default if available", kAudioBackendAlsa, + std::size(kAudioBackendAlsa), + nullptr}}; +#endif + const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1184,7 +1204,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot - }; +@@ -1227,7 +1247,7 @@ constexpr FeatureEntry::FeatureVariation + #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1222,7 +1242,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada +@@ -1265,7 +1285,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // A limited number of combinations of the rich autocompletion params. - const FeatureEntry::FeatureParam -@@ -3582,7 +3602,7 @@ const FeatureEntry::FeatureVariation + const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = { +@@ -3555,7 +3575,7 @@ const FeatureEntry::FeatureVariation #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4088,7 +4108,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari +@@ -4059,7 +4079,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr}, }; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { {"TranslationAPIAcceptLanguagesCheck", "false"}, {"TranslationAPILimitLanguagePackCount", "false"}}; -@@ -4154,7 +4174,7 @@ const FeatureEntry::FeatureVariation +@@ -4125,7 +4145,7 @@ const FeatureEntry::FeatureVariation 1, nullptr}, }; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = { {"BackoffTime", "0h"}, {"BackoffMultiplierBase", "0.0"}, -@@ -4997,7 +5017,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4992,7 +5012,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5286,7 +5306,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5279,7 +5299,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableIsolatedWebAppDevModeName, flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)}, -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"enable-iwa-key-distribution-component", flag_descriptions::kEnableIwaKeyDistributionComponentName, flag_descriptions::kEnableIwaKeyDistributionComponentDescription, -@@ -5545,7 +5565,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5500,7 +5520,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5581,6 +5601,16 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWaylandLinuxDrmSyncobjName, - flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux, - FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)}, +@@ -5541,6 +5561,16 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWaylandSessionManagementName, + flag_descriptions::kWaylandSessionManagementDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)}, + +#if BUILDFLAG(IS_BSD) + {"audio-backend", + flag_descriptions::kAudioBackendName, + flag_descriptions::kAudioBackendDescription, kOsLinux, + FEATURE_WITH_PARAMS_VALUE_TYPE( + media::kAudioBackend, + kAudioBackendVariations, + "AudioBackend")}, +#endif #endif // BUILDFLAG(IS_LINUX) #if BUILDFLAG(ENABLE_VR) -@@ -6461,7 +6491,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6427,7 +6457,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6674,7 +6704,7 @@ const FeatureEntry kFeatureEntries[] = { - "OrganicRepeatableQueries")}, - +@@ -6697,7 +6727,7 @@ const FeatureEntry kFeatureEntries[] = { + kNumSrpZpsRelatedSearches, + "PowerTools")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7171,7 +7201,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7189,7 +7219,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -7436,7 +7466,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7437,7 +7467,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) {"wasm-tts-component-updater-enabled", flag_descriptions::kWasmTtsComponentUpdaterEnabledName, flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop, -@@ -8092,7 +8122,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8109,7 +8139,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)}, #endif // !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8773,7 +8803,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8774,7 +8804,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)}, -@@ -8798,7 +8828,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8799,7 +8829,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9265,7 +9295,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9275,7 +9305,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -9903,7 +9933,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9924,7 +9954,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast(kOsMac | kOsWin | kOsLinux), -@@ -10027,7 +10057,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10048,7 +10078,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10062,7 +10092,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10077,7 +10107,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -10823,7 +10853,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10817,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCanvasHibernationDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"sync-enable-bookmarks-in-transport-mode", - flag_descriptions::kSyncEnableBookmarksInTransportModeName, - flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -10939,7 +10969,7 @@ const FeatureEntry kFeatureEntries[] = { + {"enable-history-sync-optin", + flag_descriptions::kEnableHistorySyncOptinName, + flag_descriptions::kEnableHistorySyncOptinDescription, +@@ -10920,7 +10950,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)}, #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"supervised-profile-safe-search", flag_descriptions::kSupervisedProfileSafeSearchName, flag_descriptions::kSupervisedProfileSafeSearchDescription, -@@ -11186,7 +11216,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11167,7 +11197,7 @@ const FeatureEntry kFeatureEntries[] = { segmentation_platform::features::kSegmentationSurveyPage)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"autofill-enable-buy-now-pay-later", flag_descriptions::kAutofillEnableBuyNowPayLaterName, flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop, -@@ -11306,7 +11336,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11282,7 +11312,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"translation-api", flag_descriptions::kTranslationAPIName, flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI, -@@ -11343,7 +11373,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11319,7 +11349,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kPasswordFormClientsideClassifier)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"contextual-cueing", flag_descriptions::kContextualCueingName, flag_descriptions::kContextualCueingDescription, kOsLinux | kOsMac | kOsWin, -@@ -11662,7 +11692,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11653,7 +11683,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)}, #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName, flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux, FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)}, -@@ -11712,7 +11742,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11703,7 +11733,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"autofill-enable-amount-extraction-desktop", flag_descriptions::kAutofillEnableAmountExtractionDesktopName, flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, -@@ -11732,7 +11762,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11723,7 +11753,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"autofill-enable-amount-extraction-allowlist-desktop", flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName, flag_descriptions:: +@@ -11834,7 +11864,7 @@ const FeatureEntry kFeatureEntries[] = { + apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)}, + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"chrome-web-store-navigation-throttle", + flag_descriptions::kChromeWebStoreNavigationThrottleName, + flag_descriptions::kChromeWebStoreNavigationThrottleDescription, +@@ -11869,7 +11899,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"autofill-enable-amount-extraction-desktop-logging", + flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName, + flag_descriptions:: +@@ -11899,7 +11929,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)}, + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"root-scrollbar-follows-browser-theme", + flag_descriptions::kRootScrollbarFollowsTheme, + flag_descriptions::kRootScrollbarFollowsThemeDescription, +@@ -11921,7 +11951,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"local-network-access-check", + flag_descriptions::kLocalNetworkAccessChecksName, + flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop, diff --git a/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc b/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc index deadf3fcbcdc..ce88fa8d98f5 100644 --- a/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc +++ b/www/iridium/files/patch-chrome_browser_background_glic_glic__status__icon.cc @@ -1,29 +1,38 @@ ---- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/background/glic/glic_status_icon.cc -@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control +@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control if (!status_icon_) { return; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set a vector icon for proper themeing on Linux. status_icon_->SetIcon( GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON)); -@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control - GlicStatusIcon::~GlicStatusIcon() { +@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() { + context_menu_ = nullptr; if (status_icon_) { -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) status_icon_->RemoveObserver(this); #endif std::unique_ptr removed_icon = -@@ -201,7 +201,7 @@ std::unique_ptr GlicStatusIcon::C +@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato + } + + void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (context_menu_) { + context_menu_->SetCommandIdVisible(IDC_GLIC_STATUS_ICON_MENU_EXIT, + BrowserList::GetInstance()->empty()); +@@ -272,7 +272,7 @@ std::unique_ptr GlicStatusIcon::C menu->AddItem( IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON, l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON)); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_EXIT, l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_EXIT)); #endif diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc index ad4f26babebc..ee8c3b499c35 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.cc +++ b/www/iridium/files/patch-chrome_browser_browser__features.cc @@ -1,29 +1,29 @@ ---- chrome/browser/browser_features.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/browser_features.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/browser_features.cc -@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode, - "ContentUsesBrowserThemeColorMode", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction, + "ClearUserDataUponProfileDestruction", + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables usage of os_crypt_async::SecretPortalKeyProvider. Once // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be // disabled without losing data. -@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, +@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, // the browser exits. BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If true, encrypt new data with the key provided by SecretPortalKeyProvider. // Otherwise, it will only decrypt existing data. BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption, diff --git a/www/iridium/files/patch-chrome_browser_browser__features.h b/www/iridium/files/patch-chrome_browser_browser__features.h index 756e2d7a1db8..4f9f7242d154 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.h +++ b/www/iridium/files/patch-chrome_browser_browser__features.h @@ -1,20 +1,20 @@ ---- chrome/browser/browser_features.h.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/browser_features.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/browser_features.h -@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); - - BASE_DECLARE_FEATURE(kContentUsesBrowserThemeColorMode); +@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore + BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); + BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kDbusSecretPortal); BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider); #endif -@@ -101,7 +101,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed +@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kSecretPortalKeyProviderUseForEncryption); BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProviderForEncryption); #endif diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc index 7c3902405405..25d894bf3466 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,47 +1,47 @@ ---- chrome/browser/browser_process_impl.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/browser_process_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/browser_process_impl.cc @@ -259,7 +259,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_features.h" #include "components/os_crypt/async/browser/fallback_linux_key_provider.h" #include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h" @@ -271,7 +271,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // How often to check if the persistent instance of Chrome needs to restart // to install an update. static const int kUpdateCheckIntervalHours = 6; -@@ -1133,7 +1133,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim +@@ -1145,7 +1145,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1401,7 +1401,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1413,7 +1413,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { local_state()))); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) != "basic") { -@@ -1670,7 +1670,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1682,7 +1682,7 @@ void BrowserProcessImpl::Unpin() { } // Mac is currently not supported. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool BrowserProcessImpl::IsRunningInBackground() const { // Check if browser is in the background. diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc index 205097bea3f4..27438125f6d5 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc @@ -1,64 +1,64 @@ ---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/chrome_browser_interface_binders_webui.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "content/public/browser/web_ui_controller_interface_binder.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -55,7 +55,7 @@ +@@ -56,7 +56,7 @@ #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" - #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" -@@ -440,7 +440,7 @@ void PopulateChromeWebUIFrameBinders( + #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h" +@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); -@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders( - page_image_service::mojom::PageImageServiceHandler, HistoryUI, - HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); +@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders( + HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder(map); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) RegisterWebUIControllerInterfaceBinder< browser_command::mojom::CommandHandlerFactory, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1084,7 +1084,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder(map); diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index fd214a7c0652..6af38235692b 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,170 +1,188 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -504,7 +504,7 @@ +@@ -506,7 +506,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -618,11 +618,11 @@ +@@ -622,11 +622,11 @@ #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" #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_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -633,7 +633,7 @@ +@@ -637,7 +637,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #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/profile_management_navigation_throttle.h" -@@ -642,7 +642,7 @@ +@@ -646,7 +646,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS) -@@ -651,7 +651,7 @@ +@@ -655,7 +655,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1544,7 +1544,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1549,7 +1549,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, false); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1758,7 +1758,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS) main_parts = std::make_unique( is_integration_test, &startup_data_); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts = std::make_unique( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1781,7 +1781,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1787,7 +1787,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique()); #else -@@ -1798,7 +1798,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique()); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts->AddParts(std::make_unique()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique()); -@@ -1817,7 +1817,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1823,7 +1823,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2700,7 +2700,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { +#ifdef notyet crash_keys::AppendStringAnnotationsCommandLineSwitch(command_line); +#endif #if BUILDFLAG(IS_MAC) std::unique_ptr client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2709,7 +2711,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2715,7 +2717,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) -#if !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -3069,7 +3071,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4911,7 +4913,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4030,7 +4032,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr + return old_preferred_color_scheme != web_prefs->preferred_color_scheme; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a + // custom colored frame for the UI. + void UpdateRootScrollbarThemeColor(Profile* profile, +@@ -4657,7 +4659,7 @@ void ChromeContentBrowserClient::OverrideWebPreference + + UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(), + web_contents, GetWebTheme()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + +@@ -4973,7 +4975,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5423,7 +5425,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5485,7 +5487,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5440,7 +5442,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5502,7 +5504,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5481,7 +5483,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5543,7 +5545,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7419,7 +7421,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7496,7 +7498,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // This is possibly called before `g_browser_process` is initialized. PrefService* local_state; if (g_browser_process) { diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 48b26dadfddd..488acfaa6e19 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, diff --git a/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc index 9ddaad421898..b3df8b939c9c 100644 --- a/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc -@@ -100,7 +100,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo +@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo // This configuration object allows us to control platform specific behavior. MessagingBackendConfiguration configuration; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) configuration.clear_chip_on_tab_selection = false; #endif diff --git a/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc index 67dec6f92cfc..b0e9b3ddfc01 100644 --- a/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc +++ b/www/iridium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc @@ -1,20 +1,20 @@ ---- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc -@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err) +@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Priority GetOnDema namespace component_updater { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kIwaKeyDistributionComponent, "IwaKeyDistributionComponent", #if BUILDFLAG(IS_CHROMEOS) -@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup +@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup // the main IWA feature. #if BUILDFLAG(IS_WIN) return base::FeatureList::IsEnabled(features::kIsolatedWebApps); -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(kIwaKeyDistributionComponent); #else return false; diff --git a/www/iridium/files/patch-chrome_browser_devtools_features.cc b/www/iridium/files/patch-chrome_browser_devtools_features.cc new file mode 100644 index 000000000000..16712c0e7db5 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_devtools_features.cc @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/features.cc.orig 2025-05-07 06:48:23 UTC ++++ chrome/browser/devtools/features.cc +@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelineLabels, + "DevToolsAiGeneratedTimelineLabels", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If enabled, DevTools does not accept remote debugging connections unless + // using a non-default user data dir via the --user-data-dir switch. + BASE_FEATURE(kDevToolsDebuggingRestrictions, diff --git a/www/iridium/files/patch-chrome_browser_devtools_features.h b/www/iridium/files/patch-chrome_browser_devtools_features.h new file mode 100644 index 000000000000..7cfa7ddab0cc --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_devtools_features.h @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/features.h.orig 2025-05-07 06:48:23 UTC ++++ chrome/browser/devtools/features.h +@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTracing); + + BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/iridium/files/patch-chrome_browser_devtools_remote__debugging__server.cc b/www/iridium/files/patch-chrome_browser_devtools_remote__debugging__server.cc new file mode 100644 index 000000000000..82f01d707bcb --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_devtools_remote__debugging__server.cc @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/remote_debugging_server.cc.orig 2025-05-07 06:48:23 UTC ++++ chrome/browser/devtools/remote_debugging_server.cc +@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::optional& is + RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) && + is_default_user_data_dir.value_or(true)) { + return base::unexpected( diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index 31b01bf16638..f11e88132ced 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,29 +1,29 @@ ---- chrome/browser/download/download_item_model.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/download/download_item_model.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/download/download_item_model.cc @@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); @@ -820,7 +820,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (download_->GetOriginalMimeType() == "application/x-x509-user-cert") { SetShouldPreferOpeningInBrowser(true); return; diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc index c7970fecdb8d..329f39edd885 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_common.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/connectors/common.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/enterprise/connectors/common.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/enterprise/connectors/common.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "components/user_manager/user.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -191,7 +191,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* profile) { std::string email = GetProfileEmail(IdentityManagerFactory::GetForProfile(profile)); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (email.empty()) { email = profile->GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserEmail); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index 46e29dfb7a8d..1aa630da05d7 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -470,7 +470,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( +@@ -476,7 +476,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On desktop, the guest profile is actually the primary OTR profile of // the "regular" guest profile. The regular guest profile is never used // directly by users. Also, user are not able to create child OTR profiles diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index ccde528a750d..6144bb748aaf 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,38 +1,38 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -55,7 +55,7 @@ +@@ -53,7 +53,7 @@ #include "base/strings/utf_string_conversions.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" -@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -196,7 +196,7 @@ std::string RealtimeReportingClient::GetProfileUserNam +@@ -194,7 +194,7 @@ std::string RealtimeReportingClient::GetProfileUserNam username_ = identity_manager_ ? GetProfileEmail(identity_manager_) : std::string(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (username_.empty()) { username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserEmail); -@@ -248,7 +248,7 @@ std::string RealtimeReportingClient::GetBrowserClientI +@@ -246,7 +246,7 @@ std::string RealtimeReportingClient::GetBrowserClientI return client_id; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) void RealtimeReportingClient::MaybeCollectDeviceSignalsAndReportEvent( ::chrome::cros::reporting::proto::Event event, policy::CloudPolicyClient* client, diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h index f9ce1b95e1c9..4663bfd0e1f4 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -1,29 +1,29 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h @@ -19,7 +19,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -113,7 +113,7 @@ class RealtimeReportingClient : public RealtimeReporti const std::string& dm_token) override; #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...). void MaybeCollectDeviceSignalsAndReportEventDeprecated( base::Value::Dict event, -@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -163,7 +163,7 @@ class RealtimeReportingClient : public RealtimeReporti base::WeakPtrFactory weak_ptr_factory_{this}; }; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Populate event dict with CrowdStrike signal values. If those signals are // available in `response`, this function returns a Dict with the following // fields added: diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/www/iridium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc new file mode 100644 index 000000000000..3872f28cf1a0 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig 2025-05-07 06:48:23 UTC ++++ chrome/browser/enterprise/signals/context_info_fetcher.cc +@@ -179,6 +179,8 @@ std::vector ContextInfoFetcher::GetOnSecu + SettingValue ContextInfoFetcher::GetOSFirewall() { + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + return device_signals::GetOSFirewall(); ++#elif BUILDFLAG(IS_OPENBSD) ++ return SettingValue::ENABLED; + #elif BUILDFLAG(IS_CHROMEOS) + return GetChromeosFirewall(); + #else +@@ -198,7 +200,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor + #endif // BUILDFLAG(IS_LINUX) + + std::vector ContextInfoFetcher::GetDnsServers() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return device_signals::GetSystemDnsServers(); + #else + return std::vector(); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index 8e6e581b42ea..d9ab03e2a427 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h" #elif BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/signals/device_info_fetcher_win.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" #endif -@@ -74,7 +74,7 @@ std::unique_ptr DeviceInfoFetcher:: +@@ -76,7 +76,7 @@ std::unique_ptr DeviceInfoFetcher:: return CreateInstanceInternal(); } -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && \ +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) && \ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // static std::unique_ptr DeviceInfoFetcher::CreateInstanceInternal() { diff --git a/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc index 0a022dc93f6e..49e6466b0398 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/enterprise/util/managed_browser_utils.cc -@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile +@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile + profile_manager->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile->GetPath()); if (entry) { - entry->SetUserAcceptedAccountManagement(accepted); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - entry->SetEnterpriseProfileLabel(GetEnterpriseLabel(profile)); + SetEnterpriseProfileLabel(profile); #endif - } + entry->SetUserAcceptedAccountManagement(accepted); diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index dfabd5430d8d..ea75c853f1c5 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,13 +1,13 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1436,6 +1436,10 @@ source_set("extensions") { +@@ -1464,6 +1464,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } + if (is_bsd) { + sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ] + } + if (enable_pdf) { deps += [ "//chrome/browser/pdf", diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 0893ac1cb876..94fb1b621bb6 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,47 +1,47 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -40,7 +40,7 @@ #include "components/reporting/util/statusor.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include #include "base/strings/string_util.h" -@@ -157,7 +157,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -156,7 +156,7 @@ api::enterprise_reporting_private::ContextInfo ToConte } bool AllowClientCertificateReportingForUsers() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled( enterprise_signals::features::kAllowClientCertificateReportingForUsers); #else -@@ -170,7 +170,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin +@@ -169,7 +169,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin return pref && pref->IsManaged(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -232,7 +232,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -231,7 +231,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -672,7 +672,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -671,7 +671,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // getFileSystemInfo diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc index 791186a0b9e2..ddcc7f9cf682 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel +@@ -410,7 +410,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel apps::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); Profile* profile = Profile::FromBrowserContext(context); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, extension->id())) { return false; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 160f657c4fb8..f2ed3001c5df 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,13 +1,13 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -293,7 +293,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -292,7 +292,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { - info->os = extensions::api::runtime::PlatformOs::kOpenbsd; + info->os = extensions::api::runtime::PlatformOs::kLinux; + } else if (strcmp(os, "freebsd") == 0) { + info->os = extensions::api::runtime::PlatformOs::kLinux; } else { NOTREACHED() << "Platform not supported: " << os; } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 1971fcbfef6c..64656528b1aa 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,29 +1,29 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = settings_api::PrefType::kBoolean; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = - settings_api::PrefType::kBoolean; (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] = -@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + settings_api::PrefType::kBoolean; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -223,7 +223,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kSystemTheme] = settings_api::PrefType::kNumber; #endif (*s_allowlist)[::prefs::kHomePage] = settings_api::PrefType::kUrl; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index e3887015d41d..3d587b8bd822 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -931,7 +931,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // created as minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) if (new_window->initial_show_state() == ui::mojom::WindowShowState::kMinimized) { new_window->window()->Minimize(); diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc index d9a894503eaa..3fa95804d169 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -795,7 +795,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders( #endif // BUILDFLAG(IS_CHROMEOS) if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) provider_list->push_back(std::make_unique( service, base::MakeRefCounted( -@@ -823,7 +823,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(CHROMIUM_BRANDING)) provider_list->push_back(std::make_unique( service, diff --git a/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc index 9e7e64f02777..2e49f1412ec0 100644 --- a/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc +++ b/www/iridium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc @@ -1,20 +1,20 @@ ---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" #endif -@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content +@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content fetcher->AddSource(std::make_unique()); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) fetcher->AddSource(std::make_unique()); #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc index d49cf6b65d11..e18e393ce17a 100644 --- a/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc +++ b/www/iridium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc @@ -1,20 +1,20 @@ ---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc -@@ -45,7 +45,7 @@ +@@ -44,7 +44,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" #endif -@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil +@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil fetcher->AddSource(std::make_unique(scrub_data)); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) fetcher->AddSource(std::make_unique()); #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index feb185365a43..b13beb70d0ec 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,165 +1,174 @@ ---- chrome/browser/flag_descriptions.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/flag_descriptions.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/flag_descriptions.cc -@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB +@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB "Autofill suggestions on the allowlisted merchant websites."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kAutofillEnableAmountExtractionAllowlistDesktopName[] = "Enable loading and querying the checkout amount extraction allowlist on " "Chrome Desktop"; -@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr +@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kAutofillEnableBuyNowPayLaterName[] = "Enable buy now pay later on Autofill"; const char kAutofillEnableBuyNowPayLaterDescription[] = -@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] = +@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown - "when the connection is using a well known root cert or when the server is " - "a localhost."; +@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescription[] = + "space, a context menu containing page-related items will be shown."; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kContextualCueingName[] = "Contextual cueing"; const char kContextualCueingDescription[] = - "Enables the contextual cueing system to support showing actions"; -@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] = + "Enables the contextual cueing system to support showing actions."; +@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeName[] = const char kEnableIsolatedWebAppDevModeDescription[] = "Enables the installation of unverified Isolated Web Apps"; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kEnableIwaKeyDistributionComponentName[] = "Enable the Iwa Key Distribution component"; const char kEnableIwaKeyDistributionComponentDescription[] = -@@ -3494,7 +3494,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = +@@ -3430,7 +3430,7 @@ const char kRetainOmniboxOnFocusDescription[] = + "exhibit a change in behavior."; + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme"; + const char kRootScrollbarFollowsThemeDescription[] = + "If enabled makes the root scrollbar follow the browser's theme color."; +@@ -3648,7 +3648,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = "SiteInstance."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing"; const char kPwaNavigationCapturingDescription[] = "Enables opening links from Chrome in an installed PWA. Currently under " -@@ -3729,7 +3729,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ +@@ -3863,7 +3863,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ "Force the Translate Triggering on English pages experiment to be enabled " "with the selected language model active."; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kTranslationAPIName[] = "Experimental translation API"; - const char kTranslationAPIDescription[] = - "Enables the on-device language translation API. " -@@ -5352,7 +5352,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes - "Enables a mitigation during web app install on CrOS for syncing " - "user_display_mode: kStandalone to non-CrOS devices."; + const char kEnableHistorySyncOptinName[] = "History Sync Opt-in"; + const char kEnableHistorySyncOptinDescription[] = + "Enables the History Sync Opt-in screen on Desktop platforms. The screen " +@@ -5451,7 +5451,7 @@ const char kTranslateOpenSettingsDescription[] = + "Add an option to the translate bubble menu to open language settings."; + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kWasmTtsComponentUpdaterEnabledName[] = "Enable Wasm TTS Extension Component"; const char kWasmTtsComponentUpdaterEnabledDescription[] = -@@ -7350,7 +7350,7 @@ const char kTetheringExperimentalFunctionalityDescript +@@ -7459,7 +7459,7 @@ const char kTetheringExperimentalFunctionalityDescript #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7580,7 +7580,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b +@@ -7688,7 +7688,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7626,6 +7626,18 @@ const char kWaylandUiScalingDescription[] = +@@ -7738,6 +7738,18 @@ const char kWaylandUiScalingDescription[] = "Enable experimental support for text scaling in the Wayland backend " "backed by full UI scaling. Requires #wayland-per-window-scaling to be " "enabled too."; + +#if BUILDFLAG(IS_BSD) +const char kAudioBackendName[] = + "Audio Backend"; +const char kAudioBackendDescription[] = +#if BUILDFLAG(IS_OPENBSD) + "Select the desired audio backend to use. The default is sndio."; +#elif BUILDFLAG(IS_FREEBSD) + "Select the desired audio backend to use. The default will automatically " + "enumerate through the supported backends."; +#endif +#endif #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -7638,7 +7650,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7750,7 +7762,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7671,7 +7683,7 @@ const char kTaskManagerDesktopRefreshDescription[] = - "Enables a refreshed design for the Task Manager on Desktop platforms."; - #endif // BUILDFLAG(IS_ANDROID) +@@ -7793,7 +7805,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P + const char kGroupPromoPrototypeDescription[] = + "Enables prototype for group promo."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7703,7 +7715,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7825,7 +7837,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #if BUILDFLAG(ENABLE_PRINTING) const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend"; const char kCupsIppPrintingBackendDescription[] = -@@ -7848,7 +7860,7 @@ const char kElementCaptureDescription[] = +@@ -7967,7 +7979,7 @@ const char kElementCaptureDescription[] = "media track into a track capturing just a specific DOM element."; #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7904,7 +7916,7 @@ const char kComposeUpfrontInputModesDescription[] = +@@ -8018,7 +8030,7 @@ const char kComposeUpfrontInputModesDescription[] = "Enables upfront input modes in the Compose dialog"; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8048,7 +8060,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = - "Enable the OS settings for overlay scrollbars on ChromeOS."; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -8154,7 +8166,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] = + const char kSupervisedUserBlockInterstitialV3Description[] = + "Enables URL filter interstitial V3 for Family Link users."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kSupervisedProfileHideGuestName[] = "Supervised Profile Hide Guest"; const char kSupervisedProfileHideGuestDescription[] = "Hides Guest Profile entry points for supervised users"; diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index a770c5575ea6..ed0cbb0f5abe 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,156 +1,165 @@ ---- chrome/browser/flag_descriptions.h.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/flag_descriptions.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/flag_descriptions.h -@@ -356,7 +356,7 @@ extern const char +@@ -373,7 +373,7 @@ extern const char kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[]; extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[]; extern const char kAutofillEnableAmountExtractionDesktopName[]; -@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt +@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountExtractionDeskt // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kAutofillEnableBuyNowPayLaterName[]; extern const char kAutofillEnableBuyNowPayLaterDescription[]; -@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[]; - extern const char kCrossTabRegionCaptureDescription[]; - #endif // !BUILDFLAG(IS_ANDROID) +@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpaceName[]; + extern const char kContextMenuEmptySpaceDescription[]; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kContextualCueingName[]; extern const char kContextualCueingDescription[]; - #endif // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -753,7 +753,7 @@ extern const char kDevicePostureName[]; + extern const char kGlicZeroStateSuggestionsName[]; +@@ -786,7 +786,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; -@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes +@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri extern const char kEnableIsolatedWebAppDevModeName[]; extern const char kEnableIsolatedWebAppDevModeDescription[]; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kEnableIwaKeyDistributionComponentName[]; extern const char kEnableIwaKeyDistributionComponentDescription[]; #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2017,7 +2017,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; +@@ -1964,7 +1964,7 @@ extern const char kRetainOmniboxOnFocusName[]; + extern const char kRetainOmniboxOnFocusDescription[]; + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kRootScrollbarFollowsTheme[]; + extern const char kRootScrollbarFollowsThemeDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +@@ -2096,7 +2096,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; extern const char kDefaultSiteInstanceGroupsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kPwaNavigationCapturingName[]; extern const char kPwaNavigationCapturingDescription[]; #endif -@@ -2177,7 +2177,7 @@ extern const char kTouchTextEditingRedesignDescription +@@ -2242,7 +2242,7 @@ extern const char kTouchTextEditingRedesignDescription extern const char kTranslateForceTriggerOnEnglishName[]; extern const char kTranslateForceTriggerOnEnglishDescription[]; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kTranslationAPIName[]; - extern const char kTranslationAPIDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -3144,7 +3144,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio - extern const char kUserDisplayModeSyncStandaloneMitigationName[]; - extern const char kUserDisplayModeSyncStandaloneMitigationDescription[]; + extern const char kEnableHistorySyncOptinName[]; + extern const char kEnableHistorySyncOptinDescription[]; + +@@ -3197,7 +3197,7 @@ extern const char kTranslateOpenSettingsName[]; + extern const char kTranslateOpenSettingsDescription[]; + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kWasmTtsComponentUpdaterEnabledName[]; extern const char kWasmTtsComponentUpdaterEnabledDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -4325,7 +4325,7 @@ extern const char kTetheringExperimentalFunctionalityD +@@ -4385,7 +4385,7 @@ extern const char kTetheringExperimentalFunctionalityD #endif // #if BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4460,7 +4460,7 @@ extern const char kEnableArmHwdrmDescription[]; +@@ -4520,7 +4520,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4488,6 +4488,9 @@ extern const char kWaylandTextInputV3Description[]; +@@ -4551,6 +4551,9 @@ extern const char kWaylandTextInputV3Description[]; extern const char kWaylandUiScalingName[]; extern const char kWaylandUiScalingDescription[]; + +extern const char kAudioBackendName[]; +extern const char kAudioBackendDescription[]; #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -4507,7 +4510,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4570,7 +4573,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #if BUILDFLAG(ENABLE_PRINTING) extern const char kCupsIppPrintingBackendName[]; extern const char kCupsIppPrintingBackendDescription[]; -@@ -4520,7 +4523,7 @@ extern const char kScreenlockReauthCardDescription[]; +@@ -4583,7 +4586,7 @@ extern const char kScreenlockReauthCardDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4534,7 +4537,7 @@ extern const char kTaskManagerDesktopRefreshName[]; + +@@ -4600,7 +4603,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4629,7 +4632,7 @@ extern const char kElementCaptureName[]; +@@ -4695,7 +4698,7 @@ extern const char kElementCaptureName[]; extern const char kElementCaptureDescription[]; #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4671,7 +4674,7 @@ extern const char kComposeUpfrontInputModesName[]; +@@ -4734,7 +4737,7 @@ extern const char kComposeUpfrontInputModesName[]; extern const char kComposeUpfrontInputModesDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4756,7 +4759,7 @@ extern const char kEnablePolicyPromotionBannerName[]; - extern const char kEnablePolicyPromotionBannerDescription[]; - #endif // !BUILDFLAG(IS_ANDROID) +@@ -4814,7 +4817,7 @@ extern const char kEnablePolicyPromotionBannerDescript + extern const char kSupervisedUserBlockInterstitialV3Name[]; + extern const char kSupervisedUserBlockInterstitialV3Description[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kSupervisedProfileHideGuestName[]; extern const char kSupervisedProfileHideGuestDescription[]; diff --git a/www/iridium/files/patch-chrome_browser_global__features.cc b/www/iridium/files/patch-chrome_browser_global__features.cc index d1c755ec4102..55e3e9757b12 100644 --- a/www/iridium/files/patch-chrome_browser_global__features.cc +++ b/www/iridium/files/patch-chrome_browser_global__features.cc @@ -1,29 +1,29 @@ ---- chrome/browser/global_features.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/global_features.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/global_features.cc -@@ -21,7 +21,7 @@ - #include "chrome/browser/glic/glic_profile_manager.h" // nogncheck +@@ -22,7 +22,7 @@ + #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h" // nogncheck #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This causes a gn error on Android builds, because gn does not understand // buildflags, so we include it only on platforms where it is used. #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h" -@@ -60,7 +60,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( +@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( void GlobalFeatures::Init() { system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) whats_new_registry_ = CreateWhatsNewRegistry(); #endif -@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( +@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( return system_permission_settings::PlatformHandle::Create(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr GlobalFeatures::CreateWhatsNewRegistry() { return whats_new::CreateWhatsNewRegistry(); diff --git a/www/iridium/files/patch-chrome_browser_global__features.h b/www/iridium/files/patch-chrome_browser_global__features.h index 2cefb9ad1e95..8b45b945d265 100644 --- a/www/iridium/files/patch-chrome_browser_global__features.h +++ b/www/iridium/files/patch-chrome_browser_global__features.h @@ -1,38 +1,38 @@ ---- chrome/browser/global_features.h.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/global_features.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/global_features.h @@ -14,7 +14,7 @@ namespace system_permission_settings { class PlatformHandle; } // namespace system_permission_settings -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) namespace whats_new { class WhatsNewRegistry; } // namespace whats_new -@@ -55,7 +55,7 @@ class GlobalFeatures { +@@ -56,7 +56,7 @@ class GlobalFeatures { system_permissions_platform_handle() { return system_permissions_platform_handle_.get(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) whats_new::WhatsNewRegistry* whats_new_registry() { return whats_new_registry_.get(); } -@@ -80,7 +80,7 @@ class GlobalFeatures { +@@ -85,7 +85,7 @@ class GlobalFeatures { virtual std::unique_ptr CreateSystemPermissionsPlatformHandle(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) virtual std::unique_ptr CreateWhatsNewRegistry(); #endif -@@ -90,7 +90,7 @@ class GlobalFeatures { +@@ -95,7 +95,7 @@ class GlobalFeatures { std::unique_ptr system_permissions_platform_handle_; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr whats_new_registry_; #endif diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index a94d8c358456..4251b18881ad 100644 --- a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,16 +1,16 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { - StorageMonitor::GetInstance()->AddObserver(this); + /* + * This conditional is needed for shutdown. Destructors + * try to get the media file system registry. + */ + if (StorageMonitor::GetInstance()) + StorageMonitor::GetInstance()->AddObserver(this); } MediaFileSystemRegistry::~MediaFileSystemRegistry() { diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 202fb3d6bba2..af5f6f24c4a0 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,52 +1,52 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -86,7 +86,7 @@ +@@ -85,7 +85,7 @@ #include "chrome/browser/flags/android/chrome_session_state.h" #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #if defined(__GLIBC__) #include #endif // defined(__GLIBC__) -@@ -111,7 +111,7 @@ +@@ -110,7 +110,7 @@ #include "chrome/installer/util/taskbar_util.h" #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -120,7 +120,7 @@ +@@ -119,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/power_metrics/system_power_monitor.h" #endif -@@ -872,7 +872,7 @@ void RecordStartupMetrics() { +@@ -873,7 +873,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1183,11 +1183,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt std::make_unique(); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) pressure_metrics_reporter_ = std::make_unique(); #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver( power_metrics::SystemPowerMonitor::GetInstance()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 363f6cf95c83..5371d239f2c5 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,97 +1,97 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -196,11 +196,11 @@ +@@ -197,11 +197,11 @@ #include "chrome/browser/metrics/google_update_metrics_provider_mac.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "components/metrics/motherboard_metrics_provider.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif @@ -233,7 +233,7 @@ const int kMaxHistogramGatheringWaitDuration = 60000; // Needs to be kept in sync with the writer in // third_party/crashpad/crashpad/handler/handler_main.cc. const char kCrashpadHistogramAllocatorName[] = "CrashpadMetrics"; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::LazyInstance::Leaky g_crash_reporter = LAZY_INSTANCE_INITIALIZER; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -537,7 +537,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS) @@ -619,7 +619,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri void ChromeMetricsServiceClient::OnEnvironmentUpdate(std::string* environment) { // TODO(https://bugs.chromium.org/p/crashpad/issues/detail?id=135): call this // on Mac when the Crashpad API supports it. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Register the environment with the crash reporter. Note that there is a // window from startup to this point during which crash reports will not have // an environment set. -@@ -724,7 +724,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initialize() { std::make_unique(this, local_state); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique()); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique()); #endif -@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique()); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique()); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) @@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( @@ -1509,7 +1509,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = base::MakeRefCounted( cros_system_profile_provider_.get()); -#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Make sure that Structured Metrics recording delegates have been created // before the service is created. This is handled in other places for ChromeOS diff --git a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index 9e10655f3bd4..cb853712d59c 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,11 +1,11 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() { +@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS) base::SysInfo::KernelVersion(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::SysInfo::OperatingSystemVersion(); #else #error "Unsupported configuration" diff --git a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc index 3f835e59406f..f08fc33fa59c 100644 --- a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,29 +1,29 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -134,7 +134,7 @@ +@@ -135,7 +135,7 @@ #include "extensions/common/constants.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" - #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" - #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -261,7 +261,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet + #include "chrome/browser/policy/chrome_browser_policy_connector.h" + #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" +@@ -276,7 +276,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr GetWrappedCertStore( Profile* profile, std::unique_ptr platform_store) { -@@ -1202,7 +1202,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -1228,7 +1228,7 @@ ProfileNetworkContextService::CreateClientCertStore() std::make_unique( base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate, kCryptoModulePasswordClientAuth)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return GetWrappedCertStore(profile_, std::move(store)); #else return store; diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index d29ac33631b0..f5bac4029b88 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,138 +1,138 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -134,7 +134,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -142,7 +142,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -188,7 +188,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -203,7 +203,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -213,7 +213,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -255,11 +255,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* local_state = g_browser_process->local_state(); #endif -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -275,7 +275,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -522,7 +522,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -591,7 +591,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -659,7 +659,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -684,11 +684,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } diff --git a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 8d0b08c991d6..09518958c5c4 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,20 +1,20 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -642,7 +642,7 @@ void ChromePasswordManagerClient:: +@@ -638,7 +638,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -920,7 +920,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) PasswordsClientUIDelegate* manage_passwords_ui_controller = PasswordsClientUIDelegateFromWebContents(web_contents()); if (manage_passwords_ui_controller) { diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 6b8076654cd2..ffbb9c210dfa 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,254 +1,254 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -255,19 +255,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/idle/action.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "components/enterprise/idle/idle_timeout_policy_handler.h" #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -281,13 +281,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/battery_saver_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/search_engines/enterprise/search_aggregator_policy_handler.h" #include "components/search_engines/enterprise/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -595,7 +595,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -592,7 +592,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -957,7 +957,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ - || BUILDFLAG(IS_MAC) + || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -975,7 +975,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1821,7 +1821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1880,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1900,12 +1900,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1921,12 +1921,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kBackgroundModeEnabled, prefs::kBackgroundModeEnabled, base::Value::Type::BOOLEAN }, #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_BSD) { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1916,7 +1916,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1937,7 +1937,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, #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_BSD) { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1928,7 +1928,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // 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_BSD) { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -2029,7 +2029,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2050,7 +2050,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2131,7 +2131,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::LIST }, +@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // 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) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2202,7 +2202,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2231,7 +2231,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2271,7 +2271,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2297,7 +2297,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2324,7 +2324,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2483,7 +2483,7 @@ std::unique_ptr BuildH +@@ -2513,7 +2513,7 @@ std::unique_ptr BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2710,7 +2710,7 @@ std::unique_ptr BuildH +@@ -2734,7 +2734,7 @@ std::unique_ptr BuildH #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) handlers->AddHandler( std::make_unique()); handlers->AddHandler( -@@ -2763,7 +2763,7 @@ std::unique_ptr BuildH +@@ -2793,7 +2793,7 @@ std::unique_ptr BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); -@@ -2849,7 +2849,7 @@ std::unique_ptr BuildH +@@ -2890,7 +2890,7 @@ std::unique_ptr BuildH std::vector> signin_legacy_policies; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_LINUX) + BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) signin_legacy_policies.push_back(std::make_unique( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -3221,7 +3221,7 @@ std::unique_ptr BuildH +@@ -3262,7 +3262,7 @@ std::unique_ptr BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique( -@@ -3229,7 +3229,7 @@ std::unique_ptr BuildH +@@ -3270,7 +3270,7 @@ std::unique_ptr BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3247,7 +3247,7 @@ std::unique_ptr BuildH +@@ -3288,7 +3288,7 @@ std::unique_ptr BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3270,7 +3270,7 @@ std::unique_ptr BuildH +@@ -3311,7 +3311,7 @@ std::unique_ptr BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -3288,7 +3288,7 @@ std::unique_ptr BuildH +@@ -3329,7 +3329,7 @@ std::unique_ptr BuildH std::vector gen_ai_default_policies; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) gen_ai_default_policies.emplace_back( key::kAutofillPredictionSettings, optimization_guide::prefs:: diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index c08cde65095b..68f915a33635 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,67 +1,67 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -312,7 +312,7 @@ - #include "components/ntp_tiles/custom_links_manager_impl.h" - #endif // BUILDFLAG(IS_ANDROID) +@@ -316,7 +316,7 @@ + #include "chrome/browser/devtools/devtools_window.h" + #endif // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -481,11 +481,11 @@ +@@ -487,11 +487,11 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -513,7 +513,7 @@ +@@ -519,7 +519,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/color/system_theme.h" #endif -@@ -1663,7 +1663,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1664,7 +1664,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1822,7 +1822,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1821,7 +1821,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2176,12 +2176,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2177,12 +2177,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) device_signals::RegisterProfilePrefs(registry); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); enterprise_signin::RegisterProfilePrefs(registry); #endif diff --git a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc index fb5fdc74de33..35e602b6ee9b 100644 --- a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc +++ b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc @@ -1,11 +1,11 @@ ---- chrome/browser/printing/printer_query.cc.orig 2024-06-25 12:08:48 UTC +--- chrome/browser/printing/printer_query.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/printing/printer_query.cc -@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di +@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique( printer_name, print_backend->GetPrinterDriverInfo(printer_name)); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) +#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS) PrinterBasicInfo basic_info; if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == mojom::ResultCode::kSuccess) { diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 6bfb9bad9e12..21f8824c780a 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,139 +1,139 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -350,7 +350,7 @@ +@@ -358,7 +358,7 @@ #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif -@@ -392,7 +392,7 @@ +@@ -400,7 +400,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h" #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h" #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" -@@ -400,7 +400,7 @@ +@@ -408,7 +408,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" #endif -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -408,7 +408,7 @@ +@@ -416,7 +416,7 @@ #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #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_store_factory.h" -@@ -722,7 +722,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -779,7 +779,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -787,7 +787,7 @@ void ChromeBrowserMainExtraPartsProfiles:: commerce::ShoppingServiceFactory::GetInstance(); ConsentAuditorFactory::GetInstance(); ContentIndexProviderFactory::GetInstance(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) contextual_cueing::ContextualCueingServiceFactory::GetInstance(); #endif CookieControlsServiceFactory::GetInstance(); -@@ -834,31 +834,31 @@ void ChromeBrowserMainExtraPartsProfiles:: - #endif +@@ -843,31 +843,31 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); + enterprise_connectors::ReportingEventRouterFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENTERPRISE_LOCAL_CONTENT_ANALYSIS) && \ BUILDFLAG(SAFE_BROWSING_AVAILABLE) enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_idle::IdleServiceFactory::GetInstance(); #endif #if !BUILDFLAG(IS_CHROMEOS) enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance(); #endif enterprise_reporting::LegacyTechServiceFactory::GetInstance(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_signals::SignalsAggregatorFactory::GetInstance(); #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_signals::UserPermissionServiceFactory::GetInstance(); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -985,7 +985,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) MerchantViewerDataManagerFactory::GetInstance(); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1101,7 +1101,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1147,7 +1147,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1157,7 +1157,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) ProfileStatisticsFactory::GetInstance(); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1167,7 +1167,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1177,7 +1177,7 @@ void ChromeBrowserMainExtraPartsProfiles:: ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance(); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1354,7 +1354,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1368,7 +1368,7 @@ void ChromeBrowserMainExtraPartsProfiles:: WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (tab_groups::SavedTabGroupUtils::SupportsSharedTabGroups()) { tab_groups::CollaborationMessagingObserverFactory::GetInstance(); } diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc index 73a3ecc0ccb6..214004ebaeea 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,40 +1,40 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/profiles/profile_impl.cc @@ -270,6 +270,10 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#endif + using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; @@ -594,7 +598,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async policy_provider = GetUserCloudPolicyManagerAsh(); #else // !BUILDFLAG(IS_CHROMEOS) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -892,7 +896,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { +#if BUILDFLAG(IS_OPENBSD) + // If unveil(2) is used, force the file dialog directory to something we + // know is available. + auto* sandbox = sandbox::policy::SandboxLinux::GetInstance(); + if (sandbox->unveil_initialized()) + return GetPrefs()->GetFilePath(prefs::kDownloadDefaultDirectory); + else + return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory); +#else return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory); +#endif } void ProfileImpl::set_last_selected_directory(const base::FilePath& path) { diff --git a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc index eb7db9bb25b4..026ca93a5bb9 100644 --- a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc @@ -1,29 +1,11 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc -@@ -8,7 +8,7 @@ - #include "base/strings/string_util.h" - #include "components/country_codes/country_codes.h" - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "components/variations/service/variations_service.h" - #endif - -@@ -20,7 +20,7 @@ - #endif - - namespace regional_capabilities { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - RegionalCapabilitiesServiceClient::RegionalCapabilitiesServiceClient( - variations::VariationsService* variations_service) -@@ -56,7 +56,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId +@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId base::android::AttachCurrentThread(), reinterpret_cast(heap_callback.release())); } -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void RegionalCapabilitiesServiceClient::FetchCountryId( CountryIdCallback on_country_id_fetched) { - std::move(on_country_id_fetched).Run(variations_country_id_); + std::move(on_country_id_fetched).Run(variations_latest_country_id_); diff --git a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h deleted file mode 100644 index 7bec89c3a014..000000000000 --- a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_client.h.orig 2025-03-18 16:46:04 UTC -+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.h -@@ -21,7 +21,7 @@ namespace regional_capabilities { - class RegionalCapabilitiesServiceClient - : public RegionalCapabilitiesService::Client { - public: --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - explicit RegionalCapabilitiesServiceClient( - variations::VariationsService* variations_service); - #else -@@ -35,7 +35,7 @@ class RegionalCapabilitiesServiceClient - void FetchCountryId(CountryIdCallback country_id_fetched_callback) override; - - private: --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const int variations_country_id_; - #endif - }; diff --git a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc deleted file mode 100644 index 12144795d95a..000000000000 --- a/www/iridium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig 2025-03-18 16:46:04 UTC -+++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc -@@ -12,7 +12,7 @@ - #include "chrome/browser/regional_capabilities/regional_capabilities_service_client.h" - #include "components/regional_capabilities/regional_capabilities_service.h" - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "components/variations/service/variations_service.h" - #endif - -@@ -57,7 +57,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan - Profile* profile = Profile::FromBrowserContext(context); - auto regional_capabilities_service_client = - std::make_unique( --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - g_browser_process->variations_service() - #endif - ); diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index 8f8c752ff3dd..c4d18e5548a8 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,29 +1,29 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -41,7 +41,7 @@ +@@ -40,7 +40,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif -#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) +#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -181,7 +181,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif -#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) +#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -204,7 +204,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc index 89504580acce..f64c1386d55f 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -1251,7 +1251,7 @@ std::string ChromePasswordProtectionService::GetOrgani +@@ -1262,7 +1262,7 @@ std::string ChromePasswordProtectionService::GetOrgani ReusedPasswordAccountType password_type) const { if (base::FeatureList::IsEnabled( safe_browsing::kEnterprisePasswordReuseUiRefresh)) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return GetPrefs()->GetString(prefs::kEnterpriseCustomLabelForProfile); #else return std::string(); diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index c1653e33e6d8..dcd911767459 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -20,7 +20,7 @@ + #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "net/base/url_util.h" - #include "third_party/abseil-cpp/absl/types/variant.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif diff --git a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index a4b4f32f349f..f8d6d3703227 100644 --- a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,20 +1,20 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -316,7 +316,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector preload_libraries = {binary_path}; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::vector extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -330,7 +330,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) .WithExtraCommandLineSwitches(extra_switches) #endif // BUILDFLAG(IS_WIN) .Pass()); diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc deleted file mode 100644 index 9f8da6367ccd..000000000000 --- a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2024-06-25 12:08:48 UTC -+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc -@@ -15,7 +15,7 @@ - #include "components/send_tab_to_self/features.h" - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" - #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" - #endif -@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController* - ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( - Profile* profile) { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - for (const std::unique_ptr& handler : - applicable_handlers_) { - auto* button_controller = diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc deleted file mode 100644 index 376f8d1f3499..000000000000 --- a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2024-06-25 12:08:48 UTC -+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc -@@ -16,7 +16,7 @@ - #include "components/send_tab_to_self/send_tab_to_self_model.h" - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" - #endif - -@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( - const std::vector& new_entries) { - for (const std::unique_ptr& handler : GetHandlers()) { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Only respond to notifications corresponding to this service's profile - // for these OSes; mobile does not have a Profile. - // Cast note: on desktop, handlers are guaranteed to be the derived class diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc index d40f0143cb3e..b90d51817367 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc -@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte +@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte return; } } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) CHECK(contents.value()); content::WebContents* web_contents = contents.value().get(); if (supervised_user:: diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index c0ec8719ad5a..8c2c90f50584 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,20 +1,20 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc -@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager:: +@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { SetActiveForSupervisedUsers(); UpdateManagementPolicyRegistration(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SupervisedUserExtensionsManager:: MaybeMarkExtensionsLocallyParentApproved() { supervised_user::LocallyParentApprovedExtensionsMigrationState diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index cca682019c6a..ee7cd9fa7782 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,26 +1,26 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc -@@ -34,12 +34,12 @@ +@@ -33,12 +33,12 @@ #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "ui/android/view_android.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) namespace { bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) { if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) { -@@ -161,7 +161,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc +@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // When an unauthenticated supervised user tries to access YouTube, we force // re-authentication with an interstitial so that YouTube can be subject to // content restrictions. This interstitial is only available on Desktop diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 05fc96b7dca0..fab259c49cba 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -227,7 +227,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc index b10b8b55dc98..0de9a12544b0 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,20 +1,20 @@ ---- chrome/browser/themes/theme_service.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/themes/theme_service.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/themes/theme_service.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations) { diff --git a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index be8b40271e87..006d2dd7613c 100644 --- a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -495,7 +495,7 @@ +@@ -497,7 +497,7 @@ #if BUILDFLAG(IS_CHROMEOS) #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ E(kUseSystemTitleBar, IDC_USE_SYSTEM_TITLE_BAR) \ E(kRestoreWindow, IDC_RESTORE_WINDOW) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h index 6db58f6ac4d1..65d361019c60 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser.h +++ b/www/iridium/files/patch-chrome_browser_ui_browser.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/browser.h.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/browser.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/browser.h -@@ -300,7 +300,7 @@ class Browser : public TabStripModelObserver, +@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver, std::optional display_id; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // When the browser window is shown, the desktop environment is notified // using this ID. In response, the desktop will stop playing the "waiting // for startup" animation (if any). diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc index 0e2a83b4cbbe..1c7bc766f343 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,74 +1,74 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -127,7 +127,7 @@ +@@ -126,7 +126,7 @@ #include "components/user_manager/user_manager.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/base/ime/text_edit_commands.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" - #endif @@ -136,7 +136,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -329,7 +329,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -332,7 +332,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -581,7 +581,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -595,7 +595,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -801,7 +801,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -812,7 +812,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) chrome::CreateDesktopShortcutForActiveWebContents(browser_); #else web_app::CreateWebAppFromCurrentWebContents( -@@ -968,7 +968,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -979,7 +979,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) case IDC_CHROME_WHATS_NEW: #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ - (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) + (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) ShowChromeWhatsNew(browser_); break; #else -@@ -1284,7 +1284,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1324,7 +1324,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); -@@ -1640,7 +1640,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) command_updater_.UpdateCommandEnabled( IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); #else diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc b/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc index b02c72124660..89ab0fd83d4e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -1991,7 +1991,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -1980,7 +1980,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(features::kFewerUpdateConfirmations)) { chrome::AttemptRelaunch(); return; diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index ea17dd777734..44515fba34e4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -71,7 +71,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry +@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, base::Time()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser, -@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForProfile, std::string()); registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForProfile, diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc index 01681e503e3c..176711eece65 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -85,7 +85,7 @@ +@@ -84,7 +84,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -379,7 +379,7 @@ void ShowChromeTips(Browser* browser) { +@@ -381,7 +381,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -699,7 +699,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void ShowWebAppSettingsImpl(Browser* browser, Profile* profile, const std::string& app_id, diff --git a/www/iridium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/www/iridium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc new file mode 100644 index 000000000000..335f5790feb5 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig 2025-05-07 06:48:23 UTC ++++ chrome/browser/ui/prefs/prefs_tab_helper.cc +@@ -66,7 +66,7 @@ + #include + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If a font name in prefs default values starts with a comma, consider it's a + // comma-separated font list and resolve it to the first available font. + #define PREFS_FONT_LIST 1 diff --git a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 138e0dc89883..96f169b74811 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -428,7 +428,7 @@ void SigninViewController::ShowModalSyncConfirmationDi +@@ -443,7 +443,7 @@ void SigninViewController::ShowModalSyncConfirmationDi void SigninViewController::ShowModalManagedUserNoticeDialog( std::unique_ptr create_param) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) CloseModalSignin(); dialog_ = std::make_unique( SigninViewControllerDelegate::CreateManagedUserNoticeDelegate( diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 78801cecf25b..11e55a040065 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -94,7 +94,7 @@ const char* const kBadFlags[] = { +@@ -95,7 +95,7 @@ const char* const kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. // http://crbug.com/327295 switches::kEnableSpeechDispatcher, diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 537cd8d3a245..1221e0fbf1f2 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -76,7 +76,7 @@ #include "components/app_restore/full_restore_utils.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -207,7 +207,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) params.startup_id = command_line_->GetSwitchValueASCII("desktop-startup-id"); #endif -@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( continue; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Start the What's New fetch but don't add the tab at this point. The tab // will open as the foreground tab only if the remote content can be // retrieved successfully. This prevents needing to automatically close the diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index ae6feb4ad2e3..024397a21b23 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,26 +1,26 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -216,7 +216,7 @@ +@@ -218,7 +218,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -687,12 +687,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -697,12 +697,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || diff --git a/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc b/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc index 267c0ceba749..418d146c993a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/tabs/features.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -48,7 +48,7 @@ bool CanShowTabSearchPositionSetting() { +@@ -47,7 +47,7 @@ bool CanShowTabSearchPositionSetting() { } // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(kTabSearchPositionSetting); #else return false; diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index 368e87363753..e956580712cf 100644 --- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,29 +1,38 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -530,7 +530,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -419,7 +419,7 @@ TaskManagerTableModel::~TaskManagerTableModel() { + // Note: system_total_time_ is used for both since there is no functional + // difference between browser & system (they are essentially the same tab). + // Instead, the data is routed to the platform appropriate bucket. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser, + system_total_time_); + #elif BUILDFLAG(IS_CHROMEOS) +@@ -560,7 +560,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -693,7 +693,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -723,7 +723,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -935,7 +935,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -1030,7 +1030,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc index 559f836a696d..3d08159e3f62 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/ui_features.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/ui_features.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/ui_features.cc -@@ -67,7 +67,7 @@ bool IsExtensionMenuInRootAppMenu() { +@@ -45,7 +45,7 @@ bool IsExtensionMenuInRootAppMenu() { return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -333,7 +333,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, +@@ -326,7 +326,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kUsePortalAccentColor, "UsePortalAccentColor", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.h b/www/iridium/files/patch-chrome_browser_ui_ui__features.h index bf4f8a1a426f..016337d725be 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.h @@ -1,20 +1,20 @@ ---- chrome/browser/ui/ui_features.h.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/ui_features.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/ui_features.h -@@ -47,7 +47,7 @@ extern const base::FeatureParam kMaxPromptCount; +@@ -31,7 +31,7 @@ BASE_DECLARE_FEATURE(kCloseOmniboxPopupOnInactiveAreaC BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu); bool IsExtensionMenuInRootAppMenu(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -211,7 +211,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); +@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kUsePortalAccentColor); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 724d0729e697..38c882262852 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,34 +1,34 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -67,11 +67,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -70,11 +70,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -102,7 +102,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -151,7 +151,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 068912a37f1c..c7704a8bd1b2 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,56 +1,56 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -52,7 +52,7 @@ #include "ui/aura/window.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif @@ -87,7 +87,7 @@ class ThemeChangedObserver : public views::WidgetObser }; bool IsUsingLinuxSystemTheme(Profile* profile) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -182,7 +182,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() { Init(std::move(params)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SelectNativeTheme(); #else SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); -@@ -368,7 +368,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -568,7 +568,7 @@ void BrowserFrame::OnMenuClosed() { } void BrowserFrame::SelectNativeTheme() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Use the regular NativeTheme instance if running incognito mode, regardless // of system theme (gtk, qt etc). ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); -@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -609,7 +609,7 @@ void BrowserFrame::OnTouchUiChanged() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // System and user theme changes can both change frame buttons, so the frame // always needs to be regenerated on Linux. need_regenerate = true; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index c40c0885ccd8..382eba7e2362 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2519,7 +2519,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating +@@ -2581,7 +2581,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) GetContentsWebView()->SetFastResize(is_dragging); if (multi_contents_view_) { multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging); -@@ -5559,7 +5559,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { +@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { } void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!ShouldShowAvatarToolbarIPH()) { return; } diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index e3e9fd692ea9..de3366562cf5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,92 +1,101 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -62,7 +62,7 @@ #include "ui/aura/window.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" -@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -76,7 +76,7 @@ + + // Windows, Mac and CrOS do not clip child widgets to their parents, so we + // don't have to worry about resizing quite as much. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define PLATFORM_CLIPS_CHILD_WINDOWS + #endif + +@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 34; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -618,7 +618,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -630,7 +630,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -843,7 +843,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -855,7 +855,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); } -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -932,7 +932,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -944,7 +944,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Insets PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1223,7 +1223,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1235,7 +1235,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1378,7 +1378,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1390,7 +1390,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1396,7 +1396,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1408,7 +1408,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS) return gfx::Insets(kResizeBorder); -@@ -1417,7 +1417,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1429,7 +1429,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool PictureInPictureBrowserFrameView::ShouldDrawFrameShadow() const { return static_cast( frame()->native_browser_frame()) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index b5b28828effe..7a68023d289d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,38 +1,38 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -30,7 +30,7 @@ #include "ui/views/layout/flex_layout_view.h" #include "ui/views/widget/widget_observer.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/window_frame_provider.h" #endif -@@ -90,7 +90,7 @@ class PictureInPictureBrowserFrameView +@@ -87,7 +87,7 @@ class PictureInPictureBrowserFrameView void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Insets RestoredMirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -182,7 +182,7 @@ class PictureInPictureBrowserFrameView +@@ -179,7 +179,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Returns whether a client-side shadow should be drawn for the window. bool ShouldDrawFrameShadow() const; -@@ -391,7 +391,7 @@ class PictureInPictureBrowserFrameView +@@ -388,7 +388,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional current_foreground_color_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Used to draw window frame borders and shadow on Linux when GTK theme is // enabled. raw_ptr window_frame_provider_ = nullptr; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 46dab0cf84df..82d1e5441fce 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -419,7 +419,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index aabd4a1634f8..a2279ab5e38e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -2064,7 +2064,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -2089,7 +2089,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // It's not great for promos to overlap the omnibox if the user opens the // drop-down after showing the promo. This especially causes issues on Mac and // Linux due to z-order/rendering issues, see crbug.com/1225046 and diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc index 05b09eb5d4a7..1b8218cc1ae4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -91,7 +91,7 @@ +@@ -92,7 +92,7 @@ #include "ui/strings/grit/ui_strings.h" #include "ui/views/accessibility/view_accessibility.h" -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -549,7 +549,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { +@@ -550,7 +550,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { case signin_util::SignedInState::kSignedOut: case signin_util::SignedInState::kWebOnlySignedIn: { std::string profile_user_display_name, profile_user_email; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) profile_user_display_name = profile->GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserDisplayName); profile_user_email = profile->GetPrefs()->GetString( -@@ -646,7 +646,7 @@ void ProfileMenuView::BuildIdentity() { +@@ -647,7 +647,7 @@ void ProfileMenuView::BuildIdentity() { badge_image_model, menu_title_, menu_subtitle_, management_label); } else { std::string profile_user_display_name, profile_user_email; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) profile_user_display_name = profile->GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserDisplayName); profile_user_email = profile->GetPrefs()->GetString( diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc index e28913e2c4d2..6fdb04bdd59c 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc @@ -1,47 +1,47 @@ ---- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc -@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VLOG(1) << __func__ << " image size=" << image.size().ToString(); aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); -@@ -392,7 +392,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -954,7 +954,7 @@ TabDragController::Liveness TabDragController::DragBro +@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragController::DragBro CHECK_EQ(SetCapture(target_context), Liveness::ALIVE); } -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() { +@@ -1914,7 +1914,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. -#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) +#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2527,7 +2527,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2331,7 +2331,7 @@ TabDragController::Liveness TabDragController::GetLoca } } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Exclude windows which are pending deletion via Browser::TabStripEmpty(). // These windows can be returned in the Linux Aura port because the browser // window which was used for dragging is not hidden once all of its tabs are diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 7284d07fb803..664894f3d812 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -643,7 +643,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -642,7 +642,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Move the hit test area for hovering up so that it is not overlapped by tab // hover cards when they are shown. // TODO(crbug.com/41467565): Once Linux/CrOS widget transparency is solved, diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index 779b5e5f17e7..28ba982b6e47 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -379,7 +379,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) set_accept_events(false); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc index f866d30041b3..c3e633e35018 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc -@@ -96,7 +96,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow +@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged, base::Unretained(this)))); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The New Tab Button can be middle-clicked on Linux. new_tab_button->SetTriggerableEventFlags( new_tab_button->GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index 1f22e3c7042d..c5dccbdf8567 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -511,7 +511,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con +@@ -545,7 +545,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con if (!IsHoverAnimationActive()) { return base_opacity; } - return std::lerp(base_opacity, GetHoverOpacity(), GetHoverAnimationValue()); + return std::lerp(base_opacity, GetHoverOpacity(), static_cast(GetHoverAnimationValue())); } TabActive TabStyleViewsImpl::GetApparentActiveState() const { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index b9099ead5449..e94603d487ef 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -917,7 +917,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -930,7 +930,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered when a shared tab becomes the active tab."))); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1171,7 +1171,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1209,7 +1209,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered to inform users of the availability of the " "new translate screen feature on the Lens Overlay."))); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // kIPHDesktopPWAsLinkCapturingLaunch: registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index 6bc69902e9aa..acf093258ac2 100644 --- a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -518,7 +518,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun Browser* browser, Profile* profile, const std::string& app_id) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -747,7 +747,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( } } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::Feature& GetPromoFeatureEngagementFromBrowser( const Browser* browser) { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc index 2ae70da32550..f9c4686f8cbf 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -62,7 +62,7 @@ +@@ -61,7 +61,7 @@ #include "ui/base/window_open_disposition_utils.h" #include "url/gurl.h" -static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)); +static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); using content::WebUI; using extensions::Extension; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index 7f38bcda9569..b99cc2d624a6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,65 +1,65 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc @@ -54,7 +54,7 @@ #include "net/ssl/client_cert_store_mac.h" #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" - #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" - #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -174,7 +174,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto + #include "chrome/browser/policy/chrome_browser_policy_connector.h" +@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto }; #endif -#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) std::unique_ptr CreatePlatformClientCertLoader( Profile* profile) { #if BUILDFLAG(IS_WIN) -@@ -189,7 +189,7 @@ std::unique_ptr CreatePlatformC +@@ -192,7 +192,7 @@ std::unique_ptr CreatePlatformC } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -347,7 +347,7 @@ class ClientCertSource : public CertificateManagerPage +@@ -368,7 +368,7 @@ class ClientCertSource : public CertificateManagerPage std::optional certs_; }; -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // ChromeOS currently can use either Kcer or NSS for listing client certs, and // Linux uses NSS only. This interface provides an abstraction to hide that // from WritableClientCertSource. Currently this class only handles reading -@@ -1078,7 +1078,7 @@ CreatePlatformClientCertSource( +@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource( mojo::Remote* remote_client, Profile* profile) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique(remote_client, profile); #else return std::make_unique( -@@ -1086,7 +1086,7 @@ CreatePlatformClientCertSource( +@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource( #endif } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr CreateProvisionedClientCertSource(Profile* profile) { return std::make_unique( -@@ -1135,7 +1135,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow +@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow return client_cert_policy_ == ClientCertificateManagementPermission::kAll; } -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ClientCertManagementAccessControls::ClientCertManagementAccessControls( Profile* profile) {} diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index 7f78811ca0bc..095676e89059 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -1,76 +1,77 @@ ---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -136,26 +136,26 @@ +@@ -137,7 +137,7 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h" - #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" + #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h" +@@ -145,19 +145,19 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_ui.h" #endif // !BUILDFLAG(IS_CHROMEOS) && !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_BSD) #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -320,7 +320,7 @@ void RegisterChromeWebUIConfigs() { +@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) map.AddWebUIConfig(std::make_unique()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_OPENBSD) -@@ -345,7 +345,7 @@ void RegisterChromeWebUIConfigs() { +@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); -@@ -353,13 +353,13 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique()); + map.AddWebUIConfig(std::make_unique()); +@@ -357,13 +357,13 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) map.AddWebUIConfig(std::make_unique()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) map.AddWebUIConfig( std::make_unique()); map.AddWebUIConfig(std::make_unique()); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 722ea766f0f6..67207234e19d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,40 +1,40 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -114,16 +114,16 @@ +@@ -118,16 +118,16 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/commerce/product_specifications_ui.h" #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -404,7 +404,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -408,7 +408,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return NewTabPageUI::GetFaviconResourceBytes(scale_factor); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) { return WhatsNewUI::GetFaviconResourceBytes(scale_factor); } -@@ -438,7 +438,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -442,7 +442,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (page_url.host_piece() == commerce::kChromeUICompareHost) { return commerce::ProductSpecificationsUI::GetFaviconResourceBytes( scale_factor); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index 87d432b3c365..f7f2d37967cc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -74,7 +74,7 @@ +@@ -77,7 +77,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" -@@ -420,7 +420,7 @@ std::unique_ptr CreateEnterpriseWa +@@ -424,7 +424,7 @@ std::unique_ptr CreateEnterpriseWa } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr CreateSupervisedUserVerificationPageForYouTube( content::WebContents* web_contents, -@@ -647,7 +647,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) } else if (path_without_query == "/supervised-user-verify") { interstitial_delegate = CreateSupervisedUserVerificationPageForYouTube( web_contents, /*is_main_frame=*/true); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index c0e9f5524058..4591d1e65a51 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,65 +1,65 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -138,7 +138,7 @@ +@@ -140,7 +140,7 @@ #include "chrome/browser/ui/webui/settings/system_handler.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/display/screen.h" #endif -@@ -157,7 +157,7 @@ +@@ -159,7 +159,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -282,7 +282,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou - {"focusHighlightLabel", - IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, +@@ -288,7 +288,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou + {"toastAlertLevelDescription", + IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION}, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -571,7 +571,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -579,7 +579,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -601,7 +601,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht html_source->AddBoolean("tabSearchIsRightAlignedAtStartup", tabs::GetTabSearchTrailingTabstrip(profile)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; -@@ -1504,7 +1504,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* +@@ -1495,7 +1495,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* g_browser_process->GetApplicationLocale()) .spec(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) html_source->AddString( "syncDisconnectManagedProfileExplanation", l10n_util::GetStringFUTF8( diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index dca5b4b5ba68..169afcebffda 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -164,7 +164,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr +@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name); if (AccountInfo::IsManaged(entry->GetHostedDomain())) { profile_entry.Set("avatarBadge", "cr:domain"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc index 5da58916915a..d03a74b1eb17 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc @@ -50,7 +50,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/resource_path.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "net/base/url_util.h" @@ -90,7 +90,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( } whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return g_browser_process->GetFeatures()->whats_new_registry(); #else return nullptr; -@@ -794,7 +794,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats +@@ -828,7 +828,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats } void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) GURL url = net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL), "staging", "true"); NavigateParams params(profile_, url, ui::PAGE_TRANSITION_TYPED); diff --git a/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc b/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc index 92a9b8f99b0e..d4149a2d02f2 100644 --- a/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc +++ b/www/iridium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc @@ -1,11 +1,11 @@ ---- chrome/browser/upgrade_detector/version_history_client.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/upgrade_detector/version_history_client.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/upgrade_detector/version_history_client.cc -@@ -50,7 +50,7 @@ GURL GetVersionReleasesUrl(base::Version version) { +@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version version) { #define CURRENT_PLATFORM "win" #endif -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define CURRENT_PLATFORM "linux" diff --git a/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index b1171e872198..bfc3b0d2668e 100644 --- a/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,20 +1,20 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" -@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF +@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) data_fetchers.emplace( Fetcher::kTabModel, std::make_unique( diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 1e921900e07a..da2464d61dec 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,20 +1,20 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc -@@ -25,7 +25,7 @@ namespace { +@@ -26,7 +26,7 @@ namespace { const char* g_preinstalled_app_for_testing = nullptr; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(b/268221237): Remove this allow-list. const char kDefaultAllowedExtensionIds[] = "alhngdkjgnedakdlnamimgfihgkmenbh," -@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo +@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo return prefs && prefs->IsExternalExtensionUninstalled(extension_id); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, const std::string& extension_id) { if (testing::g_enable_chrome_apps_for_testing) { diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index 1a5dc583c2ad..c909566cccf5 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -660,7 +660,7 @@ std::unique_ptr OsIntegrationManager::Bu +@@ -662,7 +662,7 @@ std::unique_ptr OsIntegrationManager::Bu } } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const std::vector& shortcuts_menu_item_infos = app->shortcuts_menu_item_infos(); DCHECK_LE(shortcuts_menu_item_infos.size(), kMaxApplicationDockMenuItems); diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc index abe969c4cdd4..8b1e7519c1b3 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc -@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT +@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn // different from other platforms, see web_app_run_on_os_login_manager.h for // more info. bool DoesRunOnOsLoginRequireExecution() { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(features::kDesktopPWAsRunOnOsLogin); #else return false; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index 7349b0085eeb..89146023fe69 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,20 +1,20 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2025-02-22 18:06:53 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -22,7 +22,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -75,7 +75,7 @@ struct ShortcutInfo { +@@ -77,7 +77,7 @@ struct ShortcutInfo { // the installed PWA experience and thus the icons are not designed to be // displayed on an OS dock. bool is_diy_app = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::set actions; #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 86ab5ab8be37..c802b580d2b8 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,11 +1,11 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -574,7 +574,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -577,7 +577,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // No caBLEv1 on Linux. It tends to crash bluez. if (base::Contains(pairings_from_extension, device::CableDiscoveryData::Version::V1, diff --git a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc index 608b4ea92018..a5f8d5a5ec6a 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,20 +1,20 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -711,7 +711,7 @@ base::flat_set GetGaiaIDs( +@@ -689,7 +689,7 @@ base::flat_set GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return label; #else return std::string("placeholder"); -@@ -721,7 +721,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -699,7 +699,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional UserVerifyingKeyLabelFromString( std::string saved_label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return saved_label; #else return std::nullopt; diff --git a/www/iridium/files/patch-chrome_browser_webauthn_password__credential__controller.cc b/www/iridium/files/patch-chrome_browser_webauthn_password__credential__controller.cc new file mode 100644 index 000000000000..f23db80c3993 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_webauthn_password__credential__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/password_credential_controller.cc.orig 2025-05-07 06:48:23 UTC ++++ chrome/browser/webauthn/password_credential_controller.cc +@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient* GetPasswordMa + } + + std::u16string GetAuthenticationMessage(std::string_view rp_id) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return u""; + #else + return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH, diff --git a/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc index 6c85b440e8c5..e8f50c6fbcd1 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc @@ -1,11 +1,11 @@ ---- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/browser/webauthn/unexportable_key_utils.cc -@@ -34,7 +34,7 @@ GetWebAuthnUnexportableKeyProvider() { +@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() { // If there is a scoped UnexportableKeyProvider configured, we always use // that so that tests can still override the key provider. const bool use_software_provider = --#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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) !crypto::internal::HasScopedUnexportableKeyProvider(); #else false; diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index fa8a40c490e4..88684c3b9e1d 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,56 +1,56 @@ ---- chrome/common/chrome_features.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/common/chrome_features.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/common/chrome_features.cc @@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, @@ -98,7 +98,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. @@ -233,7 +233,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT @@ -259,7 +259,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -834,7 +834,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -898,7 +898,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -847,7 +847,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit +@@ -911,7 +911,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kListWebAppsSwitch, "ListWebAppsSwitch", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h index ae4f3f0d10c1..3ceaf1b684b2 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,45 +1,45 @@ ---- chrome/common/chrome_features.h.orig 2025-04-16 18:18:42 UTC +--- chrome/common/chrome_features.h.orig 2025-05-07 06:48:23 UTC +++ chrome/common/chrome_features.h @@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -146,7 +146,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -494,7 +494,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -521,7 +521,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam kLinuxLowMemoryMonitorModerateLevel; -@@ -502,7 +502,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -529,7 +529,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kListWebAppsSwitch); #endif diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc index 16517dcd8206..dab8f76ae528 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.cc +++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc @@ -1,82 +1,82 @@ ---- chrome/common/chrome_paths.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/common/chrome_paths.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/common/chrome_paths.cc -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ #include "base/apple/foundation_util.h" #endif -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) #include "components/policy/core/common/policy_paths.h" #endif -@@ -44,14 +44,14 @@ +@@ -48,14 +48,14 @@ namespace { - namespace { + std::optional g_override_using_default_data_directory_for_testing; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The path to the external extension .json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -208,7 +208,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -500,13 +500,13 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; } #endif -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { -@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -554,7 +554,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #if BUILDFLAG(ENABLE_EXTENSIONS) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -568,6 +568,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -572,6 +572,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath( FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); +#elif BUILDFLAG(IS_FREEBSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/iridium-browser/native-messaging-hosts")); #else cur = base::FilePath( FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); diff --git a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h index 00fe703a2371..89653870748e 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_paths_internal.h.orig 2023-07-24 14:27:53 UTC +--- chrome/common/chrome_paths_internal.h.orig 2025-05-07 06:48:23 UTC +++ chrome/common/chrome_paths_internal.h -@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi +@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Gets the path to a safe default download directory for a user. bool GetUserDownloadsDirectorySafe(base::FilePath* result); #endif diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index 6c240ac00c84..ece1f9d9c392 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,20 +1,20 @@ ---- chrome/common/chrome_switches.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/common/chrome_switches.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/common/chrome_switches.cc -@@ -874,7 +874,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -883,7 +883,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. -@@ -897,7 +897,7 @@ const char kGlicAllowedOrigins[] = "glic-webui-allowed - const char kGlicDev[] = "glic-dev"; +@@ -911,7 +911,7 @@ const char kGlicDev[] = "glic-dev"; + const char kGlicHostLogging[] = "glic-host-logging"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Writes open and installed web apps for each profile to the specified file // without launching a new browser window or tab. Pass a absolute file path to // specify where to output the information. Can be used together with optional diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index 45fce740871e..732323a94897 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,20 +1,20 @@ ---- chrome/common/chrome_switches.h.orig 2025-04-16 18:18:42 UTC +--- chrome/common/chrome_switches.h.orig 2025-05-07 06:48:23 UTC +++ chrome/common/chrome_switches.h -@@ -271,7 +271,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; extern const char kForceNtpMobilePromo[]; -@@ -286,7 +286,7 @@ extern const char kGlicAllowedOrigins[]; - extern const char kGlicDev[]; +@@ -290,7 +290,7 @@ extern const char kGlicDev[]; + extern const char kGlicHostLogging[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kListApps[]; extern const char kProfileBaseName[]; extern const char kProfileManagementAttributes[]; diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index 02a51a515c82..ac15114e3aec 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,91 +1,91 @@ ---- chrome/common/pref_names.h.orig 2025-04-16 18:18:42 UTC +--- chrome/common/pref_names.h.orig 2025-05-07 06:48:23 UTC +++ chrome/common/pref_names.h @@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem inline constexpr char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif @@ -1502,7 +1502,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -2120,7 +2120,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2129,7 +2129,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2613,14 +2613,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2622,14 +2622,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // A boolean pref to determine whether or not the network service is running // sandboxed. inline constexpr char kNetworkServiceSandboxEnabled[] = "net.network_service_sandbox"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2712,7 +2712,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ +@@ -2721,7 +2721,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ inline constexpr char kIsolatedWebAppPendingInitializationCount[] = "profile.isolated_web_app.install.pending_initialization_count"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3240,7 +3240,7 @@ inline constexpr char kKioskChromeAppsForceAllowed[] = #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3764,7 +3764,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo +@@ -3763,7 +3763,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3960,7 +3960,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -3959,7 +3959,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4057,7 +4057,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4056,7 +4056,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If this exists and is true, Chrome may run system DNS resolution out of the // network process. If false, Chrome will run system DNS resolution in the // network process. If non-existent, Chrome will decide where to run system DNS diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h index dc968f808a85..5d0f0d7120d4 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.h +++ b/www/iridium/files/patch-chrome_common_url__constants.h @@ -1,11 +1,11 @@ ---- chrome/common/url_constants.h.orig 2025-04-16 18:18:42 UTC +--- chrome/common/url_constants.h.orig 2025-05-07 06:48:23 UTC +++ chrome/common/url_constants.h -@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -983,7 +983,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // "Learn more" URL for the chrome apps deprecation dialog. inline constexpr char kChromeAppsDeprecationLearnMoreURL[] = "https://support.google.com/chrome?p=chrome_app_deprecation"; diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index 33e296926bf9..8d7af9596985 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,47 +1,47 @@ ---- chrome/common/webui_url_constants.h.orig 2025-04-16 18:18:42 UTC +--- chrome/common/webui_url_constants.h.orig 2025-05-07 06:48:23 UTC +++ chrome/common/webui_url_constants.h -@@ -509,18 +509,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome +@@ -513,18 +513,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIDiscardsHost[] = "discards"; inline constexpr char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -532,11 +532,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -536,11 +536,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUISandboxHost[] = "sandbox"; #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser"; -@@ -558,7 +558,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[ - inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; +@@ -565,7 +565,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] = + "chrome://history-sync-optin/"; #endif -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) inline constexpr char kChromeUITabModalConfirmDialogHost[] = diff --git a/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc b/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc index 6b603867e651..638f693fe3ea 100644 --- a/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc +++ b/www/iridium/files/patch-chrome_enterprise__companion_event__logger.cc @@ -1,11 +1,11 @@ ---- chrome/enterprise_companion/event_logger.cc.orig 2025-03-18 16:46:04 UTC +--- chrome/enterprise_companion/event_logger.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/enterprise_companion/event_logger.cc -@@ -124,7 +124,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() { +@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() { metadata.set_application_arch(proto::ARM64); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metadata.set_os_platform(proto::LINUX); #elif BUILDFLAG(IS_MAC) metadata.set_os_platform(proto::MAC); diff --git a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 3779fe489da1..7ce56597f612 100644 --- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,47 +1,47 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2025-02-22 18:06:53 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -50,7 +50,7 @@ +@@ -49,7 +49,7 @@ #include "printing/backend/cups_connection_pool.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -77,7 +77,7 @@ namespace printing { +@@ -76,7 +76,7 @@ namespace printing { namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void InstantiateLinuxUiDelegate() { // TODO(crbug.com/40561724) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() { +@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() { #endif scoped_refptr GetPrintingTaskRunner() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( +@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS) // Try to fill in advanced settings based upon basic info options. PrinterBasicInfo basic_info; if (print_backend_->GetPrinterBasicInfo(*printer_name, &basic_info) == diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc index 9f6392ec1d70..41c6c1b082a8 100644 --- a/www/iridium/files/patch-chrome_utility_services.cc +++ b/www/iridium/files/patch-chrome_utility_services.cc @@ -1,29 +1,29 @@ ---- chrome/utility/services.cc.orig 2025-04-16 18:18:42 UTC +--- chrome/utility/services.cc.orig 2025-05-07 06:48:23 UTC +++ chrome/utility/services.cc -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -209,7 +209,7 @@ auto RunMacNotificationService( +@@ -205,7 +205,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto RunSystemSignalsService( mojo::PendingReceiver receiver) { -@@ -485,7 +485,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc index fc488edef44d..68c7525a704e 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,38 +1,38 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2025-02-22 18:06:53 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2025-05-07 06:48:23 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -95,7 +95,7 @@ +@@ -100,7 +100,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include #include #include -@@ -268,7 +268,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath GetApplicationFontsDir() { std::unique_ptr env(base::Environment::Create()); -@@ -314,7 +314,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -491,7 +491,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -496,7 +496,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique(); #endif // defined(USE_AURA) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8* dir_font_char8 = reinterpret_cast(dir_font.value().data()); diff --git a/www/iridium/files/patch-components_BUILD.gn b/www/iridium/files/patch-components_BUILD.gn index 04ba556b3677..e4c4a24a3289 100644 --- a/www/iridium/files/patch-components_BUILD.gn +++ b/www/iridium/files/patch-components_BUILD.gn @@ -1,28 +1,28 @@ ---- components/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- components/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ components/BUILD.gn @@ -208,7 +208,6 @@ test("components_unittests") { "//components/content_settings/core/browser:unit_tests", "//components/content_settings/core/common:unit_tests", "//components/country_codes:unit_tests", - "//components/crash/core/common:unit_tests", "//components/cross_device/logging:unit_tests", "//components/crx_file:unit_tests", "//components/data_sharing:unit_tests", -@@ -607,7 +606,7 @@ test("components_unittests") { +@@ -610,7 +609,7 @@ test("components_unittests") { deps += [ "//components/cast:unit_tests" ] } - if (!is_fuchsia) { #!iOS and!Fuchsia + if (!is_fuchsia && !is_bsd) { #!iOS and!Fuchsia deps += [ "//components/crash/content/browser:unit_tests", "//components/crash/core/app:unit_tests", -@@ -765,7 +764,7 @@ test("components_unittests") { +@@ -771,7 +770,7 @@ test("components_unittests") { deps += [ "//components/constrained_window:unit_tests" ] } - if (is_win || is_linux || is_chromeos || is_mac) { + if (is_win || (is_linux && !is_bsd) || is_chromeos || is_mac) { deps += [ "//components/stability_report:unit_tests" ] } diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc index 28df39cd4771..16e0be84af1c 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc @@ -1,29 +1,38 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-04-16 18:18:42 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-05-07 06:48:23 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc -@@ -1003,7 +1003,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { +@@ -950,7 +950,7 @@ void PaymentsDataManager::SetPrefService(PrefService* + &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange, + base::Unretained(this))); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + pref_registrar_.Add( + prefs::kAutofillBnplEnabled, + base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange, +@@ -1026,7 +1026,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const { return prefs::HasSeenBnpl(pref_service_); } -@@ -1172,7 +1172,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar - bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const { - // The feature is only for Linux, Windows, Mac, and Fuchsia. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // This option should only be shown for users that have not enabled the Sync - // Feature and that have server credit cards available. - // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and -@@ -2026,7 +2026,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( +@@ -2022,7 +2022,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( bool PaymentsDataManager::AreBnplIssuersSupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return app_locale_ == "en-US" && + return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" && base::FeatureList::IsEnabled( features::kAutofillEnableBuyNowPayLaterSyncing); +@@ -2055,7 +2055,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits() + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void PaymentsDataManager::OnBnplEnabledPrefChange() { + // On pref change to `false`, clearing BNPL issuers is implicitly handled by + // `GetBnplIssuers()`, since it returns an empty vector when diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h index 23c8197eb6a2..9e94c0e0d11b 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h +++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h @@ -1,11 +1,20 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-04-16 18:18:42 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-05-07 06:48:23 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h @@ -354,7 +354,7 @@ class PaymentsDataManager : public AutofillWebDataServ void SetAutofillHasSeenIban(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Returns the value of the kAutofillHasSeenBnpl pref. bool IsAutofillHasSeenBnplPrefEnabled() const; +@@ -683,7 +683,7 @@ class PaymentsDataManager : public AutofillWebDataServ + void ClearAllCreditCardBenefits(); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Monitors the `kAutofillBnplEnabled` preference for changes and controls the + // clearing/loading of payment instruments accordingly. Will also log the + // `Autofill.SettingsPage.BnplToggled` metric. diff --git a/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc index b9c80cb8eec2..11751e1737b2 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc @@ -1,20 +1,20 @@ ---- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-04-16 18:18:42 UTC +--- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-05-07 06:48:23 UTC +++ components/autofill/core/browser/payments/bnpl_manager.cc -@@ -109,7 +109,7 @@ void BnplManager::OnAmountExtractionReturned( +@@ -114,7 +114,7 @@ void BnplManager::OnAmountExtractionReturned( bool BnplManager::ShouldShowBnplSettings() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const PaymentsDataManager& payments_data_manager = payments_autofill_client().GetPaymentsDataManager(); -@@ -223,7 +223,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl( +@@ -431,7 +431,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl( .Run(update_suggestions_result.suggestions, trigger_source); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) payments_autofill_client().GetPaymentsDataManager().SetAutofillHasSeenBnpl(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc index bac68db6f090..9d6c24ac4898 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2025-04-16 18:18:42 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2025-05-07 06:48:23 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -269,7 +269,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -267,7 +267,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, #endif // BUILDFLAG(IS_ANDROID) bool ShouldShowImprovedUserConsentForCreditCardSave() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The new user consent UI is fully launched on MacOS, Windows and Linux. return true; #else diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc index 0dff42d0bbff..60ddeaf54585 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc @@ -1,38 +1,38 @@ ---- components/autofill/core/common/autofill_prefs.cc.orig 2025-04-16 18:18:42 UTC +--- components/autofill/core/common/autofill_prefs.cc.orig 2025-05-07 06:48:23 UTC +++ components/autofill/core/common/autofill_prefs.cc -@@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -98,7 +98,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled, - false); registry->RegisterBooleanPref( -@@ -297,7 +297,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer + kAutofillBnplEnabled, true, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); +@@ -277,7 +277,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void SetAutofillBnplEnabled(PrefService* prefs, bool value) { prefs->SetBoolean(kAutofillBnplEnabled, value); } -@@ -306,7 +306,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -286,7 +286,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return prefs->GetBoolean(kAutofillBnplEnabled); #else return false; -@@ -315,7 +315,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { +@@ -295,7 +295,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // If called, always sets the pref to true, and once true, it will follow the // user around forever. void SetAutofillHasSeenBnpl(PrefService* prefs) { diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h index 0f2a0d9d09c3..45fcfb6b78e2 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h @@ -1,38 +1,29 @@ ---- components/autofill/core/common/autofill_prefs.h.orig 2025-04-16 18:18:42 UTC +--- components/autofill/core/common/autofill_prefs.h.orig 2025-05-07 06:48:23 UTC +++ components/autofill/core/common/autofill_prefs.h -@@ -26,7 +26,7 @@ namespace autofill::prefs { - inline constexpr std::string_view kAutofillAblationSeedPref = - "autofill.ablation_seed"; +@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutofillAblationSee + inline constexpr char kAutofillAiOptInStatus[] = + "autofill.autofill_ai.opt_in_status"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Boolean that is true if BNPL on Autofill is enabled. inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled"; // Boolean that is true if the user has ever seen a BNPL suggestion. -@@ -82,7 +82,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = - inline constexpr char kAutofillPaymentCardBenefits[] = - "autofill.payment_card_benefits"; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Boolean that controls improved autofill filling predictions. When enabled, - // the autofill functionality is enhanced with adopting user data to - // the form being filled in, which is triggered by the user via an extra -@@ -237,7 +237,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, +@@ -208,7 +208,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void SetAutofillBnplEnabled(PrefService* prefs, bool value); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -245,7 +245,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -216,7 +216,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void SetAutofillHasSeenBnpl(PrefService* prefs); bool HasSeenBnpl(const PrefService* prefs); diff --git a/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc index 88663baaae09..1c41bbebbbfe 100644 --- a/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,48 +1,39 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2025-04-16 18:18:42 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2025-05-07 06:48:23 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -156,7 +156,7 @@ BASE_FEATURE(kPriceAnnotationsRegionLaunched, - BASE_FEATURE(kPriceInsights, +@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \ ++ BUILDFLAG(IS_BSD) BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", -@@ -222,7 +222,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) const base::FeatureParam kDiscountOnShoppyPage{ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true}; #else -@@ -231,7 +231,7 @@ const base::FeatureParam kDiscountOnShoppyPage{ +@@ -236,7 +237,7 @@ const base::FeatureParam kDiscountOnShoppyPage{ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, "EnableDiscountInfoApiRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -246,7 +246,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi +@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting, "DiscountDialogAutoPopupBehaviorSetting", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -287,7 +287,8 @@ const base::FeatureParam kDeleteAllMerchantsOnCl - - BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || \ -+ BUILDFLAG(IS_BSD) - BASE_FEATURE(kShoppingListRegionLaunched, - "ShoppingListRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc index d286146d8b37..3154c27167ea 100644 --- a/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,11 +1,11 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2025-03-18 16:46:04 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2025-05-07 06:48:23 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -375,7 +375,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -377,7 +377,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; #else return false; diff --git a/www/iridium/files/patch-components_crash_core_app_BUILD.gn b/www/iridium/files/patch-components_crash_core_app_BUILD.gn index a5900d865b12..0bc6361ffc26 100644 --- a/www/iridium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/iridium/files/patch-components_crash_core_app_BUILD.gn @@ -1,43 +1,43 @@ ---- components/crash/core/app/BUILD.gn.orig 2025-02-22 18:06:53 UTC +--- components/crash/core/app/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ components/crash/core/app/BUILD.gn @@ -70,6 +70,10 @@ static_library("app") { ] } + if (is_bsd) { + sources -= [ "crashpad.cc" ] + } + defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] @@ -83,7 +87,7 @@ static_library("app") { "//third_party/crashpad/crashpad/util", ] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "crashpad_linux.cc" ] data_deps = [ ":chrome_crashpad_handler" ] } -@@ -103,7 +107,7 @@ static_library("app") { +@@ -105,7 +109,7 @@ static_library("app") { libs = [ "log" ] } - if (is_android || is_linux || is_chromeos) { + if ((is_android || is_linux || is_chromeos) && !is_bsd) { deps += [ "//base:base_static", "//components/crash/core/common", -@@ -235,11 +239,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -237,11 +241,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] - - deps = [ - ":crashpad_handler_main", - "//third_party/crashpad/crashpad/handler", - ] if (is_mac && (is_component_build || is_asan || is_ubsan_any)) { ldflags = [ diff --git a/www/iridium/files/patch-components_device__signals_core_browser_browser__utils.h b/www/iridium/files/patch-components_device__signals_core_browser_browser__utils.h new file mode 100644 index 000000000000..0ff352cbf560 --- /dev/null +++ b/www/iridium/files/patch-components_device__signals_core_browser_browser__utils.h @@ -0,0 +1,20 @@ +--- components/device_signals/core/browser/browser_utils.h.orig 2025-05-07 06:48:23 UTC ++++ components/device_signals/core/browser/browser_utils.h +@@ -15,7 +15,7 @@ namespace device_signals { + // Returns the hostname of the current machine. + std::string GetHostName(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns the hostname of the current machine. + std::vector GetSystemDnsServers(); + +@@ -23,7 +23,7 @@ std::vector GetSystemDnsServers(); + SettingValue GetOSFirewall(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns the path to the ufw configuration file. + const char** GetUfwConfigPath(); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/iridium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc similarity index 78% rename from www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc rename to www/iridium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc index acbdca1cffb5..af8a7374e4a6 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc +++ b/www/iridium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc @@ -1,78 +1,78 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2025-03-18 16:46:04 UTC -+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc +--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig 2025-05-07 06:48:23 UTC ++++ components/device_signals/core/common/linux/platform_utils_linux.cc @@ -4,12 +4,23 @@ - #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" + #include "components/device_signals/core/common/platform_utils.h" +#include "build/build_config.h" + #if defined(USE_GIO) #include #endif // defined(USE_GIO) #include +#if !BUILDFLAG(IS_BSD) #include +#endif +#if BUILDFLAG(IS_BSD) +#include +#include +#include +#include +#endif + #include + #include #include - -@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() { +@@ -100,6 +111,7 @@ SettingValue GetScreenlockSecured() { // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. SettingValue GetDiskEncrypted() { +#if !BUILDFLAG(IS_BSD) struct stat info; // First figure out the device identifier. Fail fast if this fails. - if (stat("/", &info) != 0) -@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() { + if (stat("/", &info) != 0) { +@@ -122,11 +134,35 @@ SettingValue GetDiskEncrypted() { } return SettingValue::UNKNOWN; } +#endif return SettingValue::DISABLED; } std::vector GetMacAddresses() { std::vector result; +#if BUILDFLAG(IS_BSD) + struct ifaddrs* ifa = nullptr; + + if (getifaddrs(&ifa) != 0) + return result; + + struct ifaddrs* interface = ifa; + for (; interface != nullptr; interface = interface->ifa_next) { + if (interface->ifa_addr == nullptr || + interface->ifa_addr->sa_family != AF_LINK) { + continue; + } + struct sockaddr_dl* sdl = + reinterpret_cast(interface->ifa_addr); + if (!sdl || sdl->sdl_alen != 6) + continue; + char* link_address = static_cast(LLADDR(sdl)); + result.push_back(base::StringPrintf( + "%02x:%02x:%02x:%02x:%02x:%02x", link_address[0] & 0xff, + link_address[1] & 0xff, link_address[2] & 0xff, link_address[3] & 0xff, + link_address[4] & 0xff, link_address[5] & 0xff)); + } +#else base::DirReaderPosix reader("/sys/class/net"); - if (!reader.IsValid()) + if (!reader.IsValid()) { return result; -@@ -165,6 +201,7 @@ std::vector GetMacAddresses() { +@@ -151,6 +187,7 @@ std::vector GetMacAddresses() { &address); result.push_back(address); } +#endif return result; } diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc index 5b0ec07b78be..c15e92c710aa 100644 --- a/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc +++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc @@ -1,12 +1,47 @@ ---- components/embedder_support/user_agent_utils.cc.orig 2025-04-16 18:18:42 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2025-05-07 06:48:23 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -435,6 +435,9 @@ std::string GetPlatformForUAMetadata() { - # else +@@ -318,7 +318,7 @@ std::string GetUserAgentPlatform() { + return ""; + #elif BUILDFLAG(IS_MAC) + return "Macintosh; "; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return "X11; "; // strange, but that's what Firefox uses + #elif BUILDFLAG(IS_ANDROID) + return "Linux; "; +@@ -344,7 +344,7 @@ std::string GetUnifiedPlatform() { + return "Windows NT 10.0; Win64; x64"; + #elif BUILDFLAG(IS_FUCHSIA) + return "Fuchsia"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "X11; Linux x86_64"; + #elif BUILDFLAG(IS_IOS) + if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { +@@ -601,6 +601,9 @@ std::string GetPlatformForUAMetadata() { + #else return "Chromium OS"; - # endif + #endif +#elif BUILDFLAG(IS_BSD) + // The internet is weird... + return "Linux"; #else return std::string(version_info::GetOSType()); #endif +@@ -813,6 +816,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons + "Android %s", os_version.c_str() + #elif BUILDFLAG(IS_FUCHSIA) + "Fuchsia" ++#elif BUILDFLAG(IS_BSD) ++#if defined(__x86_64__) ++ "Linux x86_64; %s %s", ++#elif defined(__aarch64__) ++ "Linux aarch64; %s %s", ++#else ++ "Linux i686; %s %s", ++#endif ++ unixinfo.sysname, // e.g. Linux ++ cpu_type.c_str() // e.g. i686 + #elif BUILDFLAG(IS_IOS) + "CPU %s OS %s like Mac OS X", cpu_type.c_str(), + os_version.c_str() diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index 856ffb7ebdaa..d1b121dbc72f 100644 --- a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,29 +1,29 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-04-16 18:18:42 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-05-07 06:48:23 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -151,7 +151,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) ASSERT_EQ("CrOS", pieces[0]); ASSERT_EQ("x86_64", pieces[1]); ASSERT_EQ("14541.0.0", pieces[2]); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Post-UA Reduction there is a single value for Linux: // X11; Linux x86_64 ASSERT_EQ(2u, pieces.size()); -@@ -339,7 +339,7 @@ class UserAgentUtilsTest : public testing::Test, +@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testing::Test, "X11; CrOS x86_64 14541.0.0"; #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) "X11; Linux x86_64"; #elif BUILDFLAG(IS_MAC) "Macintosh; Intel Mac OS X 10_15_7"; -@@ -699,7 +699,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { +@@ -696,7 +696,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { #endif #elif BUILDFLAG(IS_ANDROID) EXPECT_EQ(metadata.platform, "Android"); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) EXPECT_EQ(metadata.platform, "Linux"); #elif BUILDFLAG(IS_FREEBSD) EXPECT_EQ(metadata.platform, "FreeBSD"); diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc index 296eec10d162..88993bd0bb49 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,30 +1,30 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2025-04-16 18:18:42 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2025-05-07 06:48:23 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -100,7 +100,7 @@ std::optional CreateNewUserGestureInPro std::optional GetClientSideFeatureConfig( const base::Feature* feature) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // The IPH bubble for link capturing has a trigger set to ANY so that it // always shows up. The per app specific guardrails are independently stored @@ -119,7 +119,7 @@ std::optional GetClientSideFeatureConfi #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { FeatureConfig config; config.valid = true; -@@ -1722,7 +1722,8 @@ std::optional GetClientSideFeatureConfi +@@ -1740,7 +1740,8 @@ std::optional GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { - // Credit card benefit IPH is shown: + // The credit card benefit IPH appears up to three times over 10 years and diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc index a84a233a2d38..43eba87fe51b 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,29 +1,29 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2025-04-16 18:18:42 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2025-05-07 06:48:23 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -682,7 +682,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -710,7 +710,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature, - "IPH_AutofillCardInfoRetrievalSuggestion", -@@ -823,7 +823,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, + BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature, + "IPH_AutofillBnplAffirmOrZipSuggestion", +@@ -857,7 +857,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This can be enabled by default, as the DesktopPWAsLinkCapturing // flag is needed for the IPH linked to this feature to work, and // use-cases to show the IPH are guarded by that flag. diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h index 64569e4e2db9..e1e9cbf79917 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,29 +1,29 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2025-04-16 18:18:42 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2025-05-07 06:48:23 UTC +++ components/feature_engagement/public/feature_constants.h @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -303,7 +303,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg +@@ -316,7 +316,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature); FEATURE_CONSTANTS_DECLARE_FEATURE( - kIPHAutofillCardInfoRetrievalSuggestionFeature); -@@ -359,7 +359,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA +@@ -374,7 +374,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunchAppInTab); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHSupervisedUserProfileSigninFeature); diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc index 0b1ff76acb90..9378e4276a91 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,29 +1,29 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2025-04-16 18:18:42 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2025-05-07 06:48:23 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -170,7 +170,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature, +@@ -175,7 +175,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSSettingsInOverflowMenuBubbleFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -241,7 +241,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -247,7 +247,7 @@ const base::Feature* const kAllFeatures[] = { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - &kIPHAutofillCardInfoRetrievalSuggestionFeature, - &kIPHAutofillCreditCardBenefitFeature, -@@ -294,7 +294,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHAutofillAiOptInFeature, + &kIPHAutofillBnplAffirmOrZipSuggestionFeature, +@@ -302,7 +302,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) &kIPHDesktopPWAsLinkCapturingLaunch, &kIPHDesktopPWAsLinkCapturingLaunchAppInTab, &kIPHSupervisedUserProfileSigninFeature, diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h index 9530828869af..a64e527fb486 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,58 +1,58 @@ ---- components/feature_engagement/public/feature_list.h.orig 2025-04-16 18:18:42 UTC +--- components/feature_engagement/public/feature_list.h.orig 2025-05-07 06:48:23 UTC +++ components/feature_engagement/public/feature_list.h -@@ -302,7 +302,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDownloadAutoDeletionFeat +@@ -312,7 +312,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSettingsInOverflowMenuBu #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -415,7 +415,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF +@@ -427,7 +427,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) - DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, - "IPH_AutofillCreditCardBenefit"); - -@@ -509,7 +510,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF + DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn"); + DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature, + "IPH_AutofillBnplAffirmOrZipSuggestion"); +@@ -523,7 +524,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab, -@@ -682,7 +683,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -697,7 +698,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature), VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -743,7 +744,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -759,7 +760,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) + VARIATION_ENTRY(kIPHAutofillAiOptInFeature), VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), -@@ -795,7 +797,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -812,7 +814,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch), VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunchAppInTab), VARIATION_ENTRY(kIPHSupervisedUserProfileSigninFeature), diff --git a/www/iridium/files/patch-components_gwp__asan_BUILD.gn b/www/iridium/files/patch-components_gwp__asan_BUILD.gn index 460737d2bc59..5708bee18d8e 100644 --- a/www/iridium/files/patch-components_gwp__asan_BUILD.gn +++ b/www/iridium/files/patch-components_gwp__asan_BUILD.gn @@ -1,11 +1,11 @@ ---- components/gwp_asan/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- components/gwp_asan/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ components/gwp_asan/BUILD.gn @@ -15,7 +15,7 @@ test("gwp_asan_unittests") { "//testing/gtest", "//third_party/boringssl", ] -- if (is_win || is_mac || is_linux || is_chromeos || is_android) { -+ if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) { +- if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) { ++ if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) { deps += [ "//components/gwp_asan/client:unit_tests", "//components/gwp_asan/crash_handler:unit_tests", diff --git a/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni b/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni index 4edaa2625eee..35a3ed70322a 100644 --- a/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni +++ b/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni @@ -1,14 +1,14 @@ ---- components/gwp_asan/buildflags/buildflags.gni.orig 2025-04-16 18:18:42 UTC +--- components/gwp_asan/buildflags/buildflags.gni.orig 2025-05-07 06:48:23 UTC +++ components/gwp_asan/buildflags/buildflags.gni @@ -10,10 +10,7 @@ import("//build/config/compiler/compiler.gni") # Android component builds are disabled due to https://crbug.com/976399 # Android requires frame pointers for unwinding, unwind tables aren't shipped in # official builds. -supported_platform = -- is_linux || is_chromeos || is_mac || +- is_linux || is_chromeos || is_mac || is_ios || - (is_win && (current_cpu == "x64" || current_cpu == "arm64")) || - (is_android && !is_component_build && enable_frame_pointers) +supported_platform = false declare_args() { # Is GWP-ASan malloc/PartitionAlloc hooking enabled for chrome/ on a given diff --git a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc index 3d2aa33af03c..1a62e596fe77 100644 --- a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,11 +1,11 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2024-06-25 12:08:48 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2025-05-07 06:48:23 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -75,7 +75,7 @@ namespace { +@@ -76,7 +76,7 @@ namespace { // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) constexpr int kDefaultMaxAllocations = 50; constexpr int kDefaultMaxMetadata = 210; constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2; diff --git a/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc index cca3ec18e77f..66055b4cfcaf 100644 --- a/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,20 +1,20 @@ ---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-11-04 08:56:03 UTC +--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2025-05-07 06:48:23 UTC +++ components/gwp_asan/crash_handler/crash_analyzer.cc @@ -35,7 +35,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" #include "third_party/crashpad/crashpad/util/process/process_memory.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 #elif BUILDFLAG(IS_APPLE) #include -@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo( +@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (exception.Exception() == SIGSEGV || exception.Exception() == SIGBUS) return exception.ExceptionAddress(); #elif BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc b/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc index e271157774e9..f7960e91a398 100644 --- a/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc +++ b/www/iridium/files/patch-components_metrics_drive__metrics__provider.cc @@ -1,11 +1,20 @@ ---- components/metrics/drive_metrics_provider.cc.orig 2025-03-18 16:46:04 UTC +--- components/metrics/drive_metrics_provider.cc.orig 2025-05-07 06:48:23 UTC +++ components/metrics/drive_metrics_provider.cc -@@ -113,7 +113,7 @@ void DriveMetricsProvider::FillDriveMetrics( - response.has_seek_penalty); - RecordTriStateMetric("UMA.SeekPenaltyResult.Base", - response.has_seek_penalty_base); +@@ -21,7 +21,7 @@ + namespace metrics { + + namespace { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void RecordTriStateMetric(const char* name, std::optional sample) { + base::UmaHistogramEnumeration( + name, !sample.has_value() +@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetrics( + drive->set_has_seek_penalty(*response.has_seek_penalty); + } + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/iridium/files/patch-components_metrics_drive__metrics__provider__linux.cc deleted file mode 100644 index 2aa7f2065d39..000000000000 --- a/www/iridium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2023-10-21 11:51:27 UTC -+++ components/metrics/drive_metrics_provider_linux.cc -@@ -4,7 +4,13 @@ - - #include "components/metrics/drive_metrics_provider.h" - -+#if BUILDFLAG(IS_BSD) -+#include -+#define MAJOR(dev) major(dev) -+#define MINOR(dev) minor(dev) -+#else - #include // For MAJOR()/MINOR(). -+#endif - #include - #include - diff --git a/www/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc index bb5537554911..5fc68336002c 100644 --- a/www/iridium/files/patch-components_metrics_metrics__log.cc +++ b/www/iridium/files/patch-components_metrics_metrics__log.cc @@ -1,38 +1,38 @@ ---- components/metrics/metrics_log.cc.orig 2025-04-16 18:18:42 UTC +--- components/metrics/metrics_log.cc.orig 2025-05-07 06:48:23 UTC +++ components/metrics/metrics_log.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "base/win/current_module.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -157,7 +157,7 @@ void RecordCurrentTime( +@@ -158,7 +158,7 @@ void RecordCurrentTime( } } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { @@ -441,7 +441,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); @@ -458,7 +458,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr env = base::Environment::Create(); os->set_xdg_session_type(ToProtoSessionType(base::nix::GetSessionType(*env))); os->set_xdg_current_desktop( diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc index f512270b287f..2f9dc9d72859 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,29 +1,29 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2025-04-16 18:18:42 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/password_form_manager.cc -@@ -63,7 +63,7 @@ +@@ -64,7 +64,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -239,7 +239,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool ShouldShowKeychainErrorBubble( std::optional backend_error) { if (!backend_error.has_value()) { -@@ -898,7 +898,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } -#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (ShouldShowKeychainErrorBubble( form_fetcher_->GetProfileStoreBackendError())) { client_->NotifyKeychainError(); diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc index 2658a5dc9cb6..babcbe1c4aa7 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,20 +1,20 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2025-04-16 18:18:42 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -492,7 +492,7 @@ void PasswordManager::RegisterProfilePrefs( - false); - #endif +@@ -511,7 +511,7 @@ void PasswordManager::RegisterProfilePrefs( + prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); + #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -505,7 +505,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -524,7 +524,7 @@ void PasswordManager::RegisterProfilePrefs( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_IOS) + BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kDeletingUndecryptablePasswordsEnabled, true); #endif diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h index 051924f9ba8a..8db4c0cb8b66 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,20 +1,20 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2025-04-16 18:18:42 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -31,7 +31,7 @@ #include "net/cert/cert_status_flags.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/i18n/rtl.h" #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #include "ui/gfx/geometry/rect_f.h" -@@ -550,7 +550,7 @@ class PasswordManagerClient { - CredentialsCallback callback); +@@ -533,7 +533,7 @@ class PasswordManagerClient { + virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Shows the bubble with the details of the `form`. virtual void OpenPasswordDetailsBubble( const password_manager::PasswordForm& form) = 0; diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index fd1b67478a8b..b9335252f11f 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,29 +1,29 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-03-18 16:46:04 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -45,7 +45,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri +@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Returns the password form corresponding to the `payload` data. In most // cases there is only one such form stored, but having more than one or no // forms is also possible. If there is more than one form, showing any of them -@@ -294,7 +294,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -295,7 +295,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( } case autofill::SuggestionType::kViewPasswordDetails: { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::optional credentials = GetCorrespondingPasswordForm( suggestion.GetPayload(), -@@ -429,7 +429,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass +@@ -425,7 +425,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass const Suggestion::PasswordSuggestionDetails& payload, base::OnceClosure on_allowed) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (payload.is_cross_domain) { cross_domain_confirmation_popup_controller_ = password_client_->ShowCrossDomainConfirmationPopup( diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h index c0ac6c0bdc96..598716cdc417 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -1,20 +1,20 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-11-04 08:56:03 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.h -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_CHROMEOS) -@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au +@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : public autofill::Au std::unique_ptr authenticator_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::unique_ptr cross_domain_confirmation_popup_controller_; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index 1653ed29700e..f02d5f14c9a4 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,20 +1,20 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-11-04 08:56:03 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/password_store/login_database.cc @@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords( bool is_user_data_dir_policy_set, bool is_enabled_by_policy, IsAccountStore is_account_store) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string user_data_dir_string; std::unique_ptr environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it -@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords( + // exists, passwords shouldn't be deleted. +@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (command_line->HasSwitch(password_manager::kPasswordStore)) { RecordShouldDeleteUndecryptablePasswordsMetric( ShouldDeleteUndecryptablePasswordsResult:: diff --git a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index 1e546e243231..f18124906558 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -1,11 +1,11 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-04-16 18:18:42 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -201,7 +201,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void StubPasswordManagerClient::OpenPasswordDetailsBubble( const password_manager::PasswordForm& form) {} #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index 7ebd554a6067..0c8e8dadfab9 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,20 +1,20 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-04-16 18:18:42 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-05-07 06:48:23 UTC +++ components/password_manager/core/common/password_manager_pref_names.h @@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_IOS) + BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -357,7 +357,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme +@@ -356,7 +356,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Integer pref indicating how many times relaunch Chrome bubble was dismissed. inline constexpr char kRelaunchChromeBubbleDismissedCounter[] = "password_manager.relaunch_chrome_bubble_dismissed_counter"; diff --git a/www/iridium/files/patch-components_performance__manager_public_features.h b/www/iridium/files/patch-components_performance__manager_public_features.h index 39b059faf95a..b1d968ce9ac4 100644 --- a/www/iridium/files/patch-components_performance__manager_public_features.h +++ b/www/iridium/files/patch-components_performance__manager_public_features.h @@ -1,11 +1,11 @@ ---- components/performance_manager/public/features.h.orig 2025-03-18 16:46:04 UTC +--- components/performance_manager/public/features.h.orig 2025-05-07 06:48:23 UTC +++ components/performance_manager/public/features.h -@@ -17,7 +17,7 @@ namespace performance_manager::features { +@@ -19,7 +19,7 @@ namespace performance_manager::features { #if !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false #else #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true diff --git a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 1a9eaf3740bc..69f92ed0fcc8 100644 --- a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,11 +1,11 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2025-04-16 18:18:42 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2025-05-07 06:48:23 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -413,7 +413,7 @@ class PolicyTestCase { - const std::string os("chromeos_ash"); +@@ -432,7 +432,7 @@ class PolicyTestCase { + const std::string os("chromeos"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const std::string os("linux"); #elif BUILDFLAG(IS_MAC) const std::string os("mac"); diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index bb556b8e3d3e..68bdbc8412e1 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,11 +1,11 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2025-04-16 18:18:42 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2025-05-07 06:48:23 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -741,7 +741,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Only set browser device identifier for CBCM Chrome cloud policy on // desktop. if (type_to_fetch.first == diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index b9e116125dff..5807a63c38f7 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,55 +1,55 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2025-02-22 18:06:53 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2025-05-07 06:48:23 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "base/win/wincred_shim.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include #include #include -@@ -35,10 +35,15 @@ +@@ -36,10 +36,15 @@ #import #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include // For HOST_NAME_MAX #endif +#if BUILDFLAG(IS_FREEBSD) +#include +#define HOST_NAME_MAX MAXHOSTNAMELEN +#endif + #include #include -@@ -83,7 +88,7 @@ namespace policy { +@@ -84,7 +89,7 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -139,7 +144,7 @@ std::string GetMachineName() { +@@ -140,7 +145,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -161,7 +166,7 @@ std::string GetOSArchitecture() { +@@ -162,7 +167,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) struct passwd* creds = getpwuid(getuid()); if (!creds || !creds->pw_name) return std::string(); diff --git a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc index c1065cf38f74..57a0ad0b806d 100644 --- a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc +++ b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__service.cc @@ -1,11 +1,11 @@ ---- components/regional_capabilities/regional_capabilities_service.cc.orig 2025-03-18 16:46:04 UTC +--- components/regional_capabilities/regional_capabilities_service.cc.orig 2025-05-07 06:48:23 UTC +++ components/regional_capabilities/regional_capabilities_service.cc -@@ -85,7 +85,7 @@ void RegionalCapabilitiesService::InitializeCountryIdC - base::UmaHistogramEnumeration(kUnknownCountryIdStored, - UnknownCountryIdStored::kValidCountryId); - } else { +@@ -216,7 +216,7 @@ std::optional RegionalCapabilitiesService:: + return persisted_country_id; + } + -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) { - profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall); - country_id.reset(); + if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) { + profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall); + base::UmaHistogramEnumeration(kUnknownCountryIdStored, diff --git a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc index 80e50a6d6518..5a017d109bdd 100644 --- a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc +++ b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc @@ -1,11 +1,11 @@ ---- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-03-18 16:46:04 UTC +--- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-05-07 06:48:23 UTC +++ components/regional_capabilities/regional_capabilities_switches.cc @@ -6,7 +6,7 @@ namespace switches { -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kClearPrefForUnknownCountry, "ClearCountryPrefForStoredUnknownCountry", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h index d6c8cbd1f8f4..d40db626b6c9 100644 --- a/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h +++ b/www/iridium/files/patch-components_regional__capabilities_regional__capabilities__switches.h @@ -1,11 +1,11 @@ ---- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-03-18 16:46:04 UTC +--- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-05-07 06:48:23 UTC +++ components/regional_capabilities/regional_capabilities_switches.h @@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] = inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA"; inline constexpr char kEeaListCountryOverride[] = "EEA_ALL"; -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // When the `country_codes::kCountryIDUnknown` is stored in prefs and this + // When an invalid `country_codes::CountryId` is stored in prefs and this // feature is enabled the pref will be cleared allowing a valid country to be // set again. diff --git a/www/iridium/files/patch-components_search__engines_template__url__service.cc b/www/iridium/files/patch-components_search__engines_template__url__service.cc index df2becc50a8d..cba59fad874a 100644 --- a/www/iridium/files/patch-components_search__engines_template__url__service.cc +++ b/www/iridium/files/patch-components_search__engines_template__url__service.cc @@ -1,11 +1,11 @@ ---- components/search_engines/template_url_service.cc.orig 2025-04-16 18:18:42 UTC +--- components/search_engines/template_url_service.cc.orig 2025-05-07 06:48:23 UTC +++ components/search_engines/template_url_service.cc -@@ -3411,7 +3411,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3435,7 +3435,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return std::make_unique( prefs, base::BindRepeating(&TemplateURLService::EnterpriseSearchChanged, base::Unretained(this))); diff --git a/www/iridium/files/patch-components_signin_public_base_signin__switches.cc b/www/iridium/files/patch-components_signin_public_base_signin__switches.cc new file mode 100644 index 000000000000..96dd3fc0917d --- /dev/null +++ b/www/iridium/files/patch-components_signin_public_base_signin__switches.cc @@ -0,0 +1,11 @@ +--- components/signin/public/base/signin_switches.cc.orig 2025-05-07 06:48:23 UTC ++++ components/signin/public/base/signin_switches.cc +@@ -55,7 +55,7 @@ BASE_FEATURE(kUseHostedDomainForManagementCheckOnSigni + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables the History Sync Opt-in on Desktop. + BASE_FEATURE(kEnableHistorySyncOptin, + "EnableHistorySyncOptin", diff --git a/www/iridium/files/patch-components_signin_public_base_signin__switches.h b/www/iridium/files/patch-components_signin_public_base_signin__switches.h new file mode 100644 index 000000000000..c1c99e6d4215 --- /dev/null +++ b/www/iridium/files/patch-components_signin_public_base_signin__switches.h @@ -0,0 +1,11 @@ +--- components/signin/public/base/signin_switches.h.orig 2025-05-07 06:48:23 UTC ++++ components/signin/public/base/signin_switches.h +@@ -52,7 +52,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kEnableHistorySyncOptin); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_soda_soda__util.cc b/www/iridium/files/patch-components_soda_soda__util.cc index db3459ba20fb..f1d39557198a 100644 --- a/www/iridium/files/patch-components_soda_soda__util.cc +++ b/www/iridium/files/patch-components_soda_soda__util.cc @@ -1,29 +1,29 @@ ---- components/soda/soda_util.cc.orig 2025-02-22 18:06:53 UTC +--- components/soda/soda_util.cc.orig 2025-05-07 06:48:23 UTC +++ components/soda/soda_util.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "base/win/windows_version.h" #endif -#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_X86_FAMILY) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_FAMILY) #include "base/cpu.h" #endif -@@ -38,7 +38,7 @@ bool IsSupportedChromeOS() { +@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() { } #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsSupportedLinux() { #if defined(ARCH_CPU_X86_FAMILY) // Check if the CPU has the required instruction set to run the Speech -@@ -69,7 +69,7 @@ bool IsSupportedWin() { +@@ -70,7 +70,7 @@ bool IsSupportedWin() { bool IsOnDeviceSpeechRecognitionSupported() { #if BUILDFLAG(IS_CHROMEOS) return IsSupportedChromeOS(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return IsSupportedLinux(); #elif BUILDFLAG(IS_WIN) return IsSupportedWin(); diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn index 50f8140380a9..63438e72eaa3 100644 --- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn @@ -1,20 +1,20 @@ ---- components/storage_monitor/BUILD.gn.orig 2025-02-22 18:06:53 UTC +--- components/storage_monitor/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ components/storage_monitor/BUILD.gn -@@ -71,7 +71,7 @@ static_library("storage_monitor") { +@@ -73,7 +73,7 @@ component("storage_monitor") { deps += [ "//services/device/public/mojom" ] } } else if (is_linux) { - if (use_udev) { + if (use_udev && !is_bsd) { sources += [ "mtab_watcher_linux.cc", "mtab_watcher_linux.h", -@@ -177,7 +177,7 @@ source_set("unit_tests") { +@@ -182,7 +182,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } - } else if (is_linux) { + } else if (is_linux && !is_bsd) { if (use_udev) { sources += [ "storage_monitor_linux_unittest.cc" ] } diff --git a/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h b/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h index bb2f6cc01e26..5f2003c7d9da 100644 --- a/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/iridium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2022-03-28 18:11:04 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2025-05-07 06:48:23 UTC +++ components/storage_monitor/removable_device_constants.h -@@ -14,7 +14,7 @@ namespace storage_monitor { - extern const char kFSUniqueIdPrefix[]; - extern const char kVendorModelSerialPrefix[]; +@@ -15,7 +15,7 @@ namespace storage_monitor { + extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[]; + extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kVendorModelVolumeStoragePrefix[]; + extern COMPONENT_EXPORT(STORAGE_MONITOR) const + char kVendorModelVolumeStoragePrefix[]; #endif - diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc index 38e961999434..5b087dcf36cf 100644 --- a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc +++ b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -1,11 +1,11 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-02-22 18:06:53 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-05-07 06:48:23 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -144,7 +144,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry +@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ - (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) + (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) registry->RegisterIntegerPref( prefs::kLocallyParentApprovedExtensionsMigrationState, static_cast( diff --git a/www/iridium/files/patch-components_supervised__user_core_common_features.cc b/www/iridium/files/patch-components_supervised__user_core_common_features.cc index 32549885c6f2..cd90df5573f7 100644 --- a/www/iridium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/iridium/files/patch-components_supervised__user_core_common_features.cc @@ -1,63 +1,72 @@ ---- components/supervised_user/core/common/features.cc.orig 2025-04-16 18:18:42 UTC +--- components/supervised_user/core/common/features.cc.orig 2025-05-07 06:48:23 UTC +++ components/supervised_user/core/common/features.cc @@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals, #endif #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000; const base::FeatureParam kLocalWebApprovalBottomSheetLoadTimeoutMs{ -@@ -83,7 +83,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt +@@ -45,7 +45,7 @@ const base::FeatureParam kLocalWebApprovalBottomS + #endif // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEnableLocalWebApprovalErrorDialog, + "EnableLocalWebApprovalErrorDialog", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -97,7 +97,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -98,7 +98,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -112,7 +112,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); -#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -115,7 +115,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -129,7 +129,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens } #endif // BUILDFLAG(ENABLE_EXTENSIONS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, "CustomProfileStringsForSupervisedUsers", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -127,13 +127,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, +@@ -141,13 +141,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers, "ForceSafeSearchForUnauthenticatedSupervisedUsers", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, "EnableSupervisedUserVersionSignOutDialog", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -155,7 +155,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, +@@ -169,7 +169,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, // platform #defines. BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers, "UncredentialedFilteringFallbackForSupervisedUsers", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-components_supervised__user_core_common_features.h b/www/iridium/files/patch-components_supervised__user_core_common_features.h index 325090c1f452..b04efb72faaf 100644 --- a/www/iridium/files/patch-components_supervised__user_core_common_features.h +++ b/www/iridium/files/patch-components_supervised__user_core_common_features.h @@ -1,38 +1,44 @@ ---- components/supervised_user/core/common/features.h.orig 2025-04-16 18:18:42 UTC +--- components/supervised_user/core/common/features.h.orig 2025-05-07 06:48:23 UTC +++ components/supervised_user/core/common/features.h -@@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals); +@@ -19,12 +19,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals); BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals); #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const base::FeatureParam kLocalWebApprovalBottomSheetLoadTimeoutMs; #endif // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_WIN) -@@ -36,7 +36,7 @@ BASE_DECLARE_FEATURE( + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Whether we show an error screen in case of failure of a local web approval. + BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog); + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -54,7 +54,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE +@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled(); #endif // BUILDFLAG(ENABLE_EXTENSIONS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Enable different web sign in interception behaviour for supervised users: // // 1. Supervised user signs in to existing signed out Profile: show modal -@@ -72,7 +72,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); +@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); // unauthenticated (e.g. signed out of the content area) account. BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Uses supervised user strings on the signout dialog. BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog); diff --git a/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc index 5fa89efaeacc..2d2faf1ea29c 100644 --- a/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc +++ b/www/iridium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc @@ -1,11 +1,11 @@ ---- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-04-16 18:18:42 UTC +--- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-05-07 06:48:23 UTC +++ components/sync_preferences/common_syncable_prefs_database.cc -@@ -332,7 +332,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = +@@ -334,7 +334,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = PrefSensitivity::kNone, MergeBehavior::kNone}}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {autofill::prefs::kAutofillBnplEnabled, {syncable_prefs_ids::kAutofillBnplEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, diff --git a/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc index e03b87adc137..0429ba8dce97 100644 --- a/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc +++ b/www/iridium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc @@ -1,11 +1,11 @@ ---- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-11-04 08:56:03 UTC +--- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2025-05-07 06:48:23 UTC +++ components/trusted_vault/trusted_vault_connection_impl.cc -@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() { +@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() { // currently used or even built on all platforms. #if BUILDFLAG(IS_CHROMEOS) return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_ANDROID; diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc index 208674f13577..aaa1a21f96af 100644 --- a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,29 +1,29 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2025-04-16 18:18:42 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2025-05-07 06:48:23 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, +@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, // TODO(https://crbug.com/382611284): Temporarily handle the case when the // primary window is minimized by closing the help bubble. Remove this code when // the issue is solved at the Views framework level. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver { public: explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble) -@@ -774,7 +774,7 @@ HelpBubbleView::HelpBubbleView( +@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView( event_relay_->Init(this); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) primary_widget_observer_ = std::make_unique(*this); #endif -@@ -886,7 +886,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD) // Help bubbles anchored to menus may be clipped to their anchors' bounds, // resulting in visual errors, unless they use accelerated rendering. See // crbug.com/1445770 for details. This also applies to bubbles anchored to diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.h b/www/iridium/files/patch-components_user__education_views_help__bubble__view.h index fd2b547965a3..6f37f0a7bb79 100644 --- a/www/iridium/files/patch-components_user__education_views_help__bubble__view.h +++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.h @@ -1,11 +1,11 @@ ---- components/user_education/views/help_bubble_view.h.orig 2025-02-22 18:06:53 UTC +--- components/user_education/views/help_bubble_view.h.orig 2025-05-07 06:48:23 UTC +++ components/user_education/views/help_bubble_view.h -@@ -162,7 +162,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg +@@ -160,7 +160,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg // work around this problem by closing the bubble if the widget is minimized. // When the underlying issue is fixed at the framework level, this can be // removed. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) class PrimaryWidgetObserver; std::unique_ptr primary_widget_observer_; #endif diff --git a/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc index f97f4a0ac07e..7dc907f0275e 100644 --- a/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc +++ b/www/iridium/files/patch-components_visited__url__ranking_public_url__visit__util.cc @@ -1,11 +1,11 @@ ---- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-11-04 08:56:03 UTC +--- components/visited_url_ranking/public/url_visit_util.cc.orig 2025-05-07 06:48:23 UTC +++ components/visited_url_ranking/public/url_visit_util.cc -@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() { +@@ -67,7 +67,7 @@ PlatformType GetPlatformInput() { return PlatformType::kWindows; #elif BUILDFLAG(IS_MAC) return PlatformType::kMac; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return PlatformType::kLinux; #elif BUILDFLAG(IS_IOS) return PlatformType::kIos; diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 3063e5cc4ab2..e5aa94e068ba 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,11 +1,11 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-03-18 16:46:04 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-05-07 06:48:23 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1505,7 +1505,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1510,7 +1510,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormats::MakeVk(gr_ycbcr_info, diff --git a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc index 0492db85bb2d..0b59e93c923c 100644 --- a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,11 +1,11 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2025-04-16 18:18:42 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2025-05-07 06:48:23 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1383,7 +1383,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1391,7 +1391,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { -#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) +#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // On DEBUG builds, opaque render passes are cleared to blue // to easily see regions that were not drawn on the screen. // ClearCavas() call causes slight pixel difference, so linux-ref and diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index d3208aeaa4ff..aac7bee8c4e8 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,20 +1,20 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-04-16 18:18:42 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-05-07 06:48:23 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -123,7 +123,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -126,7 +126,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -858,7 +858,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -884,7 +884,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) if (display_client_ && pixel_size != last_swap_pixel_size_) { last_swap_pixel_size_ = pixel_size; display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index d3c210ed66ac..d2fc6415f8ad 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,11 +1,11 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-03-18 16:46:04 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-05-07 06:48:23 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -228,7 +228,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl - // See comments on `EvictionHandler`. - EvictionHandler eviction_handler_; +@@ -229,7 +229,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + base::TimeDelta preferred_frame_interval_ = + FrameRateDecider::UnspecifiedFrameInterval(); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) gfx::Size last_swap_pixel_size_; #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/iridium/files/patch-components_webui_flags_flags__state.cc b/www/iridium/files/patch-components_webui_flags_flags__state.cc index e92b49ac4e56..be83c95f74e0 100644 --- a/www/iridium/files/patch-components_webui_flags_flags__state.cc +++ b/www/iridium/files/patch-components_webui_flags_flags__state.cc @@ -1,11 +1,11 @@ ---- components/webui/flags/flags_state.cc.orig 2025-04-16 18:18:42 UTC +--- components/webui/flags/flags_state.cc.orig 2025-05-07 06:48:23 UTC +++ components/webui/flags/flags_state.cc -@@ -777,7 +777,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -782,7 +782,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS) return kOsCrOS; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return kOsLinux; #elif BUILDFLAG(IS_ANDROID) return kOsAndroid; diff --git a/www/iridium/files/patch-content_app_BUILD.gn b/www/iridium/files/patch-content_app_BUILD.gn index e64861e6dc71..97b0d6827afa 100644 --- a/www/iridium/files/patch-content_app_BUILD.gn +++ b/www/iridium/files/patch-content_app_BUILD.gn @@ -1,15 +1,15 @@ ---- content/app/BUILD.gn.orig 2025-02-22 18:06:53 UTC +--- content/app/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ content/app/BUILD.gn -@@ -89,9 +89,9 @@ source_set("content_main_runner_app") { +@@ -90,9 +90,9 @@ source_set("content_main_runner_app") { "//third_party/tflite:buildflags", "//tools/v8_context_snapshot:buildflags", ] - if (build_tflite_with_xnnpack) { - deps += [ "//third_party/cpuinfo" ] - } +# if (build_tflite_with_xnnpack) { +# deps += [ "//third_party/cpuinfo" ] +# } } source_set("app") { diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index b83df9724741..dd60fd276fa9 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,131 +1,131 @@ ---- content/app/content_main_runner_impl.cc.orig 2025-04-16 18:18:42 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/app/content_main_runner_impl.cc -@@ -144,18 +144,20 @@ +@@ -146,18 +146,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" -#if !BUILDFLAG(IS_MAC) +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) #include "content/public/common/zygote/zygote_fork_delegate_linux.h" #endif #endif // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -184,6 +186,10 @@ +@@ -186,6 +188,10 @@ #include "media/base/media_switches.h" #endif +#if BUILDFLAG(IS_BSD) +#include "base/system/sys_info.h" +#endif + #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -382,7 +388,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -420,7 +426,10 @@ void PreloadLibraryCdms() { +@@ -422,7 +428,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. + // we use arc4random +#if !BUILDFLAG(IS_BSD) base::GetUrandomFD(); +#endif // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -432,9 +441,16 @@ void PreSandboxInit() { +@@ -434,9 +443,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); +#if BUILDFLAG(IS_BSD) + // "cache" the amount of physical memory before pledge(2) + base::SysInfo::AmountOfPhysicalMemoryMB(); +#endif + +#if !BUILDFLAG(IS_BSD) // Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be // allowed by the sandbox. base::GetMaxNumberOfInotifyWatches(); +#endif #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -748,7 +764,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); bool start_hang_watcher_now; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is // initialized, because the sandbox can't be started with multiple threads. // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. -@@ -861,11 +877,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) g_fds->Set(kCrashDumpSignal, kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); -#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || - // BUILDFLAG(IS_OPENBSD) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_WIN) -@@ -1046,10 +1061,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } +#elif BUILDFLAG(IS_BSD) + PreSandboxInit(); #elif BUILDFLAG(IS_IOS) ChildProcessEnterSandbox(); #endif +#if BUILDFLAG(IS_BSD) + if (process_type.empty()) { + sandbox::policy::SandboxLinux::Options sandbox_options; + sandbox::policy::SandboxLinux::GetInstance()->InitializeSandbox( + sandbox::policy::SandboxTypeFromCommandLine( + *base::CommandLine::ForCurrentProcess()), + sandbox::policy::SandboxLinux::PreSandboxHook(), sandbox_options); + } +#endif + delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1146,6 +1173,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1148,6 +1175,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); + +#if BUILDFLAG(IS_BSD) + if (!process_type.empty()) + PreSandboxInit(); +#endif if (process_type.empty()) return RunBrowser(std::move(main_params), start_minimal_browser); diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index e07b2897eaf4..7ba581093bd2 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,33 +1,33 @@ ---- content/browser/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- content/browser/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ content/browser/BUILD.gn -@@ -2542,6 +2542,14 @@ source_set("browser") { +@@ -2560,6 +2560,14 @@ source_set("browser") { ] } + if (is_bsd) { + sources += [ + "file_system_access/file_path_watcher/file_path_watcher_bsd.cc", + "file_system_access/file_path_watcher/file_path_watcher_kqueue.cc", + "file_system_access/file_path_watcher/file_path_watcher_kqueue.h", + ] + } + if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2587,6 +2595,15 @@ source_set("browser") { +@@ -2605,6 +2613,15 @@ source_set("browser") { if (allow_oop_video_decoder) { - sources += [ "media/stable_video_decoder_factory.cc" ] - deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] + sources += [ "media/oop_video_decoder_factory.cc" ] + deps += [ "//media/mojo/mojom" ] + } + + if (is_bsd) { + sources -= [ + "file_system_access/file_path_watcher/file_path_watcher_inotify.cc", + "file_system_access/file_path_watcher/file_path_watcher_inotify.h", + "sandbox_ipc_linux.cc", + "sandbox_ipc_linux.h", + ] } if (is_chromeos) { diff --git a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc index 64fd3c30b759..f4fede709061 100644 --- a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc +++ b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-04-16 18:18:42 UTC +--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/accessibility/browser_accessibility_state_impl.cc -@@ -192,7 +192,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta +@@ -180,7 +180,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta // On Android, Mac, Windows and Linux there are platform-specific subclasses. #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \ - !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) + !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // static std::unique_ptr BrowserAccessibilityStateImpl::Create() { diff --git a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc index 7252afb6a346..1530960a0fe2 100644 --- a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc +++ b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc @@ -1,33 +1,33 @@ ---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig 2025-04-16 18:18:42 UTC +--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc -@@ -31,7 +31,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al +@@ -32,7 +32,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al std::string cmdline; std::stringstream ss(cmdline_all); while (std::getline(ss, cmdline, '\0')) { +#if BUILDFLAG(IS_BSD) + re2::RE2 orca_regex(R"((^|/)(usr/)?(local/)?bin/orca(\s|$))"); +#else re2::RE2 orca_regex(R"((^|/)(usr/)?bin/orca(\s|$))"); +#endif if (re2::RE2::PartialMatch(cmdline, orca_regex)) { return true; // Orca was found } -@@ -57,7 +61,9 @@ class BrowserAccessibilityStateImplAuralinux +@@ -42,6 +46,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al - void BrowserAccessibilityStateImplAuralinux::UpdateHistogramsOnOtherThread() { - BrowserAccessibilityStateImpl::UpdateHistogramsOnOtherThread(); -- + // Returns true if Orca is active. + bool DiscoverOrca() { +#if BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); ++ return false; +#else // NOTE: this method is run from another thread to reduce jank, since - // there's no guarantee these system calls will return quickly. Code that - // needs to run in the UI thread can be run in -@@ -105,6 +111,7 @@ void BrowserAccessibilityStateImplAuralinux::UpdateHis - } else { - base::debug::ClearCrashKeyString(ax_orca_crash_key); + // there's no guarantee these system calls will return quickly. + std::unique_ptr proc_dir(opendir("/proc"), +@@ -79,6 +87,7 @@ bool DiscoverOrca() { } + + return is_orca_active; +#endif } - void BrowserAccessibilityStateImplAuralinux::UpdateUniqueUserHistograms() { + } // namespace diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc index 8a1adc30766d..eb399ec10e00 100644 --- a/www/iridium/files/patch-content_browser_browser__main__loop.cc +++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc @@ -1,37 +1,37 @@ ---- content/browser/browser_main_loop.cc.orig 2025-02-22 18:06:53 UTC +--- content/browser/browser_main_loop.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/browser_main_loop.cc -@@ -247,6 +247,12 @@ +@@ -249,6 +249,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif +#if BUILDFLAG(IS_BSD) +#include "content/browser/sandbox_host_linux.h" +#include "content/public/common/zygote/sandbox_support_linux.h" +#include "sandbox/policy/sandbox.h" +#endif + // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -541,6 +547,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); +#elif BUILDFLAG(IS_BSD) + base::FileHandleMappingVector additional_remapped_fds; + base::LaunchOptions options; + SandboxHostLinux::GetInstance()->Init(); + const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket(); + options.fds_to_remap.push_back(std::make_pair(sfd, GetSandboxFD())); #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() { base::ThreadType::kDisplayCritical); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // We use quite a few file descriptors for our IPC as well as disk the disk // cache, and the default limit on Apple is low (256), so bump it up. diff --git a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index d34d925d21ba..fee74b55100c 100644 --- a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,11 +1,11 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-03-18 16:46:04 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void DidCompleteSwapWithNewSize(const gfx::Size& size) override { compositor_->OnCompleteSwapWithNewSize(size); } diff --git a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc index a8d84469b3c9..5d04c8c30309 100644 --- a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,20 +1,20 @@ ---- content/browser/gpu/compositor_util.cc.orig 2025-04-16 18:18:42 UTC +--- content/browser/gpu/compositor_util.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/gpu/compositor_util.cc -@@ -147,7 +147,7 @@ std::vector GetGpuFeatureData( +@@ -142,7 +142,7 @@ std::vector GetGpuFeatureData( "video_decode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), -@@ -159,7 +159,7 @@ std::vector GetGpuFeatureData( +@@ -154,7 +154,7 @@ std::vector GetGpuFeatureData( "video_encode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) !base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux)), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode)), diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index 315a44d28490..a6120ee2f63d 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-08-27 06:28:16 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool GpuDataManagerImpl::IsGpuMemoryBufferNV12Supported() { base::AutoLock auto_lock(lock_); return private_->IsGpuMemoryBufferNV12Supported(); diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index 7fa6e85f0307..318fae1a7357 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-08-27 06:28:16 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2025-05-07 06:48:23 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 8c3792a358fd..5c147ecbf3ea 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-04-16 18:18:42 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1667,7 +1667,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool GpuDataManagerImplPrivate::IsGpuMemoryBufferNV12Supported() { return is_gpu_memory_buffer_NV12_supported_; } diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index f3b301aeb13b..6a4a7f795abb 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,20 +1,20 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-12-22 12:24:29 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2025-05-07 06:48:23 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool is_gpu_memory_buffer_NV12_supported_ = false; #endif // BUILDFLAG(IS_LINUX) - }; + diff --git a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h index c64c1c4eebbb..729ae77fb63f 100644 --- a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h +++ b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h @@ -1,20 +1,20 @@ ---- content/browser/media/frameless_media_interface_proxy.h.orig 2024-06-25 12:08:48 UTC +--- content/browser/media/frameless_media_interface_proxy.h.orig 2025-05-07 06:48:23 UTC +++ content/browser/media/frameless_media_interface_proxy.h @@ -19,7 +19,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + #include "media/mojo/mojom/video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final +@@ -104,7 +104,7 @@ class FramelessMediaInterfaceProxy final // Connections to the renderer. mojo::ReceiverSet receivers_; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Connection to the StableVideoDecoderFactory that lives in a utility - // process. This is only used for out-of-process video decoding and only when - // the FramelessMediaInterfaceProxy is created without a RenderProcessHost + // Connection to the InterfaceFactory that lives in a utility process. + // This is only used for out-of-process video decoding and only when the + // FramelessMediaInterfaceProxy is created without a RenderProcessHost diff --git a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc index 7fecf79686ac..d615664b2df3 100644 --- a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,29 +1,29 @@ ---- content/browser/network_service_instance_impl.cc.orig 2025-02-22 18:06:53 UTC +--- content/browser/network_service_instance_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/network_service_instance_impl.cc -@@ -84,7 +84,7 @@ +@@ -83,7 +83,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -367,7 +367,7 @@ void CreateInProcessNetworkService( +@@ -341,7 +341,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -436,7 +436,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -410,7 +410,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (GetContentClient() ->browser() ->ShouldRunOutOfProcessSystemDnsResolution() && diff --git a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 9173dac56506..1fafe11f4831 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-03-18 16:46:04 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On Windows and Linux, we would like to produce new content as soon as // possible or the OS will create an additional black gutter. Until we can // block resize on surface synchronization on these platforms, we will not diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 25d301b5e511..4c35e5f480fb 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,56 +1,56 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-04-16 18:18:42 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -224,7 +224,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1089,7 +1089,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1122,7 +1122,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1257,7 +1257,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1317,7 +1317,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3328,7 +3328,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3410,7 +3410,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3384,6 +3384,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3465,6 +3465,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, + switches::kTrk, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5220,7 +5222,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5310,7 +5312,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr // - Win: https://crbug.com/707022 . uint64_t total_size = 0; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) total_size = dump->platform_private_footprint->rss_anon_bytes + dump->platform_private_footprint->vm_swap_bytes; #elif BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 915c21fb704c..39f178115cd4 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2025-04-16 18:18:42 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2025-05-07 06:48:23 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -102,7 +102,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -988,7 +988,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -986,7 +986,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr binders_; mojo::Receiver receiver_{this}; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::Remote video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -1237,7 +1237,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1235,7 +1235,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // if the request isn't handled on the IO thread. void OnBindHostReceiver(mojo::GenericPendingReceiver receiver); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Provides /proc/{renderer pid}/status and statm files for the renderer, // because the files are required to calculate the renderer's private // footprint on Chromium Linux. Regarding MacOS X and Windows, we have diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 1c5a6c94e492..81a925570ebf 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,47 +1,47 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-03-18 16:46:04 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" @@ -478,7 +478,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1867,7 +1867,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector& ui_ime_text_spans) { -@@ -2843,7 +2843,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return NeedsInputGrab(); #else return false; -@@ -3027,7 +3027,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = ui::LinuxUi::instance(); - std::vector commands; - if (!event.skip_if_unhandled && linux_ui && event.os_event && + if (!event.skip_if_unhandled && linux_ui && event.os_event) { + const auto command = linux_ui->GetTextEditCommandForEvent( diff --git a/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc b/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc index 98cdbf941d5d..f4c1cbfea511 100644 --- a/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc +++ b/www/iridium/files/patch-content_browser_service__host_utility__process__host.cc @@ -1,38 +1,38 @@ ---- content/browser/service_host/utility_process_host.cc.orig 2025-04-16 18:18:42 UTC +--- content/browser/service_host/utility_process_host.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/service_host/utility_process_host.cc -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include "content/browser/v8_snapshot_files.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -95,7 +95,7 @@ namespace content { +@@ -96,7 +96,7 @@ namespace content { namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::ScopedFD PassNetworkContextParentDirs( std::vector network_context_parent_dirs) { base::Pickle pickle; -@@ -425,7 +425,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -442,7 +442,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() { if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { bool pass_gpu_buffer_flag = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Check if NV12 GPU memory buffer supported at the same time. pass_gpu_buffer_flag = pass_gpu_buffer_flag && diff --git a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc index 4a6b7e2665df..55ebf01b7422 100644 --- a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,11 +1,11 @@ ---- content/browser/v8_snapshot_files.cc.orig 2024-06-25 12:08:48 UTC +--- content/browser/v8_snapshot_files.cc.orig 2025-05-07 06:48:23 UTC +++ content/browser/v8_snapshot_files.cc -@@ -17,7 +17,7 @@ namespace content { - std::map> +@@ -19,7 +19,7 @@ namespace content { + std::map> GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) { - std::map> files; + std::map> files; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT) files[kV8ContextSnapshotDataDescriptor] = base::FilePath( FILE_PATH_LITERAL(BUILDFLAG(V8_CONTEXT_SNAPSHOT_FILENAME))); diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index fe2326b9f0e2..1d84485ea0b6 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,36 +1,36 @@ ---- content/common/BUILD.gn.orig 2025-02-22 18:06:53 UTC +--- content/common/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ content/common/BUILD.gn -@@ -384,19 +384,28 @@ source_set("common") { +@@ -382,19 +382,28 @@ source_set("common") { } if (is_linux || is_chromeos) { - sources += [ - "gpu_pre_sandbox_hook_linux.cc", - "gpu_pre_sandbox_hook_linux.h", - ] + if (is_bsd) { + sources += [ + "gpu_pre_sandbox_hook_bsd.cc", + "gpu_pre_sandbox_hook_bsd.h", + ] + } else { + sources += [ + "gpu_pre_sandbox_hook_linux.cc", + "gpu_pre_sandbox_hook_linux.h", + ] + } public_deps += [ "//sandbox/policy" ] deps += [ ":sandbox_support_linux", "//media/gpu:buildflags", "//sandbox/linux:sandbox_services", - "//sandbox/linux:seccomp_bpf", "//sandbox/policy:chromecast_sandbox_allowlist_buildflags", "//third_party/fontconfig", ] + if (use_seccomp_bpf) { + deps += [ "//sandbox/linux:seccomp_bpf" ] + } if (use_v4l2_codec) { deps += [ "//media/gpu/v4l2" ] } diff --git a/www/iridium/files/patch-content_common_features.cc b/www/iridium/files/patch-content_common_features.cc index 8b941e8620d9..0011eb0a7886 100644 --- a/www/iridium/files/patch-content_common_features.cc +++ b/www/iridium/files/patch-content_common_features.cc @@ -1,11 +1,11 @@ ---- content/common/features.cc.orig 2025-03-18 16:46:04 UTC +--- content/common/features.cc.orig 2025-05-07 06:48:23 UTC +++ content/common/features.cc -@@ -125,7 +125,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, +@@ -124,7 +124,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-content_common_features.h b/www/iridium/files/patch-content_common_features.h index 8e4707f5404c..8b5485db3296 100644 --- a/www/iridium/files/patch-content_common_features.h +++ b/www/iridium/files/patch-content_common_features.h @@ -1,11 +1,11 @@ ---- content/common/features.h.orig 2025-03-18 16:46:04 UTC +--- content/common/features.h.orig 2025-05-07 06:48:23 UTC +++ content/common/features.h -@@ -28,7 +28,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn +@@ -27,7 +27,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking); CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint); CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); diff --git a/www/iridium/files/patch-content_common_user__agent.cc b/www/iridium/files/patch-content_common_user__agent.cc deleted file mode 100644 index 46e0ffd48988..000000000000 --- a/www/iridium/files/patch-content_common_user__agent.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- content/common/user_agent.cc.orig 2025-04-16 18:18:42 UTC -+++ content/common/user_agent.cc -@@ -50,7 +50,7 @@ std::string GetUserAgentPlatform() { - return ""; - #elif BUILDFLAG(IS_MAC) - return "Macintosh; "; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return "X11; "; // strange, but that's what Firefox uses - #elif BUILDFLAG(IS_ANDROID) - return "Linux; "; -@@ -76,7 +76,7 @@ std::string GetUnifiedPlatform() { - return "Windows NT 10.0; Win64; x64"; - #elif BUILDFLAG(IS_FUCHSIA) - return "Fuchsia"; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return "X11; Linux x86_64"; - #elif BUILDFLAG(IS_IOS) - if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { -@@ -305,6 +305,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons - "Android %s", os_version.c_str() - #elif BUILDFLAG(IS_FUCHSIA) - "Fuchsia" -+#elif BUILDFLAG(IS_BSD) -+#if defined(__x86_64__) -+ "Linux x86_64; %s %s", -+#elif defined(__aarch64__) -+ "Linux aarch64; %s %s", -+#else -+ "Linux i686; %s %s", -+#endif -+ unixinfo.sysname, // e.g. Linux -+ cpu_type.c_str() // e.g. i686 - #elif BUILDFLAG(IS_IOS) - "CPU %s OS %s like Mac OS X", cpu_type.c_str(), - os_version.c_str() diff --git a/www/iridium/files/patch-content_public_browser_content__browser__client.cc b/www/iridium/files/patch-content_public_browser_content__browser__client.cc index cd67f021a1fb..7d9fd4c82627 100644 --- a/www/iridium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/iridium/files/patch-content_public_browser_content__browser__client.cc @@ -1,11 +1,11 @@ ---- content/public/browser/content_browser_client.cc.orig 2025-04-16 18:18:42 UTC +--- content/public/browser/content_browser_client.cc.orig 2025-05-07 06:48:23 UTC +++ content/public/browser/content_browser_client.cc -@@ -1376,7 +1376,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1395,7 +1395,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; #else return false; diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index 60f6f8652f32..b9159d257193 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,35 +1,35 @@ ---- content/public/common/content_features.cc.orig 2025-04-16 18:18:42 UTC +--- content/public/common/content_features.cc.orig 2025-05-07 06:48:23 UTC +++ content/public/common/content_features.cc @@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, // Runs the audio service in a separate process. BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1274,9 +1274,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1271,9 +1271,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC)) && \ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ defined(ARCH_CPU_X86_64)) || \ - ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1329,7 +1329,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, +@@ -1330,7 +1330,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb +#if BUILDFLAG(IS_BSD) +BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_DISABLED_BY_DEFAULT); +#else BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_ENABLED_BY_DEFAULT); +#endif // Controls whether the WebXR Device API is enabled. BASE_FEATURE(kWebXr, "WebXR", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc index 2f021342f950..d8109434f832 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.cc +++ b/www/iridium/files/patch-content_public_common_content__switches.cc @@ -1,22 +1,22 @@ ---- content/public/common/content_switches.cc.orig 2025-04-16 18:18:42 UTC +--- content/public/common/content_switches.cc.orig 2025-05-07 06:48:23 UTC +++ content/public/common/content_switches.cc -@@ -342,6 +342,10 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -339,6 +339,10 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; +const char kDisableUnveil[] = "disable-unveil"; + +const char kTrk[] = "trk"; + // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -949,7 +953,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -946,7 +950,7 @@ const char kPreventResizingContentsForTesting[] = "prevent-resizing-contents-for-testing"; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Allows sending text-to-speech requests to speech-dispatcher, a common // Linux speech service. Because it's buggy, the user must explicitly // enable it so that visiting a random webpage can't cause instability. diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h index 82c1a3cab7e9..1eff413bf882 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.h +++ b/www/iridium/files/patch-content_public_common_content__switches.h @@ -1,20 +1,20 @@ ---- content/public/common/content_switches.h.orig 2025-04-16 18:18:42 UTC +--- content/public/common/content_switches.h.orig 2025-05-07 06:48:23 UTC +++ content/public/common/content_switches.h -@@ -108,6 +108,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -107,6 +107,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; +CONTENT_EXPORT extern const char kDisableUnveil[]; +CONTENT_EXPORT extern const char kTrk[]; CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -259,7 +261,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -258,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[]; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; #endif diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc index 73dc7f14d65d..8b81be16f1e0 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,38 +1,38 @@ ---- content/renderer/render_thread_impl.cc.orig 2025-04-16 18:18:42 UTC +--- content/renderer/render_thread_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/renderer/render_thread_impl.cc -@@ -212,6 +212,8 @@ +@@ -207,6 +207,8 @@ #if BUILDFLAG(IS_APPLE) #include +#elif BUILDFLAG(IS_BSD) +#include #else #include #endif -@@ -1050,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1059,7 +1061,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1855,7 +1857,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( +@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( bool enable_video_encode_accelerator) { mojo::PendingRemote vea_provider; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoEncoding)) { BindHostReceiver(vea_provider.InitWithNewPipeAndPassReceiver()); } else { diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc index de59a0660088..3287b7e4cbde 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,45 +1,45 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2025-04-16 18:18:42 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2025-05-07 06:48:23 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -129,7 +129,7 @@ +@@ -124,7 +124,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits::max()} + 1) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp font_loader; #endif // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::PendingRemote font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -228,7 +228,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique(); -@@ -292,7 +292,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return sandbox_support_.get(); #else // These platforms do not require sandbox support. diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h index 1b02b07101ab..3f452e2b3a6e 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,11 +1,11 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2025-03-18 16:46:04 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2025-05-07 06:48:23 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const gpu::GPUInfo& gpu_info) const; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr sandbox_support_; #endif diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index f73ef1473975..872cfd0d36f7 100644 --- a/www/iridium/files/patch-content_shell_BUILD.gn +++ b/www/iridium/files/patch-content_shell_BUILD.gn @@ -1,11 +1,11 @@ ---- content/shell/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- content/shell/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ content/shell/BUILD.gn -@@ -1093,7 +1093,7 @@ group("content_shell_crash_test") { +@@ -1099,7 +1099,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } - if (is_posix) { + if (is_posix && !is_bsd) { data_deps += [ "//third_party/breakpad:dump_syms", "//third_party/breakpad:minidump_stackwalk", diff --git a/www/iridium/files/patch-content_shell_browser_shell__platform__delegate__views.cc b/www/iridium/files/patch-content_shell_browser_shell__platform__delegate__views.cc new file mode 100644 index 000000000000..2b2d3799bd07 --- /dev/null +++ b/www/iridium/files/patch-content_shell_browser_shell__platform__delegate__views.cc @@ -0,0 +1,11 @@ +--- content/shell/browser/shell_platform_delegate_views.cc.orig 2025-05-07 06:48:23 UTC ++++ content/shell/browser/shell_platform_delegate_views.cc +@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatformWindow( + views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); + params.bounds = gfx::Rect(initial_size); + params.delegate = delegate.release(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + params.wm_class_class = "chromium-content_shell"; + params.wm_class_name = params.wm_class_class; + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 70dc575d2e36..1f4a66a636ce 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,65 +1,65 @@ ---- content/utility/services.cc.orig 2025-02-22 18:06:53 UTC +--- content/utility/services.cc.orig 2025-05-07 06:48:23 UTC +++ content/utility/services.cc @@ -73,7 +73,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" @@ -101,7 +101,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" - #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck + #include "media/mojo/services/oop_video_decoder_factory_process_service.h" // nogncheck @@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver receiver) { +@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver receiver) { -@@ -415,7 +415,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - services.Add(RunStableVideoDecoderFactoryProcessService); + services.Add(RunOOPVideoDecoderFactoryProcessService); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && -@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS) && \ // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) services.Add(RunVideoEncodeAcceleratorProviderFactory); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc index b78adc819e1d..dbf0a5f9b210 100644 --- a/www/iridium/files/patch-content_utility_utility__main.cc +++ b/www/iridium/files/patch-content_utility_utility__main.cc @@ -1,122 +1,122 @@ ---- content/utility/utility_main.cc.orig 2025-02-22 18:06:53 UTC +--- content/utility/utility_main.cc.orig 2025-05-07 06:48:23 UTC +++ content/utility/utility_main.cc @@ -36,18 +36,22 @@ #include "services/tracing/public/cpp/trace_startup.h" #include "services/video_effects/public/cpp/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/file_descriptor_store.h" #include "base/files/file_util.h" #include "base/pickle.h" #include "content/child/sandboxed_process_thread_type_handler.h" +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "content/common/gpu_pre_sandbox_hook_linux.h" +#endif #include "content/public/common/content_descriptor_keys.h" #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" #include "services/screen_ai/buildflags/buildflags.h" @@ -66,7 +70,12 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#include "content/common/gpu_pre_sandbox_hook_bsd.h" +#endif + -+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "services/video_effects/video_effects_sandbox_hook_linux.h" // nogncheck - #endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -101,7 +110,7 @@ sandbox::TargetServices* g_utility_target_services = nullptr; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) +#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) #include "components/services/on_device_translation/sandbox_hook.h" #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) @@ -109,7 +118,7 @@ namespace content { namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::vector GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( @@ -247,7 +256,8 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +// XXX BSD +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) // Thread type delegate of the process should be registered before first // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with @@ -255,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) { SandboxedProcessThreadTypeHandler::Create(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. @@ -287,7 +297,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); break; -#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) +#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) case sandbox::mojom::Sandbox::kOnDeviceTranslation: pre_sandbox_hook = base::BindOnce( &on_device_translation::OnDeviceTranslationSandboxHook); @@ -303,13 +313,13 @@ int UtilityMain(MainFunctionParams parameters) { #else NOTREACHED(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kVideoEffects: pre_sandbox_hook = base::BindOnce(&video_effects::VideoEffectsPreSandboxHook); break; #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); @@ -336,6 +346,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } +#if !BUILDFLAG(IS_BSD) if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = @@ -343,6 +354,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } +#else + sandbox::policy::Sandbox::Initialize( + sandbox_type, std::move(pre_sandbox_hook), + sandbox::policy::SandboxLinux::Options()); +#endif // Start the HangWatcher now that the sandbox is engaged, if it hasn't // already been started. diff --git a/www/iridium/files/patch-content_zygote_zygote__linux.cc b/www/iridium/files/patch-content_zygote_zygote__linux.cc index 1a58c268c382..3dc51f9df36d 100644 --- a/www/iridium/files/patch-content_zygote_zygote__linux.cc +++ b/www/iridium/files/patch-content_zygote_zygote__linux.cc @@ -1,15 +1,15 @@ ---- content/zygote/zygote_linux.cc.orig 2025-02-22 18:06:53 UTC +--- content/zygote/zygote_linux.cc.orig 2025-05-07 06:48:23 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if 0 - #ifdef UNSAFE_BUFFERS_BUILD - // TODO(crbug.com/342213636): Remove this and spanify to fix the errors. -@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi + #include "content/zygote/zygote_linux.h" + +@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content +#endif diff --git a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 605660ee890d..1352001ccfa2 100644 --- a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,11 +1,11 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-02-22 18:06:53 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-05-07 06:48:23 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc @@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt + MediaPerceptionAPIManager::GetFactoryInstance(); #endif - MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) NetworkingPrivateEventRouterFactory::GetInstance(); #endif PrinterProviderAPIFactory::GetInstance(); diff --git a/www/iridium/files/patch-extensions_browser_api_management_management__api.cc b/www/iridium/files/patch-extensions_browser_api_management_management__api.cc index aab1f269ed7e..82dd79c2df4e 100644 --- a/www/iridium/files/patch-extensions_browser_api_management_management__api.cc +++ b/www/iridium/files/patch-extensions_browser_api_management_management__api.cc @@ -1,11 +1,11 @@ ---- extensions/browser/api/management/management_api.cc.orig 2024-08-27 06:28:16 UTC +--- extensions/browser/api/management/management_api.cc.orig 2025-05-07 06:48:23 UTC +++ extensions/browser/api/management/management_api.cc -@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { +@@ -286,7 +286,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { #if BUILDFLAG(IS_CHROMEOS) // ChromeOS devices have this feature already shipped. return true; -#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled( supervised_user::kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #else diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc index 5f483fb9a072..f07d692f5405 100644 --- a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,20 +1,20 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2025-04-16 18:18:42 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2025-05-07 06:48:23 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -77,7 +77,7 @@ namespace { +@@ -81,7 +81,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -667,7 +667,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool has_permission = extension->permissions_data()->HasAPIPermission( mojom::APIPermissionID::kNativeMessaging); if (!has_permission) { diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index ef2031d4d3f5..332975708314 100644 --- a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,20 +1,20 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2025-02-22 18:06:53 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2025-05-07 06:48:23 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc @@ -18,7 +18,7 @@ #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" #include "extensions/shell/browser/shell_web_view_guest_delegate.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h" #endif -@@ -54,7 +54,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() +@@ -56,7 +56,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() return std::make_unique(); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() { if (!file_system_delegate_) file_system_delegate_ = std::make_unique(); diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index 8e6573e05ceb..19ba593693a1 100644 --- a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,19 +1,19 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2025-02-22 18:06:53 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2025-05-07 06:48:23 UTC +++ extensions/shell/browser/shell_extensions_api_client.h -@@ -34,14 +34,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC +@@ -36,14 +36,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC content::BrowserContext* browser_context) const override; std::unique_ptr CreateDisplayInfoProvider() const override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) FileSystemDelegate* GetFileSystemDelegate() override; #endif MessagingDelegate* GetMessagingDelegate() override; FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override; private: -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr file_system_delegate_; #endif std::unique_ptr messaging_delegate_; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 6df6d62f9add..5585733a38c0 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-03-18 16:46:04 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -341,7 +341,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -377,7 +377,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; #elif BUILDFLAG(IS_APPLE) return wgpu::BackendType::Metal; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc index cc6413c5d628..6e59ac23555d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc @@ -1,29 +1,29 @@ ---- gpu/command_buffer/service/shared_context_state.cc.orig 2025-04-16 18:18:42 UTC +--- gpu/command_buffer/service/shared_context_state.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/command_buffer/service/shared_context_state.cc -@@ -65,7 +65,7 @@ +@@ -64,7 +64,7 @@ #include "gpu/vulkan/vulkan_implementation.h" #include "gpu/vulkan/vulkan_util.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "gpu/command_buffer/service/external_semaphore_pool.h" #endif -@@ -334,7 +334,7 @@ SharedContextState::SharedContextState( +@@ -322,7 +322,7 @@ SharedContextState::SharedContextState( if (gr_context_type_ == GrContextType::kVulkan) { if (vk_context_provider_) { #if BUILDFLAG(ENABLE_VULKAN) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) external_semaphore_pool_ = std::make_unique(this); #endif use_virtualized_gl_contexts_ = false; -@@ -371,7 +371,7 @@ SharedContextState::~SharedContextState() { +@@ -359,7 +359,7 @@ SharedContextState::~SharedContextState() { } #if BUILDFLAG(ENABLE_VULKAN) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) external_semaphore_pool_.reset(); #endif diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index daeb936ce670..41c675fb556c 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,11 +1,20 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-08-27 06:28:16 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc @@ -20,7 +20,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr SharedImageUsageSet kSupportedUsage = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SHARED_IMAGE_USAGE_SCANOUT | #endif SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE | +@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsGMBSupported( + switch (gmb_type) { + case gfx::EMPTY_BUFFER: + return true; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + case gfx::NATIVE_PIXMAP: { + auto* vulkan_implementation = + context_state_->vk_context_provider()->GetVulkanImplementation(); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index a0366215aa59..8d5c46268063 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,29 +1,38 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-04-16 18:18:42 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc @@ -48,7 +48,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" #include "gpu/vulkan/vulkan_device_queue.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #endif -@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t + case gfx::IO_SURFACE_BUFFER: + return "platform"; + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + case gfx::NATIVE_PIXMAP: + return "platform"; + #endif +@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory( +@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory( context_state_, workarounds_); factories_.push_back(std::move(ozone_factory)); } -#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) +#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) if (gr_context_type_ == GrContextType::kVulkan) { auto external_vk_image_factory = std::make_unique(context_state_); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index fd7cf3a5bc7f..f5e8af979e5d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,20 +1,20 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-03-18 16:46:04 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1752,7 +1752,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte +@@ -1754,7 +1754,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte backend_types = {wgpu::BackendType::D3D12}; #elif BUILDFLAG(IS_MAC) backend_types = {wgpu::BackendType::Metal}; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (shared_context_state_->GrContextIsVulkan() || shared_context_state_->IsGraphiteDawnVulkan()) { backend_types = {wgpu::BackendType::Vulkan}; -@@ -1994,7 +1994,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1996,7 +1996,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ - !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) + !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) if (usage & wgpu::TextureUsage::StorageBinding) { LOG(ERROR) << "AssociateMailbox: wgpu::TextureUsage::StorageBinding is NOT " "supported yet on this platform."; diff --git a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc index 9a28fa117ab4..066a0bdfabd9 100644 --- a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,11 +1,11 @@ ---- gpu/config/gpu_info_collector.cc.orig 2025-04-16 18:18:42 UTC +--- gpu/config/gpu_info_collector.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/config/gpu_info_collector.cc -@@ -347,7 +347,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -349,7 +349,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_DISABLED_BY_DEFAULT); #else base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc index 10d909ad892e..905d8cd520e8 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,83 +1,83 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2025-04-16 18:18:42 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2025-05-07 06:48:23 UTC +++ gpu/ipc/service/gpu_init.cc @@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CASTOS) bool CanAccessDeviceFile(const GPUInfo& gpu_info) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (gpu_info.gpu.vendor_id != 0x10de || // NVIDIA gpu_info.gpu.driver_vendor != "NVIDIA") return true; -@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -431,7 +431,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -586,7 +586,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -758,7 +758,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -754,7 +754,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL ->GetSupportedFormatsForGLNativePixmapImport(); #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -810,7 +810,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -806,7 +806,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } -#if BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1014,7 +1014,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; -#if BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1069,7 +1069,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 6c515861575a..133528551b65 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,27 +1,27 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2024-06-25 12:08:48 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2025-05-07 06:48:23 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction vkGetSwapchainImagesKHR; VulkanFunction vkQueuePresentKHR; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VulkanFunction vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ \ No newline at end of file +#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ diff --git a/www/iridium/files/patch-headless_BUILD.gn b/www/iridium/files/patch-headless_BUILD.gn index f184f3a006d9..14a45be6245a 100644 --- a/www/iridium/files/patch-headless_BUILD.gn +++ b/www/iridium/files/patch-headless_BUILD.gn @@ -1,11 +1,11 @@ ---- headless/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- headless/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ headless/BUILD.gn -@@ -474,7 +474,7 @@ component("headless_non_renderer") { +@@ -475,7 +475,7 @@ component("headless_non_renderer") { } } - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { deps += [ "//components/crash/content/browser", "//components/crash/core/app", diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc index 14f68f4da8fd..1a1cf168e966 100644 --- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,11 +1,11 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2025-03-18 16:46:04 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2025-05-07 06:48:23 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); -#if !BUILDFLAG(IS_WIN) +#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) crash_reporter::InitializeCrashpad(process_type.empty(), process_type); #endif // !BUILDFLAG(IS_WIN) crash_keys::SetSwitchesFromCommandLine(command_line, nullptr); diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.h b/www/iridium/files/patch-ipc_ipc__message__utils.h index af9aba1eabbd..51285f68af11 100644 --- a/www/iridium/files/patch-ipc_ipc__message__utils.h +++ b/www/iridium/files/patch-ipc_ipc__message__utils.h @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2025-03-18 16:46:04 UTC +--- ipc/ipc_message_utils.h.orig 2025-05-07 06:48:23 UTC +++ ipc/ipc_message_utils.h -@@ -215,7 +215,7 @@ struct ParamTraits { +@@ -216,7 +216,7 @@ struct ParamTraits { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits { diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index 29d28b985ac7..0584658ebf27 100644 --- a/www/iridium/files/patch-media_BUILD.gn +++ b/www/iridium/files/patch-media_BUILD.gn @@ -1,12 +1,12 @@ ---- media/BUILD.gn.orig 2025-03-18 16:46:04 UTC +--- media/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ media/BUILD.gn -@@ -94,6 +94,9 @@ config("media_config") { +@@ -99,6 +99,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } + if (use_sndio) { + defines += [ "USE_SNDIO" ] + } } # Internal grouping of the configs necessary to support sub-folders having their diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index 1ca657e87e2d..632457614659 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,27 +1,27 @@ ---- media/audio/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- media/audio/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ media/audio/BUILD.gn -@@ -271,9 +271,23 @@ source_set("audio") { +@@ -275,9 +275,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/audio_manager_linux.cc" ] } + + if (is_bsd) { + sources += [ "sndio/audio_manager_sndio.cc" ] + } + + if (use_sndio) { + libs += [ "sndio" ] + sources += [ + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc", + "sndio/sndio_output.h" + ] + } if (use_alsa) { libs += [ "asound" ] diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index 76f00dabd680..229c6d0f0a28 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,114 +1,114 @@ ---- media/base/media_switches.cc.orig 2025-04-16 18:18:42 UTC +--- media/base/media_switches.cc.orig 2025-05-07 06:48:23 UTC +++ media/base/media_switches.cc @@ -19,7 +19,7 @@ #include "ui/gl/gl_features.h" #include "ui/gl/gl_utils.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/cpu.h" #endif @@ -358,8 +358,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, "UseSCContentSharingPicker", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) - -#if BUILDFLAG(IS_LINUX) + +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", @@ -369,6 +369,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, BASE_FEATURE(kPulseaudioLoopbackForScreenShare, "PulseaudioLoopbackForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); + +BASE_FEATURE(kAudioBackend, + "AudioBackend", + base::FEATURE_ENABLED_BY_DEFAULT); + +constexpr base::FeatureParam::Option + kAudioBackendOptions[] = { + {AudioBackend::kAuto, + "auto"}, + {AudioBackend::kPulseAudio, "pulseaudio"}, + {AudioBackend::kSndio, "sndio"}, + {AudioBackend::kAlsa, "alsa"}}; + +const base::FeatureParam + kAudioBackendParam{ + &kAudioBackend, "audio-backend", +#if BUILDFLAG(IS_OPENBSD) + AudioBackend::kSndio, +#elif BUILDFLAG(IS_FREEBSD) + AudioBackend::kAuto, +#endif + &kAudioBackendOptions}; #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -611,7 +633,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -636,7 +658,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -634,7 +656,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -659,7 +681,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -646,7 +668,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -671,7 +693,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -675,7 +697,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -700,7 +722,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default // on chromeos, but needs an experiment on linux. BASE_FEATURE(kAcceleratedVideoDecodeLinux, -@@ -775,7 +797,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, +@@ -800,7 +822,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, "VSyncMjpegDecoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS. BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding, "V4L2H264TemporalLayerHWEncoding", -@@ -1347,7 +1369,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -1361,7 +1383,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, + ); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1429,7 +1451,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1443,7 +1465,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Reduces the number of buffers needed in the output video frame pool to // populate the Renderer pipeline for hardware accelerated VideoDecoder in // non-low latency scenarios. diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index 8c0d3f30921e..f8279fe482c1 100644 --- a/www/iridium/files/patch-media_base_media__switches.h +++ b/www/iridium/files/patch-media_base_media__switches.h @@ -1,57 +1,57 @@ ---- media/base/media_switches.h.orig 2025-04-16 18:18:42 UTC +--- media/base/media_switches.h.orig 2025-05-07 06:48:23 UTC +++ media/base/media_switches.h -@@ -321,13 +321,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu +@@ -329,13 +329,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); + +enum class AudioBackend { + kAuto, + kPulseAudio, + kSndio, + kAlsa +}; + +MEDIA_EXPORT BASE_DECLARE_FEATURE(kAudioBackend); +MEDIA_EXPORT extern const base::FeatureParam< + AudioBackend> + kAudioBackendParam; #endif // BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordMediaEngagementScores); MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordWebAudioEngagement); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -341,7 +353,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); +@@ -349,7 +361,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); -@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay +@@ -371,7 +383,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -493,7 +505,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); +@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoEncoding); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h index f586b096d2d3..480b70d44df0 100644 --- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h +++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__device.h @@ -1,11 +1,11 @@ ---- media/capture/video/linux/v4l2_capture_device.h.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/linux/v4l2_capture_device.h.orig 2025-05-07 06:48:23 UTC +++ media/capture/video/linux/v4l2_capture_device.h -@@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice - public: +@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice + virtual int open(const char* device_name, int flags) = 0; virtual int close(int fd) = 0; - virtual int ioctl(int fd, int request, void* argp) = 0; + virtual int ioctl(int fd, unsigned long request, void* argp) = 0; virtual void* mmap(void* start, size_t length, int prot, diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc deleted file mode 100644 index f599e5a9718f..000000000000 --- a/www/iridium/files/patch-media_gpu_buffer__validation.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- media/gpu/buffer_validation.cc.orig 2024-12-22 12:24:29 UTC -+++ media/gpu/buffer_validation.cc -@@ -15,7 +15,7 @@ - #include "ui/gfx/geometry/size.h" - #include "ui/gfx/gpu_memory_buffer.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include - #include - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -23,7 +23,7 @@ - namespace media { - - bool GetFileSize(const int fd, size_t* size) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (fd < 0) { - VLOG(1) << "Invalid file descriptor"; - return false; -@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle( - VLOG(1) << "Unsupported: " << pixel_format; - return false; - } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); - if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || - num_planes == 0) { diff --git a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index 9afb7ea3dc29..aa5d17bdc1bf 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,11 +1,11 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-11-04 08:56:03 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2025-05-07 06:48:23 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast(buffer_format); NOTREACHED(); } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If format is true multiplanar format, we prefer external sampler on // ChromeOS and Linux. if (format.is_multi_plane()) { diff --git a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 3f6113150ed3..1f3eb4c3e9fa 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,29 +1,29 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2025-04-16 18:18:42 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2025-05-07 06:48:23 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1121,7 +1121,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1122,7 +1122,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI) // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -1130,7 +1130,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1131,7 +1131,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( *allocator, VideoFrame::STORAGE_DMABUFS); -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1304,7 +1304,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1305,7 +1305,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The custom allocator creates frames backed by NativePixmap, which uses a // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( diff --git a/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc index c3a28ffb60eb..6af0aad32ad1 100644 --- a/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc +++ b/www/iridium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc @@ -1,20 +1,20 @@ ---- media/gpu/gpu_video_decode_accelerator_factory.cc.orig 2025-04-16 18:18:42 UTC +--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig 2025-05-07 06:48:23 UTC +++ media/gpu/gpu_video_decode_accelerator_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "media/gpu/media_gpu_export.h" #include "media/media_buildflags.h" -#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h" #include "media/gpu/v4l2/v4l2_device.h" #endif -@@ -28,7 +28,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( +@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( if (gpu_preferences.disable_accelerated_video_decode) return nullptr; -#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) std::unique_ptr vda; - vda.reset(new V4L2VideoDecodeAccelerator(new V4L2Device())); + vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted())); diff --git a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index 24df60c85a66..7f66aaf4dae4 100644 --- a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,20 +1,20 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2025-04-16 18:18:42 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2025-05-07 06:48:23 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -150,7 +150,7 @@ std::vector GetVEAFactoryFunctions - return vea_factory_functions; +@@ -160,7 +160,7 @@ std::vector GetVEAFactoryFunctions + } #if BUILDFLAG(USE_VAAPI) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { - vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); + vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); } -@@ -158,7 +158,7 @@ std::vector GetVEAFactoryFunctions - vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); +@@ -168,7 +168,7 @@ std::vector GetVEAFactoryFunctions + vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); #endif #elif BUILDFLAG(USE_V4L2_CODEC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { - vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA)); + vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA)); } diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 77700fea9b3c..6e7e5a970cbe 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-04-16 18:18:42 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-05-07 06:48:23 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::optional allocator = base::BindRepeating(&AllocateCustomFrameProxy, weak_this_); std::vector candidates = { diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 59e82ffd8bd0..358949b8dc8c 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-04-16 18:18:42 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-05-07 06:48:23 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -79,7 +79,7 @@ +@@ -81,7 +81,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/files/file_util.h" #include "base/strings/string_split.h" #endif diff --git a/www/iridium/files/patch-media_mojo_mojom_BUILD.gn b/www/iridium/files/patch-media_mojo_mojom_BUILD.gn new file mode 100644 index 000000000000..15f83cd6ada4 --- /dev/null +++ b/www/iridium/files/patch-media_mojo_mojom_BUILD.gn @@ -0,0 +1,11 @@ +--- media/mojo/mojom/BUILD.gn.orig 2025-05-07 06:48:23 UTC ++++ media/mojo/mojom/BUILD.gn +@@ -959,7 +959,7 @@ source_set("test_support") { + sources = [] + deps = [] + +- if (is_linux || is_chromeos) { ++ if (!is_bsd && (is_linux || is_chromeos)) { + sources += [ + "buffer_handle_test_util.cc", + "buffer_handle_test_util.h", diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_BUILD.gn b/www/iridium/files/patch-media_mojo_mojom_stable_BUILD.gn deleted file mode 100644 index a367d4bc780a..000000000000 --- a/www/iridium/files/patch-media_mojo_mojom_stable_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- media/mojo/mojom/stable/BUILD.gn.orig 2025-04-16 18:18:42 UTC -+++ media/mojo/mojom/stable/BUILD.gn -@@ -191,7 +191,7 @@ source_set("unit_tests") { - } else if (use_v4l2_codec) { - deps += [ "//media/gpu/v4l2:v4l2_status" ] - } -- if (is_linux || is_chromeos) { -+ if (!is_bsd && (is_linux || is_chromeos)) { - sources += [ - "mojom_traits_test_util.cc", - "mojom_traits_test_util.h", diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc deleted file mode 100644 index 46ef18923eed..000000000000 --- a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2025-03-18 16:46:04 UTC -+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -861,7 +861,7 @@ const gfx::GpuMemoryBufferId& StructTraits< - return input.id; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // static - gfx::NativePixmapHandle StructTraits< - media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -882,7 +882,7 @@ bool StructTraitstype = gfx::NATIVE_PIXMAP; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (!data.ReadPlatformHandle(&output->native_pixmap_handle)) - return false; - return true; diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h deleted file mode 100644 index c9c8d351c0be..000000000000 --- a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2025-02-22 18:06:53 UTC -+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -704,7 +704,7 @@ struct StructTraitsstorage_type() == media::VideoFrame::STORAGE_DMABUFS) { + // Duplicates the DMA buffer FDs to a new vector since this cannot take + // ownership of the FDs in |input| due to constness. +@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( + + } // namespace + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // static + bool StructTraits< + media::mojom::ColorPlaneLayoutDataView, +@@ -436,7 +436,7 @@ bool StructTraits + struct StructTraits { diff --git a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc index 7c313b770816..fb4cde5597af 100644 --- a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,38 +1,29 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2025-04-16 18:18:42 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2025-05-07 06:48:23 UTC +++ media/video/fake_gpu_memory_buffer.cc @@ -14,7 +14,7 @@ #include "media/base/format_utils.h" #include "media/base/video_frame.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include #include #include @@ -29,7 +29,7 @@ namespace media { namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -84,7 +84,7 @@ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTestin - static base::AtomicSequenceNumber buffer_id_generator; - handle.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); +@@ -73,7 +73,7 @@ static base::AtomicSequenceNumber buffer_id_generator; + + } // namespace -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - for (size_t i = 0; i < VideoFrame::NumPlanes(*video_pixel_format); i++) { - const gfx::Size plane_size_in_bytes = - VideoFrame::PlaneSize(*video_pixel_format, i, size); -@@ -187,7 +187,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH - gfx::GpuMemoryBufferHandle handle; - handle.type = gfx::NATIVE_PIXMAP; - handle.id = handle_.id; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - handle.native_pixmap_handle = - gfx::CloneHandleForIPC(handle_.native_pixmap_handle); - #endif + gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting( + const gfx::Size& size, + gfx::BufferFormat format, diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index b02423ea0f1d..af55d3f7f678 100644 --- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,29 +1,29 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-03-18 16:46:04 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-05-07 06:48:23 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -644,7 +644,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasSharedImage(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1054,7 +1054,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1057,7 +1057,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) is_webgpu_compatible = handle.native_pixmap_handle.supports_zero_copy_webgpu_import; #endif -@@ -1225,7 +1225,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr +@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(crbug.com/40194712): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc index 40b87b431e83..1e2e20684391 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,11 +1,11 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2025-03-18 16:46:04 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2025-05-07 06:48:23 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -463,7 +463,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele +@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele auto format = PIXEL_FORMAT_I420; auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Linux/ChromeOS require a special configuration to use dmabuf storage. // We need to keep sending frames with the same storage type. // Other platforms will happily mix GpuMemoryBuffer storage with shared-mem diff --git a/www/iridium/files/patch-media_webrtc_audio__processor.cc b/www/iridium/files/patch-media_webrtc_audio__processor.cc index 785de6aef142..4c7c1d119c95 100644 --- a/www/iridium/files/patch-media_webrtc_audio__processor.cc +++ b/www/iridium/files/patch-media_webrtc_audio__processor.cc @@ -1,11 +1,11 @@ ---- media/webrtc/audio_processor.cc.orig 2025-04-16 18:18:42 UTC +--- media/webrtc/audio_processor.cc.orig 2025-05-07 06:48:23 UTC +++ media/webrtc/audio_processor.cc -@@ -507,7 +507,7 @@ std::optional AudioProcessor::ProcessData( +@@ -509,7 +509,7 @@ std::optional AudioProcessor::ProcessData( // controller. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // We have a special situation on Linux where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that diff --git a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni index 7e45e7ac62d7..b836291974b8 100644 --- a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,19 +1,19 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2025-04-16 18:18:42 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2025-05-07 06:48:23 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -782,6 +782,16 @@ template("mojom") { +@@ -774,6 +774,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } + if (is_openbsd) { + enabled_features += [ "is_openbsd" ] + enabled_features += [ "is_bsd" ] + } + + if (is_freebsd) { + enabled_features += [ "is_freebsd" ] + enabled_features += [ "is_bsd" ] + } + action_outputs = [] foreach(base_path, output_file_base_paths) { filename = get_path_info(base_path, "file") diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index dd4589ff6a93..b748a4e7df63 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,95 +1,95 @@ ---- net/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- net/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ net/BUILD.gn @@ -125,7 +125,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] -if (is_linux || is_chromeos) { +if ((is_linux || is_chromeos) && !is_bsd) { net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1312,6 +1312,19 @@ component("net") { +@@ -1320,6 +1320,19 @@ component("net") { ] } + if (is_bsd) { + sources -= [ + "base/address_map_cache_linux.cc", + "base/address_map_cache_linux.h", + "base/address_map_linux.cc", + "base/address_map_linux.h", + "base/address_tracker_linux.cc", + "base/address_tracker_linux.h", + "base/network_change_notifier_linux.cc", + "base/network_interfaces_linux.cc", + ] + } + if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1475,7 +1488,7 @@ component("net") { +@@ -1483,7 +1496,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. - if (is_posix && !is_linux && !is_chromeos) { + if ((is_posix && !is_linux && !is_chromeos) || is_bsd) { sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2174,7 +2187,7 @@ static_library("test_support") { +@@ -2182,7 +2195,7 @@ static_library("test_support") { ] } - if (is_linux || is_chromeos || is_android) { + if (!is_bsd && (is_linux || is_chromeos || is_android)) { sources += [ "base/address_tracker_linux_test_util.cc", "base/address_tracker_linux_test_util.h", -@@ -2985,14 +2998,14 @@ target(_test_target_type, "net_unittests") { +@@ -3001,14 +3014,14 @@ target(_test_target_type, "net_unittests") { ] } - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ "base/network_change_notifier_linux_unittest.cc", "proxy_resolution/proxy_config_service_linux_unittest.cc", ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3086,6 +3099,10 @@ target(_test_target_type, "net_unittests") { +@@ -3104,6 +3117,10 @@ target(_test_target_type, "net_unittests") { ] } + if (is_bsd) { + deps += [ "//sandbox/policy" ] + } + if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3152,7 +3169,7 @@ target(_test_target_type, "net_unittests") { +@@ -3170,7 +3187,7 @@ target(_test_target_type, "net_unittests") { ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3291,7 +3308,7 @@ target(_test_target_type, "net_unittests") { +@@ -3309,7 +3326,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. - if (is_posix && !is_linux && !is_chromeos) { + if (is_posix && !is_linux && !is_chromeos && !is_bsd) { sources += [ "base/network_interfaces_getifaddrs_unittest.cc" ] } diff --git a/www/iridium/files/patch-net_base_features.cc b/www/iridium/files/patch-net_base_features.cc index 6564144a327d..f183e1fe0ae7 100644 --- a/www/iridium/files/patch-net_base_features.cc +++ b/www/iridium/files/patch-net_base_features.cc @@ -1,24 +1,24 @@ ---- net/base/features.cc.orig 2025-03-18 16:46:04 UTC +--- net/base/features.cc.orig 2025-05-07 06:48:23 UTC +++ net/base/features.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, "AsyncDns", #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -549,7 +549,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -548,7 +548,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); +#if BUILDFLAG(IS_OPENBSD) +// No IP_RECVTOS support +BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); +#else BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_ENABLED_BY_DEFAULT); +#endif BASE_FEATURE(kUseNewAlpsCodepointHttp2, "UseNewAlpsCodepointHttp2", diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc.h b/www/iridium/files/patch-net_cert_cert__verify__proc.h index 84fcf2dbf85d..fd4ac1b6c7d8 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc.h +++ b/www/iridium/files/patch-net_cert_cert__verify__proc.h @@ -1,11 +1,11 @@ ---- net/cert/cert_verify_proc.h.orig 2024-12-22 12:24:29 UTC +--- net/cert/cert_verify_proc.h.orig 2025-05-07 06:48:23 UTC +++ net/cert/cert_verify_proc.h -@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc +@@ -182,7 +182,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; -#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) // Creates and returns a CertVerifyProc that uses the system verifier. // |cert_net_fetcher| may not be used, depending on the implementation. diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc index 3e62bfe2c8ee..7db9301607ac 100644 --- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,14 +1,13 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2024-08-01 05:47:53 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2025-05-07 06:48:23 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib - static const char* const kDefaultLibraryNames[] = { +@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib + } else { #if BUILDFLAG(IS_APPLE) - "/System/Library/Frameworks/GSS.framework/GSS" + library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS"); -#elif BUILDFLAG(IS_OPENBSD) -- "libgssapi.so" // Heimdal - OpenBSD +#elif BUILDFLAG(IS_BSD) -+ "libgssapi_krb5.so.2", // MIT Kerberos - FreeBSD -+ "libgssapi.so" // Heimdal - OpenBSD, FreeBSD ++ // MIT Kerberos - FreeBSD ++ library_names.emplace_back("libgssapi_krb5.so.2"); + // Heimdal - OpenBSD + library_names.emplace_back("libgssapi.so"); #else - "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian - "libgssapi.so.4", // Heimdal - Suse10, MDK diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 81c8ecf85d65..761b6dccbe18 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,40 +1,40 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-08-01 05:47:53 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2025-05-07 06:48:23 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -11,7 +11,9 @@ #include #include +#if !BUILDFLAG(IS_BSD) #include +#endif #include #include @@ -510,6 +512,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) +#if !BUILDFLAG(IS_BSD) // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(std::string_view value, int default_value) { -@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1048,6 +1051,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr file_task_runner_; }; +#endif } // namespace -@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1266,9 +1270,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: case base::nix::DESKTOP_ENVIRONMENT_KDE6: +#if !BUILDFLAG(IS_BSD) setting_getter_ = std::make_unique(env_var_getter_.get()); break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: case base::nix::DESKTOP_ENVIRONMENT_LXQT: case base::nix::DESKTOP_ENVIRONMENT_OTHER: diff --git a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc index e966f7584e73..99e041cb3e12 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,47 +1,47 @@ ---- net/socket/udp_socket_unittest.cc.orig 2025-04-16 18:18:42 UTC +--- net/socket/udp_socket_unittest.cc.orig 2025-05-07 06:48:23 UTC +++ net/socket/udp_socket_unittest.cc @@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } -#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). @@ -682,7 +682,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #else @@ -704,7 +704,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #else -@@ -763,7 +763,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -770,7 +770,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(crbug.com/40620614): failing on device on iOS 12.2. // TODO(crbug.com/40189274): flaky on Mac 11. -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -817,7 +817,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -824,7 +824,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); -#if !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // Send a message via the multicast group. That message is expected be be // received by both receving sockets. // diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 76d63a3eee13..3ed9cbd0aa77 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,29 +1,29 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-11-04 08:56:03 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2025-05-07 06:48:23 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -35,7 +35,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" #include "third_party/boringssl/src/pki/trust_store_collection.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif @@ -67,7 +67,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -580,7 +580,7 @@ int main(int argc, char** argv) { +@@ -582,7 +582,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. -#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) impls_str = "platform,"; #endif diff --git a/www/iridium/files/patch-net_url__request_url__request.cc b/www/iridium/files/patch-net_url__request_url__request.cc index c28a33a6ae92..19bb489c965b 100644 --- a/www/iridium/files/patch-net_url__request_url__request.cc +++ b/www/iridium/files/patch-net_url__request_url__request.cc @@ -1,30 +1,30 @@ ---- net/url_request/url_request.cc.orig 2025-04-16 18:18:42 UTC +--- net/url_request/url_request.cc.orig 2025-05-07 06:48:23 UTC +++ net/url_request/url_request.cc @@ -10,6 +10,7 @@ # include #endif +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/functional/bind.h" #include "base/functional/callback.h" @@ -24,6 +25,7 @@ #include "base/types/optional_util.h" #include "base/types/pass_key.h" #include "base/values.h" +#include "content/public/common/content_switches.h" #include "net/base/auth.h" #include "net/base/features.h" #include "net/base/io_buffer.h" -@@ -63,7 +65,10 @@ namespace iridium { +@@ -64,7 +66,10 @@ namespace iridium { void textlog_request(const char *caller, const GURL &url) { -#ifdef __linux__ + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch(switches::kTrk)) + return; +#ifdef __unix__ bool tty = isatty(fileno(stderr)); #else bool tty = false; diff --git a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc index 79da739b5728..ce8f97fd6a03 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context_builder.cc.orig 2025-04-16 18:18:42 UTC +--- net/url_request/url_request_context_builder.cc.orig 2025-05-07 06:48:23 UTC +++ net/url_request/url_request_context_builder.cc -@@ -440,7 +440,7 @@ std::unique_ptr URLRequestContextBu +@@ -441,7 +441,7 @@ std::unique_ptr URLRequestContextBu } if (!proxy_resolution_service_) { -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) // TODO(willchan): Switch to using this code when // ProxyConfigService::CreateSystemProxyConfigService()'s // signature doesn't suck. diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc index 57a37739dd9a..bebe760cbab0 100644 --- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,20 +1,20 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2025-04-16 18:18:42 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2025-05-07 06:48:23 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -109,7 +109,7 @@ +@@ -111,7 +111,7 @@ #include "ui/accessibility/ax_features.mojom-features.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -565,7 +565,7 @@ void InitializeSDK(bool enable_v8, +@@ -567,7 +567,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) g_font_mapping_mode = font_mapping_mode; InitializeLinuxFontMapper(); #endif diff --git a/www/iridium/files/patch-printing_printing__features.cc b/www/iridium/files/patch-printing_printing__features.cc index 3b7e19c38071..d0276997445a 100644 --- a/www/iridium/files/patch-printing_printing__features.cc +++ b/www/iridium/files/patch-printing_printing__features.cc @@ -1,26 +1,26 @@ ---- printing/printing_features.cc.orig 2025-02-22 18:06:53 UTC +--- printing/printing_features.cc.orig 2025-05-07 06:48:23 UTC +++ printing/printing_features.cc -@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Use the CUPS IPP printing backend instead of the original CUPS backend that // calls the deprecated PPD API. BASE_FEATURE(kCupsIppPrintingBackend, "CupsIppPrintingBackend", -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT -@@ -69,7 +69,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, +@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, // out-of-process. BASE_FEATURE(kEnableOopPrintDrivers, "EnableOopPrintDrivers", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-printing_printing__features.h b/www/iridium/files/patch-printing_printing__features.h index 40856b0206cc..9f7e8d13e53b 100644 --- a/www/iridium/files/patch-printing_printing__features.h +++ b/www/iridium/files/patch-printing_printing__features.h @@ -1,11 +1,11 @@ ---- printing/printing_features.h.orig 2024-08-01 05:47:53 UTC +--- printing/printing_features.h.orig 2025-05-07 06:48:23 UTC +++ printing/printing_features.h -@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE) - BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr); +@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE) + BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(PRINTING_BASE) BASE_DECLARE_FEATURE(kCupsIppPrintingBackend); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc index e78a7d9d2066..0c26dcf1c068 100644 --- a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc +++ b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc @@ -1,11 +1,11 @@ ---- remoting/host/base/desktop_environment_options.cc.orig 2024-11-04 08:56:03 UTC +--- remoting/host/base/desktop_environment_options.cc.orig 2025-05-07 06:48:23 UTC +++ remoting/host/base/desktop_environment_options.cc -@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic +@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic // TODO(joedow): Determine whether we can migrate additional platforms to // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then // clean up DesktopCapturerProxy::Core::CreateCapturer(). -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return capture_video_on_dedicated_thread_; #else return false; diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.cc b/www/iridium/files/patch-remoting_host_chromoting__host.cc index b5086b231605..4f85724fb7c9 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host.cc +++ b/www/iridium/files/patch-remoting_host_chromoting__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host.cc.orig 2025-02-22 18:06:53 UTC +--- remoting/host/chromoting_host.cc.orig 2025-05-07 06:48:23 UTC +++ remoting/host/chromoting_host.cc -@@ -135,7 +135,7 @@ void ChromotingHost::Start(const std::string& host_own +@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::string& host_own &ChromotingHost::OnIncomingSession, base::Unretained(this))); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.h b/www/iridium/files/patch-remoting_host_chromoting__host.h index 89c054366049..85529fb300c8 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host.h +++ b/www/iridium/files/patch-remoting_host_chromoting__host.h @@ -1,29 +1,29 @@ ---- remoting/host/chromoting_host.h.orig 2025-02-22 18:06:53 UTC +--- remoting/host/chromoting_host.h.orig 2025-05-07 06:48:23 UTC +++ remoting/host/chromoting_host.h @@ -36,7 +36,7 @@ #include "remoting/protocol/session_manager.h" #include "remoting/protocol/transport_context.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "remoting/host/chromoting_host_services_server.h" #endif @@ -112,7 +112,7 @@ class ChromotingHost : public ClientSession::EventHand // This method can only be called once during the lifetime of this object. void Start(const std::string& host_owner); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Starts running the ChromotingHostServices server and listening for incoming // IPC binding requests. // Currently only Linux runs the ChromotingHostServices server on the host -@@ -220,7 +220,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSession::EventHand // List of host extensions. std::vector> extensions_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // IPC server that runs the CRD host service API. Non-null if the server name // is set and the host is started. // Currently only Linux runs the ChromotingHostServices server on the host diff --git a/www/iridium/files/patch-remoting_host_client__session.cc b/www/iridium/files/patch-remoting_host_client__session.cc index 40925c806b13..dab2b504767d 100644 --- a/www/iridium/files/patch-remoting_host_client__session.cc +++ b/www/iridium/files/patch-remoting_host_client__session.cc @@ -1,11 +1,11 @@ ---- remoting/host/client_session.cc.orig 2025-04-16 18:18:42 UTC +--- remoting/host/client_session.cc.orig 2025-05-07 06:48:23 UTC +++ remoting/host/client_session.cc -@@ -187,7 +187,7 @@ void ClientSession::NotifyClientResolution( +@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResolution( if (effective_policies_.curtain_required.value_or(false)) { dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); } -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); #endif diff --git a/www/iridium/files/patch-remoting_host_host__attributes.cc b/www/iridium/files/patch-remoting_host_host__attributes.cc index ffddc137f5ac..674f01d6878a 100644 --- a/www/iridium/files/patch-remoting_host_host__attributes.cc +++ b/www/iridium/files/patch-remoting_host_host__attributes.cc @@ -1,11 +1,11 @@ ---- remoting/host/host_attributes.cc.orig 2023-07-24 14:27:53 UTC +--- remoting/host/host_attributes.cc.orig 2025-05-07 06:48:23 UTC +++ remoting/host/host_attributes.cc -@@ -105,7 +105,7 @@ std::string GetHostAttributes() { +@@ -103,7 +103,7 @@ std::string GetHostAttributes() { if (media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) result.push_back("HWEncoder"); #endif diff --git a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc index e9e51388420a..f0d880ea1025 100644 --- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,146 +1,146 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2025-04-16 18:18:42 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2025-05-07 06:48:23 UTC +++ remoting/host/remoting_me2me_host.cc @@ -138,7 +138,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(REMOTING_USE_X11) #include @@ -148,7 +148,7 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/linux_util.h" #include "remoting/host/linux/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" @@ -163,7 +163,7 @@ #include "remoting/host/pairing_registry_delegate_win.h" #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "remoting/host/host_utmp_logger.h" #endif // BUILDFLAG(IS_LINUX) @@ -196,7 +196,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -441,7 +441,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr agent_process_broker_client_; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -506,7 +506,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr ftl_echo_message_listener_; std::unique_ptr host_event_logger_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr host_utmp_logger_; #endif std::unique_ptr power_save_blocker_; -@@ -824,7 +824,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -825,7 +825,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -902,7 +902,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->create_client_cert_store_callback(), service_account_email_, oauth_refresh_token_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() { +@@ -1044,7 +1044,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1122,7 +1122,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1123,7 +1123,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() { +@@ -1873,7 +1873,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); + desktop_environment_options_.set_enable_remote_webauthn(true); #endif #if BUILDFLAG(IS_WIN) -@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() { +@@ -1900,7 +1900,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() { +@@ -1936,7 +1936,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2072,7 +2072,7 @@ int HostProcessMain() { +@@ -2081,7 +2081,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2135,7 +2135,7 @@ int HostProcessMain() { +@@ -2144,7 +2144,7 @@ int HostProcessMain() { std::unique_ptr network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = diff --git a/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc b/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc index b8b8a68e2dae..4447e45de248 100644 --- a/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc +++ b/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc @@ -1,11 +1,11 @@ ---- remoting/host/session_policies_from_dict.cc.orig 2025-02-22 18:06:53 UTC +--- remoting/host/session_policies_from_dict.cc.orig 2025-05-07 06:48:23 UTC +++ remoting/host/session_policies_from_dict.cc -@@ -76,7 +76,7 @@ std::optional SessionPoliciesFromDict - .curtain_required = - dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain), +@@ -75,7 +75,7 @@ std::optional SessionPoliciesFromDict + session_policies.curtain_required = + dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - .host_username_match_required = - dict.FindBool(policy::key::kRemoteAccessHostMatchUsername), + session_policies.host_username_match_required = + dict.FindBool(policy::key::kRemoteAccessHostMatchUsername); #endif diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn index 95cc365123a3..5c788285c6e6 100644 --- a/www/iridium/files/patch-sandbox_linux_BUILD.gn +++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn @@ -1,35 +1,35 @@ ---- sandbox/linux/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- sandbox/linux/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ sandbox/linux/BUILD.gn @@ -12,11 +12,11 @@ if (is_android) { } declare_args() { - compile_suid_client = is_linux || is_chromeos + compile_suid_client = (is_linux || is_chromeos) && !is_bsd - compile_credentials = is_linux || is_chromeos + compile_credentials = (is_linux || is_chromeos) && !is_bsd - compile_syscall_broker = is_linux || is_chromeos + compile_syscall_broker = (is_linux || is_chromeos) && !is_bsd # On Android, use plain GTest. use_base_test_suite = is_linux || is_chromeos -@@ -378,6 +378,17 @@ component("sandbox_services") { +@@ -369,6 +369,17 @@ component("sandbox_services") { "services/libc_interceptor.h", ] } + + if (is_bsd) { + sources -= [ + "services/scoped_process.cc", + "services/scoped_process.h", + "services/syscall_wrappers.cc", + "services/syscall_wrappers.h", + "services/yama.cc", + "services/yama.h", + ] + } } source_set("sandbox_services_headers") { diff --git a/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc index f782d75d6c67..55c514bcb5fe 100644 --- a/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc +++ b/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_provider_manager.cc.orig 2025-02-22 18:06:53 UTC +--- services/device/geolocation/location_provider_manager.cc.orig 2025-05-07 06:48:23 UTC +++ services/device/geolocation/location_provider_manager.cc @@ -91,7 +91,7 @@ LocationProviderManager::LocationProviderManager( - #if BUILDFLAG(IS_ANDROID) - // On Android, default to using the platform location provider. + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + // On Android and iOS, default to using the platform location provider. provider_manager_mode_ = kPlatformOnly; -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On Ash / Lacros / Linux, default to using the network location provider. provider_manager_mode_ = kNetworkOnly; #else diff --git a/www/iridium/files/patch-services_device_public_cpp_device__features.cc b/www/iridium/files/patch-services_device_public_cpp_device__features.cc index 718c7c1d84ef..6e24d8dab855 100644 --- a/www/iridium/files/patch-services_device_public_cpp_device__features.cc +++ b/www/iridium/files/patch-services_device_public_cpp_device__features.cc @@ -1,11 +1,11 @@ ---- services/device/public/cpp/device_features.cc.orig 2025-04-16 18:18:42 UTC +--- services/device/public/cpp/device_features.cc.orig 2025-05-07 06:48:23 UTC +++ services/device/public/cpp/device_features.cc -@@ -120,7 +120,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { +@@ -135,7 +135,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { // Controls whether Chrome will try to automatically detach kernel drivers when // a USB interface is busy. -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kAutomaticUsbDetach, "AutomaticUsbDetach", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.cc b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.cc new file mode 100644 index 000000000000..3e49a5d0c62b --- /dev/null +++ b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.cc @@ -0,0 +1,38 @@ +--- services/device/usb/usb_device_handle_usbfs.cc.orig 2025-05-07 06:48:23 UTC ++++ services/device/usb/usb_device_handle_usbfs.cc +@@ -39,7 +39,7 @@ + #include "chromeos/dbus/permission_broker/permission_broker_client.h" + #endif + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "services/device/public/cpp/device_features.h" + #include "services/device/usb/usb_interface_detach_allowlist.h" + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R + return true; + } + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface( + int interface_number, + const CombinedInterfaceInfo& interface_info) { +@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac + return; + } + #endif +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) { + const mojom::UsbConfigurationInfo* config = + device_->GetActiveConfiguration(); +@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in + return; + } + #endif +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) { + helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface) + .WithArgs(interface_number) diff --git a/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.h b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.h new file mode 100644 index 000000000000..b55e5874fd60 --- /dev/null +++ b/www/iridium/files/patch-services_device_usb_usb__device__handle__usbfs.h @@ -0,0 +1,38 @@ +--- services/device/usb/usb_device_handle_usbfs.h.orig 2025-05-07 06:48:23 UTC ++++ services/device/usb/usb_device_handle_usbfs.h +@@ -19,7 +19,7 @@ + #include "base/threading/sequence_bound.h" + #include "services/device/usb/usb_device_handle.h" + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/containers/flat_set.h" + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + +@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper { + bool ClearHalt(uint8_t endpoint_address); + void DiscardUrb(Transfer* transfer); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Detach the interface from a kernel driver before ClaimInterface + virtual bool DetachInterface(int interface_number, + const CombinedInterfaceInfo& interfaceInfo); +@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper { + // Called when |fd_| is writable without blocking. + void OnFileCanWriteWithoutBlocking(); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Called from |DetachInterface|. + std::string GetKernelDriver(int interface_number) const; + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper { + std::unique_ptr watch_controller_; + SEQUENCE_CHECKER(sequence_checker_); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // All interfaces that have been detached from kernel drivers + base::flat_set detached_interfaces_; + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index 42874ef9a046..ce4055c4f766 100644 --- a/www/iridium/files/patch-services_network_BUILD.gn +++ b/www/iridium/files/patch-services_network_BUILD.gn @@ -1,10 +1,10 @@ ---- services/network/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- services/network/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ services/network/BUILD.gn -@@ -397,7 +397,6 @@ if (is_linux || is_chromeos) { +@@ -400,7 +400,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", - "//sandbox/linux:sandbox_services", "//sandbox/policy:policy", ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/www/iridium/files/patch-services_network_network__context.cc b/www/iridium/files/patch-services_network_network__context.cc index 6453d31d353b..98960645ba48 100644 --- a/www/iridium/files/patch-services_network_network__context.cc +++ b/www/iridium/files/patch-services_network_network__context.cc @@ -1,20 +1,20 @@ ---- services/network/network_context.cc.orig 2025-04-16 18:18:42 UTC +--- services/network/network_context.cc.orig 2025-05-07 06:48:23 UTC +++ services/network/network_context.cc -@@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -607,7 +607,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2552,7 +2552,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2557,7 +2557,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) http_auth_merged_preferences_.set_allow_gssapi_library_load( http_auth_dynamic_network_service_params->allow_gssapi_library_load); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-services_network_network__context.h b/www/iridium/files/patch-services_network_network__context.h index 09fc7b75bea0..23b7fe21aec4 100644 --- a/www/iridium/files/patch-services_network_network__context.h +++ b/www/iridium/files/patch-services_network_network__context.h @@ -1,11 +1,11 @@ ---- services/network/network_context.h.orig 2025-04-16 18:18:42 UTC +--- services/network/network_context.h.orig 2025-05-07 06:48:23 UTC +++ services/network/network_context.h -@@ -709,7 +709,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -715,7 +715,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool AllowGssapiLibraryLoad() const override; #endif // BUILDFLAG(IS_LINUX) private: diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc index 34a1dec4c4bd..e4f05509069d 100644 --- a/www/iridium/files/patch-services_network_network__service.cc +++ b/www/iridium/files/patch-services_network_network__service.cc @@ -1,34 +1,34 @@ ---- services/network/network_service.cc.orig 2025-04-16 18:18:42 UTC +--- services/network/network_service.cc.orig 2025-05-07 06:48:23 UTC +++ services/network/network_service.cc -@@ -102,11 +102,11 @@ +@@ -103,11 +103,11 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) #include "components/os_crypt/sync/key_storage_config_linux.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "services/network/network_change_notifier_passive_factory.h" #endif -@@ -999,7 +999,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -1016,7 +1016,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote gssapi_library_load_observer) { -@@ -1081,7 +1081,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1116,7 +1116,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void NetworkService::OnBeforeGssapiLibraryLoad() { if (gssapi_library_load_observer_.is_bound()) { gssapi_library_load_observer_->OnBeforeGssapiLibraryLoad(); diff --git a/www/iridium/files/patch-services_network_network__service.h b/www/iridium/files/patch-services_network_network__service.h index 73f6548ce1b3..983a7a0d33fa 100644 --- a/www/iridium/files/patch-services_network_network__service.h +++ b/www/iridium/files/patch-services_network_network__service.h @@ -1,29 +1,29 @@ ---- services/network/network_service.h.orig 2025-04-16 18:18:42 UTC +--- services/network/network_service.h.orig 2025-05-07 06:48:23 UTC +++ services/network/network_service.h -@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -250,7 +250,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService const std::vector& settings) override; void SetExplicitlyAllowedPorts(const std::vector& ports) override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SetGssapiLibraryLoadObserver( mojo::PendingRemote gssapi_library_load_observer) override; -@@ -275,7 +275,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -291,7 +291,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr CreateHttpAuthHandlerFactory( NetworkContext* network_context); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -531,7 +531,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -547,7 +547,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr mock_network_change_notifier_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) mojo::Remote gssapi_library_load_observer_; #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn index dc01075f7b6a..0386c6b7c175 100644 --- a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,11 +1,11 @@ ---- services/network/public/cpp/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- services/network/public/cpp/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ services/network/public/cpp/BUILD.gn -@@ -570,7 +570,7 @@ component("cpp_base") { +@@ -621,7 +621,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ "network_interface_change_listener_mojom_traits.cc", "network_interface_change_listener_mojom_traits.h", diff --git a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn index 639f79cf1915..f1aef0de829c 100644 --- a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,25 +1,25 @@ ---- services/network/public/mojom/BUILD.gn.orig 2025-04-16 18:18:42 UTC +--- services/network/public/mojom/BUILD.gn.orig 2025-05-07 06:48:23 UTC +++ services/network/public/mojom/BUILD.gn -@@ -600,11 +600,11 @@ mojom("url_loader_base") { +@@ -674,11 +674,11 @@ mojom("url_loader_base") { } enabled_features = [] - if (is_android || is_chromeos || is_linux) { + if (!is_bsd && (is_android || is_chromeos || is_linux)) { enabled_features += [ "network_change_notifier_in_browser" ] } - if (is_linux) { + if (is_linux && !is_bsd) { # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1672,7 +1672,7 @@ mojom("mojom") { +@@ -1765,7 +1765,7 @@ mojom("mojom") { } } - if (is_linux) { + if (is_linux && !is_bsd) { # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] diff --git a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 976977158b7d..405685d6170f 100644 --- a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,65 +1,65 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-03-18 16:46:04 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-05-07 06:48:23 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; @@ -83,7 +83,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; os_dump->mappings_count = internal_os_dump.mappings_count; -@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::vector pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) for (const auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK_EQ(pid_to_os_dump[pid], nullptr); diff --git a/www/iridium/files/patch-skia_ext_font__utils.cc b/www/iridium/files/patch-skia_ext_font__utils.cc index 15b4530584ad..cb6434b27c55 100644 --- a/www/iridium/files/patch-skia_ext_font__utils.cc +++ b/www/iridium/files/patch-skia_ext_font__utils.cc @@ -1,20 +1,20 @@ ---- skia/ext/font_utils.cc.orig 2025-04-16 18:18:42 UTC +--- skia/ext/font_utils.cc.orig 2025-05-07 06:48:23 UTC +++ skia/ext/font_utils.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h" #endif -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h" #include "third_party/skia/include/ports/SkFontScanner_Fontations.h" -@@ -62,7 +62,7 @@ static sk_sp fontmgr_factory() { - return SkFontMgr_New_Android(nullptr); +@@ -67,7 +67,7 @@ static sk_sp fontmgr_factory() { + } #elif BUILDFLAG(IS_APPLE) return SkFontMgr_New_CoreText(nullptr); -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) sk_sp fci(SkFontConfigInterface::RefGlobal()); if (base::FeatureList::IsEnabled(skia::kFontationsLinuxSystemFonts)) { return fci ? SkFontMgr_New_FCI(std::move(fci), diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h index 6f959d314e4a..2e7fa5255a98 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,21 +1,21 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2025-04-16 18:18:42 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2025-05-07 06:48:23 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -411,7 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -409,7 +409,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ - defined(__VXWORKS__) + defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__FreeBSD__) #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -426,7 +426,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -424,7 +424,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set -#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) +#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) || \ + defined(__OpenBSD__) || defined(__FreeBSD__) #define ABSL_HAVE_SEMAPHORE_H 1 #endif diff --git a/www/iridium/files/patch-third__party_angle_src_common_platform.h b/www/iridium/files/patch-third__party_angle_src_common_platform.h index c1ee58fca0f6..0f84d97e0d17 100644 --- a/www/iridium/files/patch-third__party_angle_src_common_platform.h +++ b/www/iridium/files/patch-third__party_angle_src_common_platform.h @@ -1,19 +1,19 @@ ---- third_party/angle/src/common/platform.h.orig 2022-03-28 18:11:04 UTC +--- third_party/angle/src/common/platform.h.orig 2025-05-07 06:48:23 UTC +++ third_party/angle/src/common/platform.h -@@ -26,7 +26,15 @@ +@@ -23,7 +23,15 @@ #elif defined(__linux__) || defined(EMSCRIPTEN) # define ANGLE_PLATFORM_LINUX 1 # define ANGLE_PLATFORM_POSIX 1 -#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ +#elif defined(__OpenBSD__) +# define ANGLE_PLATFORM_OPENBSD 1 +# define ANGLE_PLATFORM_POSIX 1 +# define ANGLE_PLATFORM_BSD 1 +#elif defined(__FreeBSD__) +# define ANGLE_PLATFORM_FREEBSD 1 +# define ANGLE_PLATFORM_POSIX 1 +# define ANGLE_PLATFORM_BSD 1 +#elif defined(__NetBSD__) || \ defined(__DragonFly__) || defined(__sun) || defined(__GLIBC__) || defined(__GNU__) || \ defined(__QNX__) || defined(__Fuchsia__) || defined(__HAIKU__) # define ANGLE_PLATFORM_POSIX 1 diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index cfbc66270493..7f960429c205 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,56 +1,56 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2025-03-18 16:46:04 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2025-05-07 06:48:23 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -58,7 +58,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" # elif ANGLE_ENABLE_CGL # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX_api.h" @@ -422,7 +422,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayCGL(state); break; -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # if defined(ANGLE_USE_GBM) if (platformType == 0) { @@ -468,7 +468,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # if defined(ANGLE_USE_GBM) if (platformType == 0) { @@ -519,7 +519,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2139,7 +2139,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2133,7 +2133,7 @@ static ClientExtensions GenerateClientExtensions() extensions.platformWaylandEXT = true; #endif -#if defined(ANGLE_PLATFORM_LINUX) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN)) +#if (defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN)) extensions.platformSurfacelessMESA = true; #endif -@@ -2186,7 +2186,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2180,7 +2180,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) extensions.platformANGLEDeviceTypeEGLANGLE = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 91cdb1a66e3b..5ac570805e4c 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,35 +1,35 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2025-04-16 18:18:42 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -82,12 +82,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h" #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) + BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif @@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) binders.Add( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -305,7 +305,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform - #endif +@@ -304,7 +304,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform + MemorySaverController::Initialize(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) + BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Start reporting the highest private memory footprint after the first // navigation. HighestPmfReporter::Initialize(main_thread_task_runner); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index f9d20b3ab398..6a6be1e896c4 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2025-04-16 18:18:42 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -427,7 +427,7 @@ void RecordPrerenderActivationSignalDelay(const String +@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3426,7 +3426,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE); WebFontRenderStyle::SetSubpixelPositioning( renderer_preferences_.use_subpixel_positioning); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!renderer_preferences_.system_font_family_name.empty()) { WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8( renderer_preferences_.system_font_family_name)); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 6818cc684a45..866ed1c8496a 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2025-04-16 18:18:42 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN)) + BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD) const double kIdleTaskStartTimeoutDelayMs = 1000.0; #else const double kIdleTaskStartTimeoutDelayMs = 4000.0; // For ChromeOS, Mobile diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index b09734e35319..01a77074a382 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-02-22 18:06:53 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -74,7 +74,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -784,7 +784,7 @@ void LayoutView::LayoutRoot() { +@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The font code in FontPlatformData does not have a direct connection to the // document, the frame or anything from which we could retrieve the device // scale factor. After using zoom for DSF, the GraphicsContext does only ever diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc index 63b8f283b10b..a76e1658baa5 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-03-18 16:46:04 UTC +--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc -@@ -484,7 +484,7 @@ bool MixedContentChecker::ShouldBlockFetch( +@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFetch( switch (context_type) { case mojom::blink::MixedContentContextType::kOptionallyBlockable: -#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)) && \ +#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENABLE_CAST_RECEIVER) // Fuchsia WebEngine can be configured to allow loading Mixed Content from // an insecure IP address. This is a workaround to revert Fuchsia Cast diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/www/iridium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc new file mode 100644 index 000000000000..aeacb3035811 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig 2025-05-07 06:48:23 UTC ++++ third_party/blink/renderer/core/page/context_menu_controller.cc +@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame + if (potential_image_node != nullptr && + IsA(potential_image_node)) { + data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer + // on Linux and remove the below code, which results in "Copy Image" and + // "Save Image To" being grayed out in the context menu. diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index b357a1aa9c64..95be321b4546 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-02-22 18:06:53 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -123,7 +123,7 @@ namespace blink { +@@ -124,7 +124,7 @@ namespace blink { namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct SameSizeAsPaintLayer : GarbageCollected, DisplayItemClient { // The bit fields may fit into the machine word of DisplayItemClient which // has only 8-bit data. diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index a7bafdf10dfd..7ce1f183bf7f 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2025-02-22 18:06:53 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -873,7 +873,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Use 10 ms buffer (441 frames per buffer). EXPECT_EQ(output_sample_rate / 100, mixer->get_output_params_for_testing().frames_per_buffer()); diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 0e79b6556b22..dd79661ee3dd 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-04-16 18:18:42 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-05-07 06:48:23 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6343,7 +6343,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1175907): Only TexImage2D seems to work with the GPU path on // Android M -- appears to work fine on R, but to avoid regressions in