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

www/chromium: update to 137.0.7151.55

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/25acd603-3dde-11f0-8cb5-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2025-05-31 07:14:59 +02:00
parent fc8715cd2d
commit 0b2d1e127d
361 changed files with 1657 additions and 2492 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
www/chromium/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= chromium
PORTVERSION= 136.0.7103.113
PORTREVISION= 1
PORTVERSION= 137.0.7151.55
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
@ -92,8 +91,7 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper #buildtools/linux64/clang
MAKE_ARGS= -C out/${BUILDTYPE}
ALL_TARGET= chrome
BINARY_ALIAS= python3=${PYTHON_CMD} \
moc=${PREFIX}/bin/moc-qt5
BINARY_ALIAS= python3=${PYTHON_CMD}
# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
#
@ -110,6 +108,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
fatal_linker_warnings=false \
icu_use_data_file=false \
is_clang=true \
moc_qt5_path="${QT_TOOLDIR}/moc" \
optimize_webui=true \
toolkit_views=true \
treat_warnings_as_errors=false \
@ -120,6 +119,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_lld=true \
use_partition_alloc=true \
use_partition_alloc_as_malloc=false \
use_qt5=true \
use_sysroot=false \
use_system_freetype=false \
use_system_harfbuzz=true \

10
www/chromium/distinfo
View file

@ -1,7 +1,7 @@
TIMESTAMP = 1747298146
SHA256 (chromium-136.0.7103.113.tar.xz) = 7c765bd13df842a28bb52279b8d711411ac6082151473e07bd70b9a482c0a0ac
SIZE (chromium-136.0.7103.113.tar.xz) = 7196537592
TIMESTAMP = 1748448949
SHA256 (chromium-137.0.7151.55.tar.xz) = b11e76fd82745db5602ce151ae931cc5e56c3ee2b6e08c2fbf788bf4b3ea84cb
SIZE (chromium-137.0.7151.55.tar.xz) = 7246424332
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
SHA256 (chromium-136.0.7103.113-testdata.tar.xz) = cbf264643986db5b7aa91843ea64a1b9e23d00bb226b234d4f60788469a58ef8
SIZE (chromium-136.0.7103.113-testdata.tar.xz) = 651614116
SHA256 (chromium-137.0.7151.55-testdata.tar.xz) = f5c2c8483cc4608d3b1eb980cc81d74ae3840f6400f4ce39727cb309fe5378f5
SIZE (chromium-137.0.7151.55-testdata.tar.xz) = 656595876

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

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2025-05-05 10:57:53 UTC
--- BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ BUILD.gn
@@ -71,7 +71,7 @@ declare_args() {
root_extra_deps = []
@ -87,7 +87,7 @@
# 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.
@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") {
@@ -1743,7 +1751,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

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

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2025-05-05 10:57:53 UTC
--- base/BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ base/BUILD.gn
@@ -1104,11 +1104,26 @@ component("base") {
@@ -1108,11 +1108,26 @@ component("base") {
# Needed for <atomic> 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.
@ -28,7 +28,7 @@
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1128,7 +1143,7 @@ component("base") {
@@ -1132,7 +1147,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -37,7 +37,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2152,6 +2167,22 @@ component("base") {
@@ -2166,6 +2181,22 @@ component("base") {
]
}
@ -60,7 +60,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2312,6 +2343,33 @@ component("base") {
@@ -2334,6 +2365,33 @@ component("base") {
}
}
@ -94,7 +94,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2690,7 +2748,7 @@ buildflag_header("protected_memory_buildflags") {
@@ -2729,7 +2787,7 @@ buildflag_header("protected_memory_buildflags") {
header = "protected_memory_buildflags.h"
header_dir = "base/memory"
@ -103,7 +103,7 @@
(is_win || is_linux || is_android || is_mac)
flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
@@ -3163,7 +3221,7 @@ if (is_apple) {
@@ -3236,7 +3294,7 @@ if (is_apple) {
}
}
@ -112,7 +112,7 @@
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
@@ -3851,7 +3909,7 @@ test("base_unittests") {
@@ -3924,7 +3982,7 @@ test("base_unittests") {
]
}
@ -121,7 +121,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3879,7 +3937,7 @@ test("base_unittests") {
@@ -3952,7 +4010,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -130,7 +130,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3890,7 +3948,7 @@ test("base_unittests") {
@@ -3963,7 +4021,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -139,7 +139,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -4080,7 +4138,7 @@ test("base_unittests") {
@@ -4151,7 +4209,7 @@ test("base_unittests") {
deps += [ ":base_profiler_test_support_library" ]
}

11
www/chromium/files/patch-base_allocator_partition__alloc__features.cc Normal file
View file

@ -0,0 +1,11 @@
--- base/allocator/partition_alloc_features.cc.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_alloc_features.cc
@@ -164,7 +164,7 @@ BASE_FEATURE(kPartitionAllocEventuallyZeroFreedMemory,
// disabled elsewhere (for now). Does not apply to Windows.
BASE_FEATURE(kPartitionAllocFewerMemoryRegions,
"PartitionAllocFewerMemoryRegions",
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
FEATURE_ENABLED_BY_DEFAULT);
#else
FEATURE_DISABLED_BY_DEFAULT);

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-05-05 10:57:53 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -89,7 +89,7 @@ if (is_nacl) {
@@ -91,7 +91,7 @@ if (is_nacl) {
# TODO(crbug.com/329199197): Clean this up when experiments are complete.
use_large_empty_slot_span_ring = true
@ -9,7 +9,7 @@
!is_hwasan && (is_linux || is_android)
declare_args() {
@@ -348,7 +348,7 @@ declare_args() {
@@ -353,7 +353,7 @@ declare_args() {
declare_args() {
# Shadow metadata is still under development and only supports Linux
# for now.
@ -18,7 +18,7 @@
}
declare_args() {
@@ -491,7 +491,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
@@ -496,7 +496,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 =

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-05-05 10:57:53 UTC
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -886,7 +886,7 @@ if (is_clang_or_gcc) {
@@ -893,7 +893,7 @@ if (is_clang_or_gcc) {
configs -= [ partition_alloc_enable_arc_config ]
}
}

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-04-04 08:52:13 UTC
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
@@ -309,8 +309,12 @@ bool TryRecommitSystemPagesInternal(
@@ -317,8 +317,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2025-03-05 08:14:56 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
@@ -327,7 +327,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask);
@@ -312,7 +312,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask);
// 8GB for each of the glued pools).
#if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
#if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \
@ -9,7 +9,7 @@
constexpr size_t kPoolMaxSize = 8 * kGiB;
#else
constexpr size_t kPoolMaxSize = 16 * kGiB;
@@ -444,7 +444,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() {
@@ -429,7 +429,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() {
// TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation
// where a normal slot span will be large enough to contain multiple items,
// but the address will go over the final partition page after being aligned.

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-02-19 07:43:18 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -44,7 +44,7 @@
@@ -45,7 +45,7 @@
#include "wow64apiset.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#if PA_CONFIG(ENABLE_SHADOW_METADATA)
#include <sys/mman.h>
@@ -297,7 +297,7 @@ void PartitionAllocMallocInitOnce() {
@@ -298,7 +298,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -1117,7 +1117,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
@@ -1118,7 +1118,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

45
www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-08-26 12:06:38 UTC
--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2025-05-28 14:55:43 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
@@ -17,7 +17,16 @@
@@ -19,7 +19,16 @@
#endif
#if PA_CONFIG(HAS_LINUX_KERNEL)
@ -17,37 +17,20 @@
#include <sys/syscall.h>
#include <unistd.h>
@@ -106,8 +115,16 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
+#if defined(OS_FREEBSD)
+ int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE,
+ kLockedContended, nullptr, nullptr);
+#elif defined(OS_OPENBSD)
+ int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
+ kLockedContended, nullptr, nullptr);
+#else
int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
kLockedContended, nullptr, nullptr, 0);
+#endif
if (err) {
// These are programming error, check them.
@@ -119,8 +136,16 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
@@ -92,8 +101,16 @@ PA_ALWAYS_INLINE long FutexSyscall(volatile void* ftx,
int saved_errno = errno;
errno = 0;
+#if defined(OS_FREEBSD)
+ long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE,
+ 1 /* wake up a single waiter */, nullptr, nullptr);
+ long retval = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE,
+ kLockedContended, nullptr, nullptr);
+#elif defined(OS_OPENBSD)
+ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
+ 1 /* wake up a single waiter */, nullptr, nullptr);
+ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
+ kLockedContended, nullptr, nullptr);
+#else
long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
1 /* wake up a single waiter */, nullptr, nullptr, 0);
long retval = syscall(SYS_futex, ftx, op | FUTEX_PRIVATE_FLAG, value, nullptr,
nullptr, 0);
+#endif
PA_CHECK(retval != -1);
errno = saved_errno;
}
if (retval == -1) {
// These are programming errors, check them.
PA_DCHECK((errno != EPERM) || (errno != EACCES) || (errno != EINVAL) ||

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

@ -1,6 +1,6 @@
--- base/debug/debugger_posix.cc.orig 2025-03-05 08:14:56 UTC
--- base/debug/debugger_posix.cc.orig 2025-05-28 14:55:43 UTC
+++ base/debug/debugger_posix.cc
@@ -41,6 +41,10 @@
@@ -42,6 +42,10 @@
#include <sys/sysctl.h>
#endif
@ -11,7 +11,7 @@
#if BUILDFLAG(IS_FREEBSD)
#include <sys/user.h>
#endif
@@ -99,33 +103,52 @@ bool BeingDebugged() {
@@ -100,33 +104,52 @@ bool BeingDebugged() {
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.

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

@ -1,4 +1,4 @@
--- base/files/drive_info.h.orig 2025-02-19 07:43:18 UTC
--- base/files/drive_info.h.orig 2025-05-28 14:55:43 UTC
+++ base/files/drive_info.h
@@ -48,7 +48,7 @@ struct BASE_EXPORT DriveInfo {
std::optional<bool> has_seek_penalty;
@ -6,6 +6,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Whether the drive is a removable drive.
// Whether the drive is a "removable" drive.
//
// Note on macOS: that SSDs that are connected over USB that you can eject
// In macOS's IOKit API, a drive is "removable" if "the media is removable

11
www/chromium/files/patch-base_memory_platform__shared__memory__region.h
View file

@ -1,4 +1,4 @@
--- base/memory/platform_shared_memory_region.h.orig 2025-01-15 09:18:26 UTC
--- base/memory/platform_shared_memory_region.h.orig 2025-05-28 14:55:43 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -18,7 +18,7 @@
#include "base/unguessable_token.h"
@ -27,3 +27,12 @@
,
bool executable = false
#endif
@@ -236,7 +236,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
#if BUILDFLAG(IS_FUCHSIA)
kNotVmo,
#endif
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
kFcntlFailed,
kReadOnlyFdNotReadOnly,
kUnexpectedReadOnlyFd,

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

@ -1,6 +1,6 @@
--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-03-05 08:14:56 UTC
--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-05-28 14:55:43 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) {
@@ -61,7 +61,7 @@ std::optional<FDAccessModeError> CheckFDAccessMode(int
} // namespace
@ -9,7 +9,7 @@
// static
ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
PlatformSharedMemoryRegion region =
@@ -175,7 +175,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() {
@@ -183,7 +183,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() {
// static
PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
size_t size
@ -18,7 +18,7 @@
,
bool executable
#endif
@@ -204,7 +204,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
@@ -212,7 +212,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
// flag.
FilePath directory;
if (!GetShmemTempDir(

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

@ -1,6 +1,6 @@
--- base/process/launch.h.orig 2024-11-14 07:57:23 UTC
--- base/process/launch.h.orig 2025-05-28 14:55:43 UTC
+++ base/process/launch.h
@@ -241,7 +241,7 @@ struct BASE_EXPORT LaunchOptions {
@@ -245,7 +245,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)

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

@ -1,6 +1,6 @@
--- base/strings/safe_sprintf_unittest.cc.orig 2025-03-05 08:14:56 UTC
--- base/strings/safe_sprintf_unittest.cc.orig 2025-05-28 14:55:43 UTC
+++ base/strings/safe_sprintf_unittest.cc
@@ -743,6 +743,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
@@ -746,6 +746,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
#endif
}
@ -8,7 +8,7 @@
TEST(SafeSPrintfTest, EmitNULL) {
char buf[40];
#if defined(__GNUC__)
@@ -759,6 +760,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
@@ -762,6 +763,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
#pragma GCC diagnostic pop
#endif
}

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

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2025-05-07 13:11:00 UTC
--- build/config/compiler/BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ build/config/compiler/BUILD.gn
@@ -197,7 +197,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
@ -27,7 +27,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -508,6 +511,10 @@ config("compiler") {
@@ -509,6 +512,10 @@ config("compiler") {
}
}
@ -38,7 +38,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_icf && (!is_apple || use_lld)) {
@@ -567,7 +574,7 @@ config("compiler") {
@@ -569,7 +576,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -47,7 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -56,7 +56,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
@@ -1242,7 +1249,7 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
@ -65,7 +65,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
@@ -1561,7 +1568,7 @@ config("compiler_deterministic") {
@@ -1576,7 +1583,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.
@ -74,16 +74,16 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1619,7 +1626,7 @@ config("compiler_deterministic") {
@@ -1634,7 +1641,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",
@@ -1652,7 +1659,7 @@ config("clang_revision") {
_perform_consistency_checks = current_toolchain == default_toolchain
if (llvm_force_head_revision) {
@@ -1719,7 +1726,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
@ -92,7 +92,7 @@
!llvm_android_mainline && is_clang &&
clang_warning_suppression_file != "") {
from_build_root =
@@ -1985,9 +1992,6 @@ config("default_warnings") {
@@ -2053,9 +2060,6 @@ config("default_warnings") {
# TODO(crbug.com/40284799): Fix and re-enable.
"-Wno-thread-safety-reference-return",
@ -102,7 +102,7 @@
]
cflags_cc += [
@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") {
@@ -2837,7 +2841,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") {
@ -111,7 +111,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2803,7 +2807,7 @@ config("afdo") {
@@ -2864,7 +2868,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -120,7 +120,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2980,7 +2984,7 @@ config("symbols") {
@@ -3041,7 +3045,7 @@ config("symbols") {
cflags += [ "-gomit-unreferenced-methods" ]
}

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

@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2025-05-05 10:57:53 UTC
--- build/config/rust.gni.orig 2025-05-28 14:55:43 UTC
+++ build/config/rust.gni
@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) {
@@ -361,6 +361,10 @@ if (is_linux || is_chromeos) {
}
}

109
www/chromium/files/patch-build_rust_allocator_BUILD.gn
View file

@ -1,109 +0,0 @@
--- build/rust/allocator/BUILD.gn.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/BUILD.gn
@@ -0,0 +1,106 @@
+# Copyright 2025 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/buildflag_header.gni")
+import("//build/config/rust.gni")
+import("//build/rust/rust_static_library.gni")
+
+rust_allocator_uses_partition_alloc = false
+if (build_with_chromium) {
+ import("//base/allocator/partition_allocator/partition_alloc.gni")
+ rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
+}
+
+# In ASAN builds, PartitionAlloc-Everywhere is disabled, meaning malloc() and
+# friends in C++ do not go to PartitionAlloc. So we also don't point the Rust
+# allocation functions at PartitionAlloc. Generally, this means we just direct
+# them to the Standard Library's allocator.
+#
+# However, on Windows the Standard Library uses HeapAlloc() and Windows ASAN
+# does *not* hook that method, so ASAN does not get to hear about allocations
+# made in Rust. To resolve this, we redirect allocation to _aligned_malloc
+# which Windows ASAN *does* hook.
+#
+# Note that there is a runtime option to make ASAN hook HeapAlloc() but
+# enabling it breaks Win32 APIs like CreateProcess:
+# https://crbug.com/368070343#comment29
+rust_allocator_uses_aligned_malloc = false
+if (!rust_allocator_uses_partition_alloc && is_win && is_asan) {
+ rust_allocator_uses_aligned_malloc = true
+}
+
+rust_allocator_uses_allocator_impls_h =
+ rust_allocator_uses_partition_alloc || rust_allocator_uses_aligned_malloc
+
+buildflag_header("buildflags") {
+ header = "buildflags.h"
+ flags = [
+ "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
+ "RUST_ALLOCATOR_USES_ALIGNED_MALLOC=$rust_allocator_uses_aligned_malloc",
+ ]
+ visibility = [ ":*" ]
+}
+
+if (toolchain_has_rust) {
+ # All targets which depend on Rust code but are not linked by rustc must
+ # depend on this. Usually, this dependency will come from the rust_target() GN
+ # template. However, cargo_crate() does *not* include this dependency so any
+ # C++ targets which directly depend on a cargo_crate() must depend on this.
+ rust_static_library("allocator") {
+ sources = [ "lib.rs" ]
+ crate_root = "lib.rs"
+ cxx_bindings = [ "lib.rs" ]
+
+ deps = [ ":alloc_error_handler_impl" ]
+ if (rust_allocator_uses_allocator_impls_h) {
+ deps += [ ":allocator_impls" ]
+ }
+
+ no_chromium_prelude = true
+ no_allocator_crate = true
+ allow_unsafe = true
+
+ rustflags = []
+ if (rust_allocator_uses_allocator_impls_h) {
+ rustflags += [ "--cfg=rust_allocator_uses_allocator_impls_h" ]
+ cxx_bindings += [ "allocator_impls_ffi.rs" ]
+ sources += [ "allocator_impls_ffi.rs" ]
+ }
+
+ # TODO(https://crbug.com/410596442): Stop using unstable features here.
+ configs -= [ "//build/config/compiler:disallow_unstable_features" ]
+ }
+
+ if (rust_allocator_uses_allocator_impls_h) {
+ static_library("allocator_impls") {
+ public_deps = []
+ if (rust_allocator_uses_partition_alloc) {
+ public_deps +=
+ [ "//base/allocator/partition_allocator:partition_alloc" ]
+ }
+
+ sources = [
+ "allocator_impls.cc",
+ "allocator_impls.h",
+ ]
+ deps = [ ":buildflags" ]
+ visibility = [ ":*" ]
+ }
+ }
+
+ static_library("alloc_error_handler_impl") {
+ sources = [
+ # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
+ # copied from `//base`.
+ # TODO(crbug.com/40279749): Avoid duplication / reuse code.
+ "alias.cc",
+ "alias.h",
+ "alloc_error_handler_impl.cc",
+ "alloc_error_handler_impl.h",
+ "compiler_specific.h",
+ "immediate_crash.h",
+ ]
+ visibility = [ ":*" ]
+ }
+}

12
www/chromium/files/patch-build_rust_allocator_DEPS
View file

@ -1,12 +0,0 @@
--- build/rust/allocator/DEPS.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/DEPS
@@ -0,0 +1,9 @@
+include_rules = [
+ "-base",
+]
+
+specific_include_rules = {
+ "allocator_impls.cc" : [
+ "+partition_alloc"
+ ]
+}

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

@ -1,25 +0,0 @@
--- build/rust/allocator/alias.cc.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/alias.cc
@@ -0,0 +1,22 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file has been copied from //base/debug/alias.cc ( additionally the APIs
+// were moved into the `build_rust_std` namespace).
+//
+// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
+
+#include "build/rust/allocator/alias.h"
+
+#include "build/rust/allocator/compiler_specific.h"
+
+namespace build_rust_std {
+namespace debug {
+
+// This file/function should be excluded from LTO/LTCG to ensure that the
+// compiler can't see this function's implementation when compiling calls to it.
+NOINLINE void Alias(const void* var) {}
+
+} // namespace debug
+} // namespace build_rust_std

40
www/chromium/files/patch-build_rust_allocator_alias.h
View file

@ -1,40 +0,0 @@
--- build/rust/allocator/alias.h.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/alias.h
@@ -0,0 +1,37 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file has been copied from //base/debug/alias.h (and then trimmed to just
+// the APIs / macros needed by //build/rust/std; additionally the APIs were
+// moved into the `build_rust_std` namespace).
+//
+// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
+
+#ifndef BUILD_RUST_ALLOCATOR_ALIAS_H_
+#define BUILD_RUST_ALLOCATOR_ALIAS_H_
+
+#include <stddef.h>
+
+namespace build_rust_std {
+namespace debug {
+
+// Make the optimizer think that |var| is aliased. This can be used to prevent a
+// local variable from being optimized out (which is something that
+// `NO_CODE_FOLDING` macro definition below depends on). See
+// //base/debug/alias.h for more details.
+void Alias(const void* var);
+
+} // namespace debug
+
+} // namespace build_rust_std
+
+// Prevent code folding (where a linker identifies functions that are
+// bit-identical and overlays them, which saves space but it leads to confusing
+// call stacks because multiple symbols are at the same address). See
+// //base/debug/alias.h for more details.
+#define NO_CODE_FOLDING() \
+ const int line_number = __LINE__; \
+ build_rust_std::debug::Alias(&line_number)
+
+#endif // BUILD_RUST_ALLOCATOR_ALIAS_H_

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

@ -1,20 +0,0 @@
--- build/rust/allocator/alloc_error_handler_impl.cc.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/alloc_error_handler_impl.cc
@@ -0,0 +1,17 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "build/rust/allocator/alloc_error_handler_impl.h"
+
+#include "build/rust/allocator/alias.h"
+#include "build/rust/allocator/immediate_crash.h"
+
+namespace rust_allocator_internal {
+
+void alloc_error_handler_impl() {
+ NO_CODE_FOLDING();
+ IMMEDIATE_CRASH();
+}
+
+} // namespace rust_allocator_internal

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

@ -1,24 +0,0 @@
--- build/rust/allocator/alloc_error_handler_impl.h.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/alloc_error_handler_impl.h
@@ -0,0 +1,21 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
+#define BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
+
+// This header exposes to Rust a C++ implementation of quickly crashing after an
+// allocation error. (The API below is called from `__rust_alloc_error_handler`
+// in `lib.rs`.)
+//
+// TODO(lukasza): Investigate if we can delete this `.h` / `.cc` and just call
+// `std::process::abort()` (or something else?) directly from `.rs`. The main
+// open question is how much we care about `NO_CODE_FOLDING`.
+namespace rust_allocator_internal {
+
+void alloc_error_handler_impl();
+
+} // namespace rust_allocator_internal
+
+#endif // BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_

108
www/chromium/files/patch-build_rust_allocator_allocator__impls.cc
View file

@ -1,108 +0,0 @@
--- build/rust/allocator/allocator_impls.cc.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/allocator_impls.cc
@@ -0,0 +1,105 @@
+// Copyright 2021 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "build/rust/allocator/allocator_impls.h"
+
+#ifdef UNSAFE_BUFFERS_BUILD
+// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
+#pragma allow_unsafe_libc_calls
+#endif
+
+#include <cstddef>
+#include <cstring>
+
+#include "build/build_config.h"
+#include "build/rust/allocator/buildflags.h"
+
+#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
+#include "partition_alloc/partition_alloc_constants.h" // nogncheck
+#include "partition_alloc/shim/allocator_shim.h" // nogncheck
+#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
+#include <cstdlib>
+#endif
+
+namespace rust_allocator_internal {
+
+unsigned char* alloc(size_t size, size_t align) {
+#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
+ // PartitionAlloc will crash if given an alignment larger than this.
+ if (align > partition_alloc::internal::kMaxSupportedAlignment) {
+ return nullptr;
+ }
+
+ // We use unchecked allocation paths in PartitionAlloc rather than going
+ // through its shims in `malloc()` etc so that we can support fallible
+ // allocation paths such as Vec::try_reserve without crashing on allocation
+ // failure.
+ if (align <= alignof(std::max_align_t)) {
+ return static_cast<unsigned char*>(allocator_shim::UncheckedAlloc(size));
+ } else {
+ return static_cast<unsigned char*>(
+ allocator_shim::UncheckedAlignedAlloc(size, align));
+ }
+#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
+ return static_cast<unsigned char*>(_aligned_malloc(size, align));
+#else
+#error This configuration is not supported.
+#endif
+}
+
+void dealloc(unsigned char* p, size_t size, size_t align) {
+#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
+ if (align <= alignof(std::max_align_t)) {
+ allocator_shim::UncheckedFree(p);
+ } else {
+ allocator_shim::UncheckedAlignedFree(p);
+ }
+#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
+ return _aligned_free(p);
+#else
+#error This configuration is not supported.
+#endif
+}
+
+unsigned char* realloc(unsigned char* p,
+ size_t old_size,
+ size_t align,
+ size_t new_size) {
+#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
+ // We use unchecked allocation paths in PartitionAlloc rather than going
+ // through its shims in `malloc()` etc so that we can support fallible
+ // allocation paths such as Vec::try_reserve without crashing on allocation
+ // failure.
+ if (align <= alignof(std::max_align_t)) {
+ return static_cast<unsigned char*>(
+ allocator_shim::UncheckedRealloc(p, new_size));
+ } else {
+ return static_cast<unsigned char*>(
+ allocator_shim::UncheckedAlignedRealloc(p, new_size, align));
+ }
+#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
+ return static_cast<unsigned char*>(_aligned_realloc(p, new_size, align));
+#else
+#error This configuration is not supported.
+#endif
+}
+
+unsigned char* alloc_zeroed(size_t size, size_t align) {
+#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC) || \
+ BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
+ // TODO(danakj): When RUST_ALLOCATOR_USES_PARTITION_ALLOC is true, it's
+ // possible that a partition_alloc::UncheckedAllocZeroed() call would perform
+ // better than partition_alloc::UncheckedAlloc() + memset. But there is no
+ // such API today. See b/342251590.
+ unsigned char* p = alloc(size, align);
+ if (p) {
+ memset(p, 0, size);
+ }
+ return p;
+#else
+#error This configuration is not supported.
+#endif
+}
+
+} // namespace rust_allocator_internal

27
www/chromium/files/patch-build_rust_allocator_allocator__impls.h
View file

@ -1,27 +0,0 @@
--- build/rust/allocator/allocator_impls.h.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/allocator_impls.h
@@ -0,0 +1,24 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
+#define BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
+
+#include <cstddef>
+
+// This header exposes a C++ allocator (e.g. PartitionAlloc) to Rust.
+// The APIs below are called from `impl GlobalAlloc` in `lib.rs`.
+namespace rust_allocator_internal {
+
+unsigned char* alloc(size_t size, size_t align);
+void dealloc(unsigned char* p, size_t size, size_t align);
+unsigned char* realloc(unsigned char* p,
+ size_t old_size,
+ size_t align,
+ size_t new_size);
+unsigned char* alloc_zeroed(size_t size, size_t align);
+
+} // namespace rust_allocator_internal
+
+#endif // BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_

22
www/chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
View file

@ -1,22 +0,0 @@
--- build/rust/allocator/allocator_impls_ffi.rs.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/allocator_impls_ffi.rs
@@ -0,0 +1,19 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+//! FFI for `allocator_impls.h` is in a separate `.rs` file/module to
+//! better support conditional compilation (these functions are only
+//! used under `#[cfg(rust_allocator_uses_allocator_impls_h)]`.
+
+#[cxx::bridge(namespace = "rust_allocator_internal")]
+pub mod ffi {
+ extern "C++" {
+ include!("build/rust/allocator/allocator_impls.h");
+
+ unsafe fn alloc(size: usize, align: usize) -> *mut u8;
+ unsafe fn dealloc(p: *mut u8, size: usize, align: usize);
+ unsafe fn realloc(p: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
+ unsafe fn alloc_zeroed(size: usize, align: usize) -> *mut u8;
+ }
+}

41
www/chromium/files/patch-build_rust_allocator_compiler__specific.h
View file

@ -1,41 +0,0 @@
--- build/rust/allocator/compiler_specific.h.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/compiler_specific.h
@@ -0,0 +1,38 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file has been copied from //base/compiler_specific.h (and then
+// significantly trimmed to just the APIs / macros needed by //build/rust/std).
+//
+// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
+
+#ifndef BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
+#define BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
+
+#include "build/build_config.h"
+
+#if defined(COMPILER_MSVC) && !defined(__clang__)
+#error "Only clang-cl is supported on Windows, see https://crbug.com/988071"
+#endif
+
+#if defined(__has_attribute)
+#define HAS_ATTRIBUTE(x) __has_attribute(x)
+#else
+#define HAS_ATTRIBUTE(x) 0
+#endif
+
+// Annotate a function indicating it should not be inlined.
+// Use like:
+// NOINLINE void DoStuff() { ... }
+#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
+#define NOINLINE [[clang::noinline]]
+#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
+#define NOINLINE __attribute__((noinline))
+#elif defined(COMPILER_MSVC)
+#define NOINLINE __declspec(noinline)
+#else
+#define NOINLINE
+#endif
+
+#endif // BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_

174
www/chromium/files/patch-build_rust_allocator_immediate__crash.h
View file

@ -1,174 +0,0 @@
--- build/rust/allocator/immediate_crash.h.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/immediate_crash.h
@@ -0,0 +1,171 @@
+// Copyright 2021 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file has been copied from //base/immediate_crash.h.
+// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
+
+#ifndef BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
+#define BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
+
+#include "build/build_config.h"
+
+// Crashes in the fastest possible way with no attempt at logging.
+// There are several constraints; see http://crbug.com/664209 for more context.
+//
+// - TRAP_SEQUENCE_() must be fatal. It should not be possible to ignore the
+// resulting exception or simply hit 'continue' to skip over it in a debugger.
+// - Different instances of TRAP_SEQUENCE_() must not be folded together, to
+// ensure crash reports are debuggable. Unlike __builtin_trap(), asm volatile
+// blocks will not be folded together.
+// Note: TRAP_SEQUENCE_() previously required an instruction with a unique
+// nonce since unlike clang, GCC folds together identical asm volatile
+// blocks.
+// - TRAP_SEQUENCE_() must produce a signal that is distinct from an invalid
+// memory access.
+// - TRAP_SEQUENCE_() must be treated as a set of noreturn instructions.
+// __builtin_unreachable() is used to provide that hint here. clang also uses
+// this as a heuristic to pack the instructions in the function epilogue to
+// improve code density.
+//
+// Additional properties that are nice to have:
+// - TRAP_SEQUENCE_() should be as compact as possible.
+// - The first instruction of TRAP_SEQUENCE_() should not change, to avoid
+// shifting crash reporting clusters. As a consequence of this, explicit
+// assembly is preferred over intrinsics.
+// Note: this last bullet point may no longer be true, and may be removed in
+// the future.
+
+// Note: TRAP_SEQUENCE Is currently split into two macro helpers due to the fact
+// that clang emits an actual instruction for __builtin_unreachable() on certain
+// platforms (see https://crbug.com/958675). In addition, the int3/bkpt/brk will
+// be removed in followups, so splitting it up like this now makes it easy to
+// land the followups.
+
+#if defined(COMPILER_GCC)
+
+#if BUILDFLAG(IS_NACL)
+
+// Crash report accuracy is not guaranteed on NaCl.
+#define TRAP_SEQUENCE1_() __builtin_trap()
+#define TRAP_SEQUENCE2_() asm volatile("")
+
+#elif defined(ARCH_CPU_X86_FAMILY)
+
+// TODO(crbug.com/40625592): In theory, it should be possible to use just
+// int3. However, there are a number of crashes with SIGILL as the exception
+// code, so it seems likely that there's a signal handler that allows execution
+// to continue after SIGTRAP.
+#define TRAP_SEQUENCE1_() asm volatile("int3")
+
+#if BUILDFLAG(IS_APPLE)
+// Intentionally empty: __builtin_unreachable() is always part of the sequence
+// (see IMMEDIATE_CRASH below) and already emits a ud2 on Mac.
+#define TRAP_SEQUENCE2_() asm volatile("")
+#else
+#define TRAP_SEQUENCE2_() asm volatile("ud2")
+#endif // BUILDFLAG(IS_APPLE)
+
+#elif defined(ARCH_CPU_ARMEL)
+
+// bkpt will generate a SIGBUS when running on armv7 and a SIGTRAP when running
+// as a 32 bit userspace app on arm64. There doesn't seem to be any way to
+// cause a SIGTRAP from userspace without using a syscall (which would be a
+// problem for sandboxing).
+// TODO(crbug.com/40625592): Remove bkpt from this sequence.
+#define TRAP_SEQUENCE1_() asm volatile("bkpt #0")
+#define TRAP_SEQUENCE2_() asm volatile("udf #0")
+
+#elif defined(ARCH_CPU_ARM64)
+
+// This will always generate a SIGTRAP on arm64.
+// TODO(crbug.com/40625592): Remove brk from this sequence.
+#define TRAP_SEQUENCE1_() asm volatile("brk #0")
+#define TRAP_SEQUENCE2_() asm volatile("hlt #0")
+
+#else
+
+// Crash report accuracy will not be guaranteed on other architectures, but at
+// least this will crash as expected.
+#define TRAP_SEQUENCE1_() __builtin_trap()
+#define TRAP_SEQUENCE2_() asm volatile("")
+
+#endif // ARCH_CPU_*
+
+#elif defined(COMPILER_MSVC)
+
+#if !defined(__clang__)
+
+// MSVC x64 doesn't support inline asm, so use the MSVC intrinsic.
+#define TRAP_SEQUENCE1_() __debugbreak()
+#define TRAP_SEQUENCE2_()
+
+#elif defined(ARCH_CPU_ARM64)
+
+// Windows ARM64 uses "BRK #F000" as its breakpoint instruction, and
+// __debugbreak() generates that in both VC++ and clang.
+#define TRAP_SEQUENCE1_() __debugbreak()
+// Intentionally empty: __builtin_unreachable() is always part of the sequence
+// (see IMMEDIATE_CRASH below) and already emits a ud2 on Win64,
+// https://crbug.com/958373
+#define TRAP_SEQUENCE2_() __asm volatile("")
+
+#else
+
+#define TRAP_SEQUENCE1_() asm volatile("int3")
+#define TRAP_SEQUENCE2_() asm volatile("ud2")
+
+#endif // __clang__
+
+#else
+
+#error No supported trap sequence!
+
+#endif // COMPILER_GCC
+
+#define TRAP_SEQUENCE_() \
+ do { \
+ TRAP_SEQUENCE1_(); \
+ TRAP_SEQUENCE2_(); \
+ } while (false)
+
+// CHECK() and the trap sequence can be invoked from a constexpr function.
+// This could make compilation fail on GCC, as it forbids directly using inline
+// asm inside a constexpr function. However, it allows calling a lambda
+// expression including the same asm.
+// The side effect is that the top of the stacktrace will not point to the
+// calling function, but to this anonymous lambda. This is still useful as the
+// full name of the lambda will typically include the name of the function that
+// calls CHECK() and the debugger will still break at the right line of code.
+#if !defined(COMPILER_GCC) || defined(__clang__)
+
+#define WRAPPED_TRAP_SEQUENCE_() TRAP_SEQUENCE_()
+
+#else
+
+#define WRAPPED_TRAP_SEQUENCE_() \
+ do { \
+ [] { TRAP_SEQUENCE_(); }(); \
+ } while (false)
+
+#endif // !defined(COMPILER_GCC) || defined(__clang__)
+
+#if defined(__clang__) || defined(COMPILER_GCC)
+
+// __builtin_unreachable() hints to the compiler that this is noreturn and can
+// be packed in the function epilogue.
+#define IMMEDIATE_CRASH() \
+ ({ \
+ WRAPPED_TRAP_SEQUENCE_(); \
+ __builtin_unreachable(); \
+ })
+
+#else
+
+// This is supporting non-chromium user of logging.h to build with MSVC, like
+// pdfium. On MSVC there is no __builtin_unreachable().
+#define IMMEDIATE_CRASH() WRAPPED_TRAP_SEQUENCE_()
+
+#endif // defined(__clang__) || defined(COMPILER_GCC)
+
+#endif // BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_

122
www/chromium/files/patch-build_rust_allocator_lib.rs
View file

@ -1,122 +0,0 @@
--- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
+++ build/rust/allocator/lib.rs
@@ -0,0 +1,119 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+//! Define the allocator that Rust code in Chrome should use.
+//!
+//! Any final artifact that depends on this crate, even transitively, will use
+//! the allocator defined here.
+//!
+//! List of known issues:
+//!
+//! 1. We'd like to use PartitionAlloc on Windows, but the stdlib uses Windows
+//! heap functions directly that PartitionAlloc can not intercept.
+//! 2. We'd like `Vec::try_reserve` to fail at runtime on Linux instead of
+//! crashing in malloc() where PartitionAlloc replaces that function.
+
+// Required to apply weak linkage to symbols.
+//
+// TODO(https://crbug.com/410596442): Stop using unstable features here.
+// https://github.com/rust-lang/rust/issues/29603 tracks stabilization of the `linkage` feature.
+#![feature(linkage)]
+// Required to apply `#[rustc_std_internal_symbol]` to our alloc error handler
+// so the name is correctly mangled as rustc expects.
+//
+// TODO(https://crbug.com/410596442): Stop using internal features here.
+#![allow(internal_features)]
+#![feature(rustc_attrs)]
+
+// This module is in a separate source file to avoid having to teach `cxxbridge`
+// about conditional compilation.
+#[cfg(rust_allocator_uses_allocator_impls_h)]
+mod allocator_impls_ffi;
+
+/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
+/// using an allocator from C++.
+#[cfg(rust_allocator_uses_allocator_impls_h)]
+mod cpp_allocator {
+ use super::allocator_impls_ffi::ffi;
+ use std::alloc::{GlobalAlloc, Layout};
+
+ struct Allocator;
+
+ unsafe impl GlobalAlloc for Allocator {
+ unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+ unsafe { ffi::alloc(layout.size(), layout.align()) }
+ }
+
+ unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+ unsafe {
+ ffi::dealloc(ptr, layout.size(), layout.align());
+ }
+ }
+
+ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+ unsafe { ffi::alloc_zeroed(layout.size(), layout.align()) }
+ }
+
+ unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
+ unsafe { ffi::realloc(ptr, layout.size(), layout.align(), new_size) }
+ }
+ }
+
+ #[global_allocator]
+ static GLOBAL: Allocator = Allocator;
+}
+
+/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
+/// using the default Rust allocator.
+#[cfg(not(rust_allocator_uses_allocator_impls_h))]
+mod rust_allocator {
+ #[global_allocator]
+ static GLOBAL: std::alloc::System = std::alloc::System;
+}
+
+/// Module that provides global symbols that are needed both by `cpp_allocator`
+/// and `rust_allocator`.
+///
+/// When `rustc` drives linking, then it will define the symbols below. But
+/// Chromium only uses `rustc` to link Rust-only executables (e.g. `build.rs`
+/// scripts) and otherwise uses a non-Rust linker. This is why we have to
+/// manually define a few symbols below. We define those symbols
+/// as "weak" symbols, so that Rust-provided symbols "win" in case where Rust
+/// actually does drive the linking. This hack works (not only for Chromium,
+/// but also for google3 and other projects), but isn't officially supported by
+/// `rustc`.
+///
+/// TODO(https://crbug.com/410596442): Stop using internal features here.
+mod both_allocators {
+ /// As part of rustc's contract for using `#[global_allocator]` without
+ /// rustc-generated shims we must define this symbol, since we are opting in
+ /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
+ #[no_mangle]
+ #[linkage = "weak"]
+ static __rust_no_alloc_shim_is_unstable: u8 = 0;
+
+ // Mangle the symbol name as rustc expects.
+ #[rustc_std_internal_symbol]
+ #[allow(non_upper_case_globals)]
+ #[linkage = "weak"]
+ static __rust_alloc_error_handler_should_panic: u8 = 0;
+
+ // Mangle the symbol name as rustc expects.
+ #[rustc_std_internal_symbol]
+ #[allow(non_upper_case_globals)]
+ #[linkage = "weak"]
+ fn __rust_alloc_error_handler(_size: usize, _align: usize) {
+ // TODO(lukasza): Investigate if we can just call `std::process::abort()` here.
+ // (Not really _needed_, but it could simplify code a little bit.)
+ unsafe { ffi::alloc_error_handler_impl() }
+ }
+
+ #[cxx::bridge(namespace = "rust_allocator_internal")]
+ mod ffi {
+ extern "C++" {
+ include!("build/rust/allocator/alloc_error_handler_impl.h");
+ unsafe fn alloc_error_handler_impl();
+ }
+ }
+}

25
www/chromium/files/patch-build_rust_cargo__crate.gni
View file

@ -1,25 +0,0 @@
--- build/rust/cargo_crate.gni.orig 2025-05-20 09:16:26 UTC
+++ build/rust/cargo_crate.gni
@@ -259,6 +259,12 @@ template("cargo_crate") {
# Don't import the `chromium` crate into third-party code.
no_chromium_prelude = true
+ # Don't depend on the chrome-specific #[global_allocator] crate from
+ # third-party code. This avoids some dependency cycle issues. The allocator
+ # crate will still be used if it exists anywhere in the dependency graph for
+ # a given linked artifact.
+ no_allocator_crate = true
+
rustc_metadata = _rustc_metadata
# TODO(crbug.com/40259764): don't default to true. This requires changes to
@@ -482,6 +488,9 @@ template("cargo_crate") {
# Don't import the `chromium` crate into third-party code.
no_chromium_prelude = true
+
+ # Build scripts do not need to link to chrome's allocator.
+ no_allocator_crate = true
# The ${_build_script_name}_output target looks for the exe in this
# location. Due to how the Windows component build works, this has to

12
www/chromium/files/patch-build_rust_rust__macro.gni
View file

@ -1,12 +0,0 @@
--- build/rust/rust_macro.gni.orig 2025-05-20 09:16:26 UTC
+++ build/rust/rust_macro.gni
@@ -16,6 +16,9 @@ template("rust_macro") {
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
proc_macro_configs = invoker.configs
target_type = "rust_proc_macro"
+
+ # Macros are loaded by rustc and shouldn't use chrome's allocation routines.
+ no_allocator_crate = true
}
}

13
www/chromium/files/patch-build_rust_rust__target.gni
View file

@ -1,13 +0,0 @@
--- build/rust/rust_target.gni.orig 2025-05-20 09:16:26 UTC
+++ build/rust/rust_target.gni
@@ -339,6 +339,10 @@ template("rust_target") {
_rust_deps += [ "//build/rust/std" ]
}
+ if (!defined(invoker.no_allocator_crate) || !invoker.no_allocator_crate) {
+ _rust_deps += [ "//build/rust/allocator" ]
+ }
+
if (_build_unit_tests) {
_unit_test_target = "${_target_name}_unittests"
if (defined(invoker.unit_test_target)) {

80
www/chromium/files/patch-build_rust_std_BUILD.gn
View file

@ -1,58 +1,6 @@
--- build/rust/std/BUILD.gn.orig 2025-05-20 09:16:26 UTC
--- build/rust/std/BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ build/rust/std/BUILD.gn
@@ -15,51 +15,12 @@
# allocator functions to PartitionAlloc when `use_partition_alloc_as_malloc` is
# true, so that Rust and C++ use the same allocator backend.
-import("//build/buildflag_header.gni")
import("//build/config/compiler/compiler.gni")
import("//build/config/coverage/coverage.gni")
import("//build/config/rust.gni")
import("//build/config/sanitizers/sanitizers.gni")
-rust_allocator_uses_partition_alloc = false
-if (build_with_chromium) {
- import("//base/allocator/partition_allocator/partition_alloc.gni")
- rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
-}
-
-buildflag_header("buildflags") {
- header = "buildflags.h"
- flags = [
- "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
- ]
- visibility = [ ":*" ]
-}
-
if (toolchain_has_rust) {
- # If clang performs the link step, we need to provide the allocator symbols
- # that are normally injected by rustc during linking.
- #
- # We also "happen to" use this to redirect allocations to PartitionAlloc,
- # though that would be better done through a #[global_allocator] crate (see
- # above).
- source_set("remap_alloc") {
- public_deps = []
- if (rust_allocator_uses_partition_alloc) {
- public_deps += [ "//base/allocator/partition_allocator:partition_alloc" ]
- }
- deps = [ ":buildflags" ]
- sources = [
- # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
- # copied from `//base`.
- # TODO(crbug.com/40279749): Avoid duplication / reuse code.
- "alias.cc",
- "alias.h",
- "compiler_specific.h",
- "immediate_crash.h",
- "remap_alloc.cc",
- ]
- }
-
# List of Rust stdlib rlibs which are present in the official Rust toolchain
# we are using from the Android team. This is usually a version or two behind
# nightly. Generally this matches the toolchain we build ourselves, but if
@@ -89,13 +50,20 @@ if (toolchain_has_rust) {
@@ -50,13 +50,20 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
@ -74,7 +22,7 @@
}
if (toolchain_for_rust_host_build_tools) {
@@ -115,7 +83,6 @@ if (toolchain_has_rust) {
@@ -76,7 +83,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
@ -82,25 +30,3 @@
"rustc_std_workspace_alloc",
"rustc_std_workspace_core",
"rustc_std_workspace_std",
@@ -269,8 +236,6 @@ if (toolchain_has_rust) {
foreach(libname, stdlib_files + skip_stdlib_files) {
deps += [ "rules:$libname" ]
}
-
- public_deps = [ ":remap_alloc" ]
}
} else {
action("find_stdlib") {
@@ -396,12 +361,6 @@ if (toolchain_has_rust) {
":stdlib_public_dependent_libs",
]
deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
-
- # The host builds tools toolchain supports Rust only and does not use
- # the allocator remapping to point it to PartitionAlloc.
- if (!toolchain_for_rust_host_build_tools) {
- deps += [ ":remap_alloc" ]
- }
}
}
}

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

@ -1,6 +1,6 @@
--- cc/base/features.cc.orig 2025-05-05 10:57:53 UTC
--- cc/base/features.cc.orig 2025-05-28 14:55:43 UTC
+++ cc/base/features.cc
@@ -48,7 +48,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
@@ -52,7 +52,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
// be using a separate flag to control the launch on GL.
BASE_FEATURE(kUseDMSAAForTiles,
"UseDMSAAForTiles",

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

@ -1,4 +1,4 @@
--- chrome/app/chrome_main_delegate.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -147,7 +147,7 @@
#include "components/webui/about/credit_utils.h"
@ -75,7 +75,7 @@
// 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&
@@ -669,7 +669,7 @@ void RecordMainStartupMetrics(const StartupTimestamps&
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -84,7 +84,7 @@
// 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<int> ChromeMainDelegate::PostEarlyInitia
@@ -828,7 +828,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
#if BUILDFLAG(IS_OZONE)
// Initialize Ozone platform and add required feature flags as per platform's
// properties.

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

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/BUILD.gn
@@ -6866,6 +6866,13 @@ static_library("browser") {
@@ -6911,6 +6911,13 @@ static_library("browser") {
[ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
}

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

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/about_flags.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/about_flags.cc
@@ -260,7 +260,7 @@
@@ -262,7 +262,7 @@
#include "extensions/common/extension_features.h"
#endif
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -349,7 +349,7 @@
@@ -352,7 +352,7 @@
#include "device/vr/public/cpp/switches.h"
#endif
@ -18,7 +18,7 @@
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -359,7 +359,7 @@
@@ -362,7 +362,7 @@
#include "chrome/browser/win/mica_titlebar.h"
#endif
@ -27,7 +27,7 @@
#include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#include "chrome/browser/enterprise/webstore/features.h"
@@ -371,7 +371,7 @@
@@ -374,7 +374,7 @@
#include "components/user_education/common/user_education_features.h" // nogncheck
#endif
@ -36,7 +36,7 @@
#include "chrome/browser/ui/ui_features.h"
#include "ui/base/ui_base_features.h"
#endif
@@ -423,7 +423,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = {
@@ -426,7 +426,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = {
#endif // USE_AURA
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -45,7 +45,7 @@
const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = {
{"LocalNetworkAccessChecksWarn", "false"}};
@@ -539,7 +539,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -542,7 +542,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -54,7 +54,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -852,6 +852,26 @@ const FeatureEntry::FeatureVariation
@@ -899,6 +899,26 @@ const FeatureEntry::FeatureVariation
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
nullptr}};
@ -81,7 +81,7 @@
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
{"UIClipboardMaximumAge", "60"}};
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
@@ -1227,7 +1247,7 @@ constexpr FeatureEntry::FeatureVariation
@@ -1274,7 +1294,7 @@ constexpr FeatureEntry::FeatureVariation
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -90,7 +90,7 @@
const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
{"AtKeywordAcceleration", "true"},
};
@@ -1265,7 +1285,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
@@ -1312,7 +1332,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -99,7 +99,7 @@
// A limited number of combinations of the rich autocompletion params.
const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
@@ -3555,7 +3575,7 @@ const FeatureEntry::FeatureVariation
@@ -3720,7 +3740,7 @@ const FeatureEntry::FeatureVariation kAndroidThemeModu
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -108,7 +108,7 @@
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
{{"link_capturing_state", "on_by_default"}};
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
@@ -4059,7 +4079,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
@@ -4179,7 +4199,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
};
@ -117,7 +117,7 @@
const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
{"TranslationAPIAcceptLanguagesCheck", "false"},
{"TranslationAPILimitLanguagePackCount", "false"}};
@@ -4125,7 +4145,7 @@ const FeatureEntry::FeatureVariation
@@ -4245,7 +4265,7 @@ const FeatureEntry::FeatureVariation
1, nullptr},
};
@ -126,7 +126,7 @@
const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
{"BackoffTime", "0h"},
{"BackoffMultiplierBase", "0.0"},
@@ -4992,7 +5012,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5175,7 +5195,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_WIN)
@ -135,7 +135,7 @@
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -5279,7 +5299,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5467,7 +5487,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableIsolatedWebAppDevModeName,
flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
@ -144,7 +144,7 @@
{"enable-iwa-key-distribution-component",
flag_descriptions::kEnableIwaKeyDistributionComponentName,
flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
@@ -5500,7 +5520,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5689,7 +5709,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -153,7 +153,7 @@
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5541,6 +5561,16 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5730,6 +5750,16 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWaylandSessionManagementName,
flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
@ -170,16 +170,16 @@
#endif // BUILDFLAG(IS_LINUX)
#if BUILDFLAG(ENABLE_VR)
@@ -6427,7 +6457,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6629,7 +6659,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,
@@ -6697,7 +6727,7 @@ const FeatureEntry kFeatureEntries[] = {
{"omnibox-contextual-search-actions-at-top",
flag_descriptions::kOmniboxContextualSearchActionsAtTopName,
flag_descriptions::kOmniboxContextualSearchActionsAtTopDescription,
@@ -6933,7 +6963,7 @@ const FeatureEntry kFeatureEntries[] = {
kNumSrpZpsRelatedSearches,
"PowerTools")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -188,7 +188,7 @@
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
@@ -7189,7 +7219,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7421,7 +7451,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -197,7 +197,7 @@
{"cups-ipp-printing-backend",
flag_descriptions::kCupsIppPrintingBackendName,
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
@@ -7437,7 +7467,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7691,7 +7721,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
@ -206,7 +206,7 @@
{"wasm-tts-component-updater-enabled",
flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
@@ -8109,7 +8139,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8373,7 +8403,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
#endif // !BUILDFLAG(IS_CHROMEOS)
@ -215,7 +215,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -8774,7 +8804,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9037,7 +9067,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -224,7 +224,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
@@ -8799,7 +8829,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9062,7 +9092,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
@ -233,8 +233,8 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9275,7 +9305,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
@@ -9542,7 +9572,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_CHROMEOS)
@ -242,7 +242,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -9924,7 +9954,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10214,7 +10244,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@ -251,7 +251,7 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10048,7 +10078,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10338,7 +10368,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
#endif
@ -260,7 +260,7 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10077,7 +10107,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10367,7 +10397,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -269,7 +269,7 @@
{"enable-user-navigation-capturing-pwa",
flag_descriptions::kPwaNavigationCapturingName,
flag_descriptions::kPwaNavigationCapturingDescription,
@@ -10817,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11085,7 +11115,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCanvasHibernationDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
@ -278,7 +278,7 @@
{"enable-history-sync-optin",
flag_descriptions::kEnableHistorySyncOptinName,
flag_descriptions::kEnableHistorySyncOptinDescription,
@@ -10920,7 +10950,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11187,7 +11217,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
#endif // BUILDFLAG(IS_ANDROID)
@ -287,7 +287,7 @@
{"supervised-profile-safe-search",
flag_descriptions::kSupervisedProfileSafeSearchName,
flag_descriptions::kSupervisedProfileSafeSearchDescription,
@@ -11167,7 +11197,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11435,7 +11465,7 @@ const FeatureEntry kFeatureEntries[] = {
segmentation_platform::features::kSegmentationSurveyPage)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -296,7 +296,7 @@
{"autofill-enable-buy-now-pay-later",
flag_descriptions::kAutofillEnableBuyNowPayLaterName,
flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
@@ -11282,7 +11312,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11536,7 +11566,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
@ -305,7 +305,7 @@
{"translation-api", flag_descriptions::kTranslationAPIName,
flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
@@ -11319,7 +11349,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11573,7 +11603,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
password_manager::features::kPasswordFormClientsideClassifier)},
@ -314,7 +314,7 @@
{"contextual-cueing", flag_descriptions::kContextualCueingName,
flag_descriptions::kContextualCueingDescription,
kOsLinux | kOsMac | kOsWin,
@@ -11653,7 +11683,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11904,7 +11934,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
#endif // !BUILDFLAG(IS_ANDROID)
@ -323,7 +323,7 @@
{"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
@@ -11703,7 +11733,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11954,7 +11984,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -332,7 +332,7 @@
{"autofill-enable-amount-extraction-desktop",
flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
@@ -11723,7 +11753,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11974,7 +12004,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -341,7 +341,7 @@
{"autofill-enable-amount-extraction-allowlist-desktop",
flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
flag_descriptions::
@@ -11834,7 +11864,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12092,7 +12122,7 @@ const FeatureEntry kFeatureEntries[] = {
apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -350,7 +350,7 @@
{"chrome-web-store-navigation-throttle",
flag_descriptions::kChromeWebStoreNavigationThrottleName,
flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
@@ -11869,7 +11899,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12128,7 +12158,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -359,7 +359,7 @@
{"autofill-enable-amount-extraction-desktop-logging",
flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName,
flag_descriptions::
@@ -11899,7 +11929,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12151,7 +12181,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)},
@ -368,7 +368,7 @@
{"root-scrollbar-follows-browser-theme",
flag_descriptions::kRootScrollbarFollowsTheme,
flag_descriptions::kRootScrollbarFollowsThemeDescription,
@@ -11921,7 +11951,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -12180,7 +12210,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/background/glic/glic_status_icon.cc
@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
if (!status_icon_) {
@ -25,14 +25,14 @@
-#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<StatusIconMenuModel> GlicStatusIcon::C
menu->AddItem(
IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON,
l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON));
const bool is_visible = BrowserList::GetInstance()->empty();
const std::optional<size_t> index =
@@ -284,7 +284,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_SETTINGS,
l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_SETTINGS));
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
menu->AddSeparator(ui::NORMAL_SEPARATOR);
menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_EXIT,
l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_EXIT));
#endif

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/browser_process_impl.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -259,7 +259,7 @@
@@ -260,7 +260,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@ -9,7 +9,7 @@
#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 @@
@@ -272,7 +272,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif
@ -18,7 +18,7 @@
// How often to check if the persistent instance of Chrome needs to restart
// to install an update.
static const int kUpdateCheckIntervalHours = 6;
@@ -1145,7 +1145,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
@@ -1167,7 +1167,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
GoogleUpdateSettings::GetCollectStatsConsent());
registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
@ -27,7 +27,7 @@
os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
#endif
}
@@ -1413,7 +1413,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1435,7 +1435,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
local_state())));
#endif // BUILDFLAG(IS_WIN)
@ -36,7 +36,7 @@
base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
"basic") {
@@ -1682,7 +1682,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1719,7 +1719,7 @@ void BrowserProcessImpl::Unpin() {
}
// Mac is currently not supported.

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.h.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/browser_process_impl.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/browser_process_impl.h
@@ -408,7 +408,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -416,7 +416,7 @@ class BrowserProcessImpl : public BrowserProcess,
std::unique_ptr<BatteryMetrics> battery_metrics_;

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_field_trials.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/chrome_browser_field_trials.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_browser_field_trials.cc
@@ -37,7 +37,7 @@
@@ -38,7 +38,7 @@
#include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h"
#endif
@ -9,7 +9,7 @@
#include "base/nix/xdg_util.h"
#include "ui/base/ui_base_features.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -117,7 +117,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials
@@ -118,7 +118,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials
#endif // BUILDFLAG(IS_ANDROID)
}

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -77,7 +77,7 @@
@@ -81,7 +81,7 @@
#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/screen_ai/screen_ai_service_router.h"
#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
@@ -358,7 +358,7 @@ void BindMediaFoundationPreferences(
@@ -363,7 +363,7 @@ void BindMediaFoundationPreferences(
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -18,7 +18,7 @@
void BindScreenAIAnnotator(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) {
@@ -500,7 +500,7 @@ void PopulateChromeFrameBinders(
@@ -520,7 +520,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

26
www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_browser_interface_binders_webui.cc
@@ -47,7 +47,7 @@
@@ -48,20 +48,20 @@
#include "content/public/browser/web_ui_controller_interface_binder.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -8,17 +8,23 @@
+ 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"
@@ -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) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.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/signin/history_sync_optin/history_sync_optin.mojom.h"
@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -452,7 +452,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,7 +33,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -463,7 +463,7 @@ void PopulateChromeWebUIFrameBinders(
policy::DlpInternalsUI>(map);
#endif
@ -36,7 +42,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -593,14 +593,14 @@ void PopulateChromeWebUIFrameBinders(
HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
}
@ -53,12 +59,12 @@
WhatsNewUI,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
NewTabPageUI>(map);
@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1133,7 +1133,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)
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
DiscardsUI>(map);

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -149,7 +149,7 @@
@@ -150,7 +150,7 @@
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "sql/database.h"
#endif
@@ -175,11 +175,11 @@
@@ -176,11 +176,11 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif // BUILDFLAG(IS_CHROMEOS)
@ -23,7 +23,7 @@
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
@@ -190,7 +190,7 @@
@@ -191,7 +191,7 @@
#include "ui/gfx/switches.h"
#endif
@ -32,7 +32,7 @@
#include "chrome/browser/first_run/upgrade_util.h"
#endif
@@ -268,7 +268,7 @@
@@ -269,7 +269,7 @@
#include "chrome/browser/chrome_process_singleton.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
@ -41,7 +41,7 @@
#include "base/nix/xdg_util.h"
#endif
#endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON)
@@ -291,7 +291,7 @@
@@ -292,7 +292,7 @@
namespace {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
@ -50,7 +50,7 @@
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
@@ -442,7 +442,7 @@ void ProcessSingletonNotificationCallbackImpl(
@@ -443,7 +443,7 @@ void ProcessSingletonNotificationCallbackImpl(
}
#endif
@ -59,7 +59,7 @@
// Set the global activation token sent as a command line switch by another
// browser process. This also removes the switch after use to prevent any side
// effects of leaving it in the command line after this point.
@@ -1016,7 +1016,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1021,7 +1021,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -68,7 +68,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1061,7 +1061,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1066,7 +1066,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
#endif // BUILDFLAG(IS_MAC)
@ -77,7 +77,7 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1257,7 +1257,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1262,7 +1262,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
@ -86,7 +86,7 @@
// Delete the media history database if it still exists.
// TODO(crbug.com/40177301): Remove this.
base::ThreadPool::PostTask(
@@ -1305,7 +1305,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1310,7 +1310,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif
@ -95,7 +95,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1414,7 +1414,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1419,7 +1419,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
@ -104,7 +104,7 @@
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
@@ -1959,7 +1959,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -1964,7 +1964,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.

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

@ -1,11 +1,11 @@
--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-05-21 18:07:39 UTC
--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
@@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
@@ -60,7 +60,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
// static
void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto* const command_line = base::CommandLine::ForCurrentProcess();
auto env = base::Environment::Create();
std::string desktop_startup_id;
base::CommandLine* const command_line =
base::CommandLine::ForCurrentProcess();
std::unique_ptr<base::Environment> env = base::Environment::Create();

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

@ -1,4 +1,4 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -506,7 +506,7 @@
#include "components/user_manager/user_manager.h"
@ -9,7 +9,7 @@
#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)
@@ -622,11 +622,11 @@
@@ -621,11 +621,11 @@
#include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
#endif // !BUILDFLAG(IS_ANDROID)
@ -23,7 +23,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -637,7 +637,7 @@
@@ -636,7 +636,7 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
#endif
@ -32,16 +32,16 @@
#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"
@@ -646,7 +646,7 @@
@@ -647,7 +647,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"
#include "chrome/browser/enterprise/incognito/incognito_navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -655,7 +655,7 @@
@@ -657,7 +657,7 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
#endif
@ -50,7 +50,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1549,7 +1549,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache,
false);
#endif // BUILDFLAG(IS_CHROMEOS)
@ -59,7 +59,16 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1758,7 +1758,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1651,7 +1651,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
policy::policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, false);
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_LINUX)
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterListPref(prefs::kMandatoryExtensionsForIncognitoNavigation);
#endif
@@ -1775,7 +1775,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS)
main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>(
is_integration_test, &startup_data_);
@ -68,7 +77,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1787,7 +1787,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
// Construct additional browser parts. Stages are called in the order in
// which they are added.
#if defined(TOOLKIT_VIEWS)
@ -77,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1821,7 +1821,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>());
#endif
@ -86,7 +95,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1823,7 +1823,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1840,7 +1840,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -95,7 +104,7 @@
main_parts->AddParts(
std::make_unique<
enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
@@ -2744,7 +2744,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line,
int child_process_id) {
@ -105,7 +114,7 @@
#if BUILDFLAG(IS_MAC)
std::unique_ptr<metrics::ClientInfo> client_info =
GoogleUpdateSettings::LoadMetricsClientInfo();
@@ -2715,7 +2717,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2753,7 +2755,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
client_info->client_id);
}
#elif BUILDFLAG(IS_POSIX)
@ -114,7 +123,7 @@
pid_t pid;
if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
command_line->AppendSwitchASCII(
@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -3117,7 +3119,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
}
}
@ -123,7 +132,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4030,7 +4032,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr
@@ -4067,7 +4069,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr
return old_preferred_color_scheme != web_prefs->preferred_color_scheme;
}
@ -132,7 +141,7 @@
// 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
@@ -4697,7 +4699,7 @@ void ChromeContentBrowserClient::OverrideWebPreference
UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(),
web_contents, GetWebTheme());
@ -141,7 +150,7 @@
UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -4973,7 +4975,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -5017,7 +5019,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -150,7 +159,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5485,7 +5487,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5529,7 +5531,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -159,7 +168,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5502,7 +5504,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5553,7 +5555,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -168,7 +177,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5543,7 +5545,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5594,7 +5596,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -177,7 +186,16 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7496,7 +7498,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -5716,7 +5718,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
#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)
if (profile && profile->IsIncognitoProfile() && profile->IsOffTheRecord()) {
MaybeAddThrottle(enterprise_incognito::IncognitoNavigationThrottle::
MaybeCreateThrottleFor(handle),
@@ -7544,7 +7546,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -560,7 +560,7 @@ class ChromeContentBrowserClient : public content::Con
bool IsPluginAllowedToUseDevChannelAPIs(
content::BrowserContext* browser_context,
const GURL& url) override;

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

@ -1,6 +1,6 @@
--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Priority GetOnDema
@@ -77,7 +77,7 @@ bool IsOnDemandUpdateSupported() {
namespace component_updater {
@ -9,7 +9,7 @@
BASE_FEATURE(kIwaKeyDistributionComponent,
"IwaKeyDistributionComponent",
#if BUILDFLAG(IS_CHROMEOS)
@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
@@ -102,7 +102,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
// the main IWA feature.
#if BUILDFLAG(IS_WIN)
return base::FeatureList::IsEnabled(features::kIsolatedWebApps);

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

@ -1,15 +1,24 @@
--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc
@@ -8,7 +8,7 @@
#include "base/functional/callback.h"
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "content/public/browser/browser_thread.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/accessibility/embedded_a11y_extension_loader.h"
#include "chrome/common/extensions/extension_constants.h"
#include "components/crx_file/id_util.h"
@@ -70,7 +70,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR
#include "ui/accessibility/accessibility_features.h"
@@ -41,7 +41,7 @@ constexpr std::array<uint8_t, 32> kWasmTtsEnginePublic
const char kWasmTtsEngineManifestName[] = "WASM TTS Engine";
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
class WasmTTSEngineDirectory {
public:
static WasmTTSEngineDirectory* Get() {
@@ -111,7 +111,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR
VLOG(1) << "Component ready, version " << version.GetString() << " in "
<< install_dir.value();
@ -17,13 +26,13 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (features::IsWasmTtsComponentUpdaterEnabled() &&
!features::IsWasmTtsEngineAutoInstallDisabled()) {
EmbeddedA11yExtensionLoader::GetInstance()->Init();
@@ -121,7 +121,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer
installer->Register(cus, base::OnceClosure());
}
// Instead of installing the component extension as soon as it is ready,
@@ -166,7 +166,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer
void WasmTtsEngineComponentInstallerPolicy::GetWasmTTSEngineDirectory(
base::OnceCallback<void(const base::FilePath&)> callback) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::string WasmTtsEngineComponentInstallerPolicy::GetId() {
return crx_file::id_util::GenerateIdFromHash((kWasmTtsEnginePublicKeySHA256));
}
WasmTTSEngineDirectory* wasm_directory = WasmTTSEngineDirectory::Get();
wasm_directory->Get(std::move(callback));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

11
www/chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
View file

@ -1,11 +0,0 @@
--- chrome/browser/component_updater/wasm_tts_engine_component_installer.h.orig 2025-04-04 08:52:13 UTC
+++ chrome/browser/component_updater/wasm_tts_engine_component_installer.h
@@ -27,7 +27,7 @@ class WasmTtsEngineComponentInstallerPolicy : public C
WasmTtsEngineComponentInstallerPolicy& operator=(
const WasmTtsEngineComponentInstallerPolicy&) = delete;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
static std::string GetId();
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

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

@ -1,8 +1,8 @@
--- chrome/browser/devtools/features.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/devtools/features.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/devtools/features.cc
@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelineLabels,
"DevToolsAiGeneratedTimelineLabels",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -164,7 +164,7 @@ BASE_FEATURE(kDevToolsNewPermissionDialog,
"DevToolsNewPermissionDialog",
base::FEATURE_ENABLED_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)

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

@ -1,8 +1,8 @@
--- chrome/browser/devtools/features.h.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/devtools/features.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/devtools/features.h
@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTracing);
@@ -92,7 +92,7 @@ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabel
BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels);
BASE_DECLARE_FEATURE(kDevToolsNewPermissionDialog);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

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

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1864,7 +1864,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1889,7 +1889,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -2000,7 +2000,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -2025,7 +2025,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -2082,7 +2082,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -2107,7 +2107,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/download/download_item_model.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/download/download_item_model.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1210,7 +1210,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

38
www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc Normal file
View file

@ -0,0 +1,38 @@
--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/browser_management/browser_management_service.cc
@@ -50,7 +50,7 @@ GetManagementStatusProviders(Profile* profile) {
BrowserManagementService::BrowserManagementService(Profile* profile)
: ManagementService(GetManagementStatusProviders(profile)) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE,
base::BindOnce(&BrowserManagementService::UpdateManagementIconForProfile,
@@ -70,7 +70,7 @@ BrowserManagementService::BrowserManagementService(Pro
}
ui::ImageModel* BrowserManagementService::GetManagementIconForProfile() {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) | BUILDFLAG(IS_BSD)
return management_icon_for_profile_.IsEmpty() ? nullptr
: &management_icon_for_profile_;
#else
@@ -83,7 +83,7 @@ void BrowserManagementService::TriggerPolicyStatusChan
OnPolicyStatusChanged();
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void BrowserManagementService::StartListeningToPrefChanges(Profile* profile) {
pref_change_registrar_.Init(profile->GetPrefs());
pref_change_registrar_.Add(
@@ -126,7 +126,7 @@ void BrowserManagementService::SetManagementIconForPro
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
void BrowserManagementService::OnPolicyStatusChanged() {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
NotifyEnterpriseLabelUpdated();
#endif
}

11
www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/browser_management/browser_management_service.h
@@ -44,7 +44,7 @@ class BrowserManagementService : public ManagementServ
// PolicyStatusProvider::Observer:
void OnPolicyStatusChanged() override;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Starts listening to changes to policies that affect the enterprise label
// and pill.
void StartListeningToPrefChanges(Profile* profile);

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

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
@@ -20,7 +20,7 @@
@@ -24,7 +24,7 @@
namespace enterprise_connectors {

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

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -53,7 +53,7 @@
@@ -52,7 +52,7 @@
#include "base/strings/utf_string_conversions.h"
#endif
@ -9,7 +9,7 @@
#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"
@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
@@ -157,7 +157,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
/*include_profile_user_name=*/false);
}
@ -18,7 +18,7 @@
void AddCrowdstrikeSignalsToEvent(
base::Value::Dict& event,
@@ -194,7 +194,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
@@ -193,7 +193,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
username_ =
identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
@ -27,7 +27,7 @@
if (username_.empty()) {
username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
enterprise_signin::prefs::kProfileUserEmail);
@@ -246,7 +246,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
@@ -245,7 +245,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
return client_id;
}

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

@ -0,0 +1,20 @@
--- chrome/browser/enterprise/reporting/cloud_profile_reporting_service.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/reporting/cloud_profile_reporting_service.cc
@@ -34,7 +34,7 @@
#include "extensions/buildflags/buildflags.h"
#include "services/network/public/cpp/shared_url_loader_factory.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/signals/signals_aggregator_factory.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -113,7 +113,7 @@ void CloudProfileReportingService::CreateReportSchedul
params.profile_request_generator =
std::make_unique<ChromeProfileRequestGenerator>(
profile_->GetPath(), &delegate_factory,
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
enterprise_signals::SignalsAggregatorFactory::GetForProfile(
profile_));
#else

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

@ -0,0 +1,20 @@
--- chrome/browser/enterprise/reporting/cloud_profile_reporting_service_factory.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/reporting/cloud_profile_reporting_service_factory.cc
@@ -10,7 +10,7 @@
#include "components/enterprise/browser/reporting/report_scheduler.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -47,7 +47,7 @@ CloudProfileReportingServiceFactory::CloudProfileRepor
ProfileSelections::BuildForRegularProfile()) {
DependsOn(enterprise::ProfileIdServiceFactory::GetInstance());
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Depends on this service because
// `CloudProfileReportingService.profile_request_generator_` has a dependency
// on it.

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

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -179,6 +179,8 @@ std::vector<std::string> ContextInfoFetcher::GetOnSecu
@@ -181,6 +181,8 @@ std::vector<std::string> ContextInfoFetcher::GetOnSecu
SettingValue ContextInfoFetcher::GetOSFirewall() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
return device_signals::GetOSFirewall();
@ -9,7 +9,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
return GetChromeosFirewall();
#else
@@ -198,7 +200,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor
@@ -200,7 +202,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor
#endif // BUILDFLAG(IS_LINUX)
std::vector<std::string> ContextInfoFetcher::GetDnsServers() {

11
www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/enterprise/util/managed_browser_utils.cc
@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
profile_manager->GetProfileAttributesStorage()
@ -9,3 +9,12 @@
SetEnterpriseProfileLabel(profile);
#endif
entry->SetUserAcceptedAccountManagement(accepted);
@@ -341,7 +341,7 @@ bool CanShowEnterpriseProfileUI(Profile* profile) {
}
bool CanShowEnterpriseBadgingForNTPFooter(Profile* profile) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto* management_service =
policy::ManagementServiceFactory::GetForProfile(profile);

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1464,6 +1464,10 @@ source_set("extensions") {
@@ -1468,6 +1468,10 @@ source_set("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

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

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2024-01-30 07:53:34 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
@@ -24,7 +24,7 @@
#include "base/win/registry.h"
@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDir() {
@@ -264,7 +264,7 @@ base::FilePath GetEndpointVerificationDir() {
bool got_path = false;
#if BUILDFLAG(IS_WIN)
got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
@ -18,7 +18,7 @@
std::unique_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDir() {
@@ -275,7 +275,7 @@ base::FilePath GetEndpointVerificationDir() {
if (!got_path)
return path;

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

@ -1,11 +0,0 @@
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-05-05 10:57:53 UTC
+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -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;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -292,7 +292,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
@@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "openbsd") == 0) {

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

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
@ -18,7 +18,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::kBoolean;
#endif
@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -228,7 +228,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;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
@@ -945,7 +945,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.

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -916,7 +916,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
@@ -914,7 +914,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
#if BUILDFLAG(IS_CHROMEOS)
RequestExtensionApproval(contents);
return;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders(
#endif // BUILDFLAG(IS_CHROMEOS)
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

14
www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -357,7 +357,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
@@ -341,7 +341,7 @@ GenerateBlockedPath() {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
BlockType::kDontBlockChildren},
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// On Linux also block access to devices via /dev.
{kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren},
// And security sensitive data in /proc and /sys.
// On Linux also block access to devices via /dev.
{kNoBasePathKey, FILE_PATH_LITERAL("/dev"), BlockType::kBlockAllChildren},
// And security sensitive data in /proc and /sys.

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/flag_descriptions.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
@@ -617,7 +617,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
"Autofill suggestions on the allowlisted merchant websites.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
"Enable loading and querying the checkout amount extraction allowlist on "
"Chrome Desktop";
@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi
@@ -641,7 +641,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi
// BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
const char kAutofillEnableBuyNowPayLaterName[] =
"Enable buy now pay later on Autofill";
const char kAutofillEnableBuyNowPayLaterDescription[] =
@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] =
@@ -1064,7 +1064,7 @@ const char kDevicePostureDescription[] =
"Enables Device Posture API (foldable devices)";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -27,7 +27,7 @@
const char kDocumentPictureInPictureAnimateResizeName[] =
"Document Picture-in-Picture Animate Resize";
const char kDocumentPictureInPictureAnimateResizeDescription[] =
@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescription[] =
@@ -1178,7 +1178,7 @@ const char kContextMenuEmptySpaceDescription[] =
"space, a context menu containing page-related items will be shown.";
#endif // BUILDFLAG(IS_ANDROID)
@ -36,7 +36,7 @@
const char kContextualCueingName[] = "Contextual cueing";
const char kContextualCueingDescription[] =
"Enables the contextual cueing system to support showing actions.";
@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
@@ -1604,7 +1604,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
const char kEnableIsolatedWebAppDevModeDescription[] =
"Enables the installation of unverified Isolated Web Apps";
@ -45,7 +45,7 @@
const char kEnableIwaKeyDistributionComponentName[] =
"Enable the Iwa Key Distribution component";
const char kEnableIwaKeyDistributionComponentDescription[] =
@@ -3430,7 +3430,7 @@ const char kRetainOmniboxOnFocusDescription[] =
@@ -3536,7 +3536,7 @@ const char kRetainOmniboxOnFocusDescription[] =
"exhibit a change in behavior.";
#endif // BUILDFLAG(IS_ANDROID)
@ -54,7 +54,7 @@
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[] =
@@ -3774,7 +3774,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
"SiteInstance.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -63,7 +63,7 @@
const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing";
const char kPwaNavigationCapturingDescription[] =
"Enables opening links from Chrome in an installed PWA. Currently under "
@@ -3863,7 +3863,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
@@ -3990,7 +3990,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
"Force the Translate Triggering on English pages experiment to be enabled "
"with the selected language model active.";
@ -72,7 +72,7 @@
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[] =
@@ -5650,7 +5650,7 @@ const char kTranslateOpenSettingsDescription[] =
"Add an option to the translate bubble menu to open language settings.";
#endif
@ -81,7 +81,7 @@
const char kWasmTtsComponentUpdaterEnabledName[] =
"Enable Wasm TTS Extension Component";
const char kWasmTtsComponentUpdaterEnabledDescription[] =
@@ -7459,7 +7459,7 @@ const char kTetheringExperimentalFunctionalityDescript
@@ -7681,7 +7681,7 @@ const char kTetheringExperimentalFunctionalityDescript
#endif // BUILDFLAG(IS_CHROMEOS)
@ -90,7 +90,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7688,7 +7688,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
@@ -7910,7 +7910,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
// Linux -----------------------------------------------------------------------
@ -99,7 +99,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7738,6 +7738,18 @@ const char kWaylandUiScalingDescription[] =
@@ -7960,6 +7960,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.";
@ -118,7 +118,7 @@
#endif // BUILDFLAG(IS_LINUX)
// Random platform combinations -----------------------------------------------
@@ -7750,7 +7762,7 @@ const char kZeroCopyVideoCaptureDescription[] =
@@ -7972,7 +7984,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -127,7 +127,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7793,7 +7805,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P
@@ -8015,7 +8027,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P
const char kGroupPromoPrototypeDescription[] =
"Enables prototype for group promo.";
@ -136,7 +136,7 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7825,7 +7837,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -8043,7 +8055,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -145,7 +145,7 @@
#if BUILDFLAG(ENABLE_PRINTING)
const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
const char kCupsIppPrintingBackendDescription[] =
@@ -7967,7 +7979,7 @@ const char kElementCaptureDescription[] =
@@ -8186,7 +8198,7 @@ const char kElementCaptureDescription[] =
"media track into a track capturing just a specific DOM element.";
#endif // !BUILDFLAG(IS_ANDROID)
@ -154,7 +154,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -8018,7 +8030,7 @@ const char kComposeUpfrontInputModesDescription[] =
@@ -8237,7 +8249,7 @@ const char kComposeUpfrontInputModesDescription[] =
"Enables upfront input modes in the Compose dialog";
#endif // BUILDFLAG(ENABLE_COMPOSE)
@ -163,7 +163,7 @@
const char kThirdPartyProfileManagementName[] =
"Third party profile management";
const char kThirdPartyProfileManagementDescription[] =
@@ -8154,7 +8166,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] =
@@ -8375,7 +8387,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] =
const char kSupervisedUserBlockInterstitialV3Description[] =
"Enables URL filter interstitial V3 for Family Link users.";

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/flag_descriptions.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/flag_descriptions.h
@@ -373,7 +373,7 @@ extern const char
@@ -383,7 +383,7 @@ extern const char
kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
extern const char kAutofillEnableAmountExtractionDesktopName[];
@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
@@ -394,7 +394,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
// BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
extern const char kAutofillEnableBuyNowPayLaterName[];
extern const char kAutofillEnableBuyNowPayLaterDescription[];
@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpaceName[];
@@ -620,7 +620,7 @@ extern const char kContextMenuEmptySpaceName[];
extern const char kContextMenuEmptySpaceDescription[];
#endif // BUILDFLAG(IS_ANDROID)
@ -27,7 +27,7 @@
extern const char kContextualCueingName[];
extern const char kContextualCueingDescription[];
extern const char kGlicZeroStateSuggestionsName[];
@@ -786,7 +786,7 @@ extern const char kDevicePostureName[];
@@ -813,7 +813,7 @@ extern const char kDevicePostureName[];
extern const char kDevicePostureDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -36,7 +36,7 @@
extern const char kDocumentPictureInPictureAnimateResizeName[];
extern const char kDocumentPictureInPictureAnimateResizeDescription[];
@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri
@@ -975,7 +975,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri
extern const char kEnableIsolatedWebAppDevModeName[];
extern const char kEnableIsolatedWebAppDevModeDescription[];
@ -45,7 +45,7 @@
extern const char kEnableIwaKeyDistributionComponentName[];
extern const char kEnableIwaKeyDistributionComponentDescription[];
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1964,7 +1964,7 @@ extern const char kRetainOmniboxOnFocusName[];
@@ -2023,7 +2023,7 @@ extern const char kRetainOmniboxOnFocusName[];
extern const char kRetainOmniboxOnFocusDescription[];
#endif // BUILDFLAG(IS_ANDROID)
@ -54,7 +54,7 @@
extern const char kRootScrollbarFollowsTheme[];
extern const char kRootScrollbarFollowsThemeDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -2096,7 +2096,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
@@ -2161,7 +2161,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
extern const char kDefaultSiteInstanceGroupsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -63,7 +63,7 @@
extern const char kPwaNavigationCapturingName[];
extern const char kPwaNavigationCapturingDescription[];
#endif
@@ -2242,7 +2242,7 @@ extern const char kTouchTextEditingRedesignDescription
@@ -2308,7 +2308,7 @@ extern const char kTouchTextEditingRedesignDescription
extern const char kTranslateForceTriggerOnEnglishName[];
extern const char kTranslateForceTriggerOnEnglishDescription[];
@ -72,7 +72,7 @@
extern const char kEnableHistorySyncOptinName[];
extern const char kEnableHistorySyncOptinDescription[];
@@ -3197,7 +3197,7 @@ extern const char kTranslateOpenSettingsName[];
@@ -3313,7 +3313,7 @@ extern const char kTranslateOpenSettingsName[];
extern const char kTranslateOpenSettingsDescription[];
#endif
@ -81,7 +81,7 @@
extern const char kWasmTtsComponentUpdaterEnabledName[];
extern const char kWasmTtsComponentUpdaterEnabledDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -4385,7 +4385,7 @@ extern const char kTetheringExperimentalFunctionalityD
@@ -4519,7 +4519,7 @@ extern const char kTetheringExperimentalFunctionalityD
#endif // #if BUILDFLAG(IS_CHROMEOS)
@ -90,7 +90,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4520,7 +4520,7 @@ extern const char kEnableArmHwdrmDescription[];
@@ -4654,7 +4654,7 @@ extern const char kEnableArmHwdrmDescription[];
// Linux ---------------------------------------------------------------------
@ -99,7 +99,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4551,6 +4551,9 @@ extern const char kWaylandTextInputV3Description[];
@@ -4685,6 +4685,9 @@ extern const char kWaylandTextInputV3Description[];
extern const char kWaylandUiScalingName[];
extern const char kWaylandUiScalingDescription[];
@ -109,7 +109,7 @@
#endif // BUILDFLAG(IS_LINUX)
// Random platform combinations -----------------------------------------------
@@ -4570,7 +4573,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4704,7 +4707,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -118,7 +118,7 @@
#if BUILDFLAG(ENABLE_PRINTING)
extern const char kCupsIppPrintingBackendName[];
extern const char kCupsIppPrintingBackendDescription[];
@@ -4583,7 +4586,7 @@ extern const char kScreenlockReauthCardDescription[];
@@ -4717,7 +4720,7 @@ extern const char kScreenlockReauthCardDescription[];
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -127,7 +127,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
@@ -4600,7 +4603,7 @@ extern const char kTaskManagerDesktopRefreshName[];
@@ -4734,7 +4737,7 @@ extern const char kTaskManagerDesktopRefreshName[];
extern const char kTaskManagerDesktopRefreshDescription[];
#endif // BUILDFLAG(IS_ANDROID)
@ -136,7 +136,7 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4695,7 +4698,7 @@ extern const char kElementCaptureName[];
@@ -4826,7 +4829,7 @@ extern const char kElementCaptureName[];
extern const char kElementCaptureDescription[];
#endif // !BUILDFLAG(IS_ANDROID)
@ -145,7 +145,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
#endif
@@ -4734,7 +4737,7 @@ extern const char kComposeUpfrontInputModesName[];
@@ -4865,7 +4868,7 @@ extern const char kComposeUpfrontInputModesName[];
extern const char kComposeUpfrontInputModesDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
@ -154,7 +154,7 @@
extern const char kThirdPartyProfileManagementName[];
extern const char kThirdPartyProfileManagementDescription[];
@@ -4814,7 +4817,7 @@ extern const char kEnablePolicyPromotionBannerDescript
@@ -4948,7 +4951,7 @@ extern const char kEnablePolicyPromotionBannerDescript
extern const char kSupervisedUserBlockInterstitialV3Name[];
extern const char kSupervisedUserBlockInterstitialV3Description[];

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

@ -1,6 +1,6 @@
--- chrome/browser/global_features.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/global_features.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/global_features.cc
@@ -22,7 +22,7 @@
@@ -23,7 +23,7 @@
#include "chrome/browser/glic/host/glic_synthetic_trial_manager.h" // nogncheck
#endif
@ -9,7 +9,7 @@
// 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"
@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
@@ -62,7 +62,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting(
void GlobalFeatures::Init() {
system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
@ -18,7 +18,7 @@
whats_new_registry_ = CreateWhatsNewRegistry();
#endif
@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
@@ -96,7 +96,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
return system_permission_settings::PlatformHandle::Create();
}

8
www/chromium/files/patch-chrome_browser_global__features.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/global_features.h.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/global_features.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/global_features.h
@@ -14,7 +14,7 @@
namespace system_permission_settings {
@ -9,7 +9,7 @@
namespace whats_new {
class WhatsNewRegistry;
} // namespace whats_new
@@ -56,7 +56,7 @@ class GlobalFeatures {
@@ -58,7 +58,7 @@ class GlobalFeatures {
system_permissions_platform_handle() {
return system_permissions_platform_handle_.get();
}
@ -18,7 +18,7 @@
whats_new::WhatsNewRegistry* whats_new_registry() {
return whats_new_registry_.get();
}
@@ -85,7 +85,7 @@ class GlobalFeatures {
@@ -91,7 +91,7 @@ class GlobalFeatures {
virtual std::unique_ptr<system_permission_settings::PlatformHandle>
CreateSystemPermissionsPlatformHandle();
@ -27,7 +27,7 @@
virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry();
#endif
@@ -95,7 +95,7 @@ class GlobalFeatures {
@@ -101,7 +101,7 @@ class GlobalFeatures {
std::unique_ptr<system_permission_settings::PlatformHandle>
system_permissions_platform_handle_;

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

@ -1,4 +1,4 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -85,7 +85,7 @@
#include "chrome/browser/flags/android/chrome_session_state.h"
@ -27,7 +27,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -873,7 +873,7 @@ void RecordStartupMetrics() {
@@ -898,7 +898,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -36,7 +36,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1211,11 +1211,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
std::make_unique<web_app::SamplingMetricsProvider>();
#endif // !BUILDFLAG(IS_ANDROID)

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

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -197,11 +197,11 @@
@@ -201,11 +201,11 @@
#include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
#endif
@ -14,7 +14,7 @@
#include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h"
#endif
@@ -233,7 +233,7 @@ const int kMaxHistogramGatheringWaitDuration = 60000;
@@ -237,7 +237,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";
@ -23,7 +23,7 @@
base::LazyInstance<ChromeMetricsServiceCrashReporter>::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
@@ -541,7 +541,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -32,7 +32,7 @@
metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
#if !BUILDFLAG(IS_CHROMEOS)
@@ -619,7 +619,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri
@@ -623,7 +623,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.
@ -41,7 +41,7 @@
// 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.
@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initialize() {
@@ -725,7 +725,7 @@ void ChromeMetricsServiceClient::Initialize() {
std::make_unique<metrics::dwa::DwaService>(this, local_state);
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -50,7 +50,7 @@
metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
base::SequencedTaskRunner::GetCurrentDefault());
#endif
@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -785,7 +785,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -59,7 +59,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<GoogleUpdateMetricsProviderMac>());
#endif
@ -68,7 +68,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -978,7 +978,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -77,7 +77,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1169,7 +1169,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
}
#endif
@ -86,7 +86,7 @@
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
@@ -1509,7 +1509,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
@@ -1518,7 +1518,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
recorder =
base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>(
cros_system_profile_provider_.get());

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

@ -1,4 +1,4 @@
--- chrome/browser/net/profile_network_context_service.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/net/profile_network_context_service.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/net/profile_network_context_service.cc
@@ -135,7 +135,7 @@
#include "extensions/common/constants.h"
@ -18,7 +18,7 @@
std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
Profile* profile,
std::unique_ptr<net::ClientCertStore> platform_store) {
@@ -1228,7 +1228,7 @@ ProfileNetworkContextService::CreateClientCertStore()
@@ -1224,7 +1224,7 @@ ProfileNetworkContextService::CreateClientCertStore()
std::make_unique<net::ClientCertStoreNSS>(
base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate,
kCryptoModulePasswordClientAuth));

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

@ -1,4 +1,4 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_
// received a failed launch for a sandboxed network service.
@ -118,7 +118,7 @@
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
@@ -739,7 +739,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@ -127,7 +127,7 @@
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}

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

@ -1,6 +1,6 @@
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -638,7 +638,7 @@ void ChromePasswordManagerClient::
@@ -664,7 +664,7 @@ void ChromePasswordManagerClient::
bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
device_reauth::DeviceAuthenticator* authenticator) {
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
return false;
}
@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
@@ -942,7 +942,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
}
void ChromePasswordManagerClient::NotifyKeychainError() {

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

@ -1,6 +1,6 @@
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
@@ -128,7 +128,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
// Prepare password hash data for reuse detection.
reuse_manager->PreparePasswordHashData(GetSignInStateForMetrics(profile));

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

@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -255,19 +255,19 @@
@@ -256,19 +256,19 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -23,7 +23,7 @@
#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 @@
@@ -282,13 +282,13 @@
#endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -39,25 +39,25 @@
#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) ||
@@ -592,7 +592,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kDefaultDirectSocketsSetting,
prefs::kManagedDefaultDirectSocketsSetting,
@@ -597,7 +597,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultSmartCardConnectSetting,
base::Value::Type::INTEGER },
#endif
-#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 },
@@ -957,7 +957,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -964,7 +964,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 },
@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kMandatoryExtensionsForIncognitoNavigation,
prefs::kMandatoryExtensionsForIncognitoNavigation,
base::Value::Type::LIST },
@@ -976,7 +976,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -66,7 +66,7 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1852,7 +1852,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -75,7 +75,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1911,7 +1911,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@ -84,7 +84,7 @@
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1921,12 +1921,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1931,12 +1931,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -99,7 +99,7 @@
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
@@ -1937,7 +1937,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1950,7 +1950,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kLiveTranslateEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@ -108,7 +108,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1962,7 +1962,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) \
@ -117,7 +117,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -2050,7 +2050,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2063,7 +2063,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -126,7 +126,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2164,7 +2164,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -135,7 +135,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2235,7 +2235,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -144,7 +144,7 @@
{ key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST },
@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2264,7 +2264,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kUiAutomationProviderEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@ -153,7 +153,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2304,7 +2304,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER },
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -162,7 +162,7 @@
{ key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST},
@@ -2324,7 +2324,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2327,7 +2327,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kTabCompareSettings,
optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
base::Value::Type::INTEGER},
@ -171,7 +171,16 @@
{ key::kChromeForTestingAllowed,
prefs::kChromeForTestingAllowed,
base::Value::Type::BOOLEAN },
@@ -2513,7 +2513,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2397,7 +2397,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
policy_prefs::kBuiltInAIAPIsEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{ key::kNTPFooterThemeAttributionEnabled,
prefs::kNTPFooterThemeAttributionEnabled,
base::Value::Type::BOOLEAN },
@@ -2532,7 +2532,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -180,7 +189,7 @@
handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
key::kMemorySaverModeSavings,
performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2752,7 +2752,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -189,7 +198,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2793,7 +2793,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2811,7 +2811,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -198,7 +207,7 @@
handlers->AddHandler(std::make_unique<GuestModePolicyHandler>());
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
@@ -2890,7 +2890,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2911,7 +2911,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -207,7 +216,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -3262,7 +3262,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3283,7 +3283,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -216,7 +225,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3291,7 +3291,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -225,7 +234,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3309,7 +3309,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
key::kRelatedWebsiteSetsOverrides, chrome_schema)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -234,7 +243,7 @@
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -3311,7 +3311,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3332,7 +3332,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -243,7 +252,7 @@
handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -3329,7 +3329,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3350,7 +3350,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
gen_ai_default_policies;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,15 +1,15 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -316,7 +316,7 @@
@@ -323,7 +323,7 @@
#include "chrome/browser/devtools/devtools_window.h"
#endif // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
#endif // BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND)
-#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
@@ -487,11 +487,11 @@
@@ -494,11 +494,11 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -23,7 +23,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#endif
@@ -519,7 +519,7 @@
@@ -526,7 +526,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -32,7 +32,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -1664,7 +1664,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1679,7 +1679,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
on_device_translation::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
@ -41,7 +41,7 @@
WhatsNewUI::RegisterLocalStatePrefs(registry);
#endif
@@ -1821,7 +1821,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1836,7 +1836,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(ENABLE_PDF)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -50,7 +50,7 @@
registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
#endif
@@ -2177,12 +2177,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -2200,12 +2200,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -358,7 +358,7 @@
@@ -362,7 +362,7 @@
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/idle/idle_service_factory.h"
#endif
@@ -400,7 +400,7 @@
@@ -404,7 +404,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -18,7 +18,7 @@
#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"
@@ -408,7 +408,7 @@
@@ -412,7 +412,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
#endif
@ -27,7 +27,7 @@
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
#endif
@@ -416,7 +416,7 @@
@@ -420,7 +420,7 @@
#include "chrome/browser/history_embeddings/history_embeddings_service_factory.h"
#endif
@ -36,7 +36,7 @@
#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"
@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -738,7 +738,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance();
#endif
#endif
@ -45,7 +45,14 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
@@ -787,7 +787,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -793,13 +793,13 @@ void ChromeBrowserMainExtraPartsProfiles::
collaboration::CollaborationServiceFactory::GetInstance();
collaboration::messaging::MessagingBackendServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
tab_groups::CollaborationMessagingObserverFactory::GetInstance();
#endif
commerce::ShoppingServiceFactory::GetInstance();
ConsentAuditorFactory::GetInstance();
ContentIndexProviderFactory::GetInstance();
@ -54,7 +61,7 @@
contextual_cueing::ContextualCueingServiceFactory::GetInstance();
#endif
CookieControlsServiceFactory::GetInstance();
@@ -843,31 +843,31 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -860,31 +860,31 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
enterprise_connectors::ReportingEventRouterFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -92,7 +99,7 @@
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1015,7 +1015,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_ANDROID)
MerchantViewerDataManagerFactory::GetInstance();
#endif
@ -101,7 +108,7 @@
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)
@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1134,7 +1134,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
@ -110,7 +117,7 @@
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
policy::UserPolicyOidcSigninServiceFactory::GetInstance();
#endif
@@ -1157,7 +1157,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1180,7 +1180,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
ProfileStatisticsFactory::GetInstance();
#endif
@ -119,7 +126,7 @@
ProfileTokenWebSigninInterceptorFactory::GetInstance();
OidcAuthenticationSigninInterceptorFactory::GetInstance();
#endif
@@ -1177,7 +1177,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1200,7 +1200,7 @@ void ChromeBrowserMainExtraPartsProfiles::
ReduceAcceptLanguageFactory::GetInstance();
RendererUpdaterFactory::GetInstance();
regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance();
@ -128,12 +135,3 @@
reporting::ManualTestHeartbeatEventFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)
@@ -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();
}

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

@ -1,6 +1,6 @@
--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
@@ -1262,7 +1262,7 @@ std::string ChromePasswordProtectionService::GetOrgani
@@ -1269,7 +1269,7 @@ std::string ChromePasswordProtectionService::GetOrgani
ReusedPasswordAccountType password_type) const {
if (base::FeatureList::IsEnabled(
safe_browsing::kEnterprisePasswordReuseUiRefresh)) {

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

@ -1,6 +1,6 @@
--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/screen_ai/screen_ai_service_router.cc
@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
@@ -405,7 +405,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
base::FilePath binary_path = state_instance->get_component_binary_path();
#if BUILDFLAG(IS_WIN)
std::vector<base::FilePath> preload_libraries = {binary_path};
@ -9,7 +9,7 @@
std::vector<std::string> extra_switches = {
base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
binary_path.MaybeAsASCII().c_str())};
@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
@@ -419,7 +419,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
.WithPreloadedLibraries(
preload_libraries,
content::ServiceProcessHostPreloadLibraries::GetPassKey())

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

@ -1,4 +1,4 @@
--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-03-05 08:14:56 UTC
--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc
@@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& stream,
}
@ -9,7 +9,7 @@
bool ShouldShowReAuthInterstitial(
content::NavigationHandle& navigation_handle) {
Profile* profile = Profile::FromBrowserContext(
@@ -230,7 +230,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu
@@ -229,7 +229,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu
}
case InterstitialResultCallbackActions::kCancelWithInterstitial: {
CHECK(navigation_handle());

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

@ -1,4 +1,4 @@
--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2025-02-19 07:43:18 UTC
--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/supervised_user/supervised_user_browser_utils.cc
@@ -40,7 +40,7 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
@ -9,7 +9,7 @@
#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"
@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool
@@ -158,7 +158,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool
#endif
}

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

@ -1,4 +1,4 @@
--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
return;
@ -8,4 +8,4 @@
+#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::
// Always invoke the parent permission dialog.

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

@ -1,6 +1,6 @@
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
@@ -348,7 +348,7 @@ void SupervisedUserExtensionsManager::
ActivateManagementPolicyAndUpdateRegistration() {
SetActiveForSupervisedUsers();
UpdateManagementPolicyRegistration();
@ -9,7 +9,7 @@
MaybeMarkExtensionsLocallyParentApproved();
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
}
@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
@@ -448,7 +448,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
return false;
}

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

@ -1,6 +1,6 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2025-04-04 08:52:13 UTC
--- chrome/browser/sync/sync_service_factory.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -108,7 +108,7 @@
@@ -110,7 +110,7 @@
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
@@ -135,7 +135,7 @@ namespace {
@@ -137,7 +137,7 @@ namespace {
tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) {
CHECK(profile);
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -18,7 +18,7 @@
tab_groups::TabGroupSyncService* service =
tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile);
CHECK(service);
@@ -377,7 +377,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -381,7 +381,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
bool local_sync_backend_enabled = false;
// Only check the local sync backend pref on the supported platforms of
// Windows, Mac and Linux.
@ -27,7 +27,7 @@
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled);
@@ -512,7 +512,7 @@ SyncServiceFactory::SyncServiceFactory()
@@ -520,7 +520,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ProfilePasswordStoreFactory::GetInstance());
DependsOn(PowerBookmarkServiceFactory::GetInstance());
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/actions/chrome_action_id.h
@@ -497,7 +497,7 @@
@@ -501,7 +501,7 @@
#if BUILDFLAG(IS_CHROMEOS)
#define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU)

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-03-05 08:14:56 UTC
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
@@ -57,7 +57,7 @@ gfx::Rect GetPopupSizeForBnpl() {
@@ -58,7 +58,7 @@ gfx::Rect GetPopupSizeForBnpl() {
DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
ContentAutofillClient* client)
: client_(CHECK_DEREF(client)) {
@ -9,7 +9,7 @@
scoped_observation_.Observe(BrowserList::GetInstance());
#endif // BUILDFLAG(IS_LINUX)
}
@@ -142,7 +142,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
@@ -144,7 +144,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
}
}

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-03-05 08:14:56 UTC
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
@@ -14,7 +14,7 @@
#include "components/autofill/core/browser/payments/payments_window_manager.h"
@ -27,7 +27,7 @@
// BrowserListObserver:
void OnBrowserSetLastActive(Browser* browser) override;
#endif // BUILDFLAG(IS_LINUX)
@@ -161,7 +161,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
@@ -165,7 +165,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
// Used in tests to notify the test infrastructure that the pop-up has closed.
base::RepeatingClosure popup_closed_closure_for_testing_;

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -126,7 +126,7 @@
@@ -127,7 +127,7 @@
#include "components/user_manager/user_manager.h"
#endif
@ -9,7 +9,7 @@
#include "ui/base/ime/text_edit_commands.h"
#include "ui/base/ime/text_input_flags.h"
#include "ui/linux/linux_ui.h"
@@ -136,7 +136,7 @@
@@ -137,7 +137,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
@ -18,7 +18,7 @@
#include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -332,7 +332,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -349,7 +349,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@ -27,7 +27,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
@@ -595,7 +595,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -612,7 +612,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
@ -36,7 +36,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -812,7 +812,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -829,7 +829,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
case IDC_CREATE_SHORTCUT:
base::RecordAction(base::UserMetricsAction("CreateShortcut"));
@ -45,7 +45,7 @@
chrome::CreateDesktopShortcutForActiveWebContents(browser_);
#else
web_app::CreateWebAppFromCurrentWebContents(
@@ -979,7 +979,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -995,7 +995,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
case IDC_CHROME_WHATS_NEW:
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
@ -54,7 +54,7 @@
ShowChromeWhatsNew(browser_);
break;
#else
@@ -1324,7 +1324,7 @@ void BrowserCommandController::InitCommandState() {
@@ -1372,7 +1372,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
@ -63,7 +63,7 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
@@ -1728,7 +1728,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
bool can_create_web_app = web_app::CanCreateWebApp(browser_);
command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_commands.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/ui/browser_commands.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/browser_commands.cc
@@ -1980,7 +1980,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
@@ -2090,7 +2090,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
} else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
} else {

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

@ -1,9 +1,9 @@
--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-05-05 10:57:53 UTC
--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/browser_ui_prefs.cc
@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime,
base::Time());
@@ -64,7 +64,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
registry->RegisterTimePref(prefs::kPdfInfoBarLastShown, base::Time());
registry->RegisterIntegerPref(prefs::kPdfInfoBarTimesShown, 0);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-#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,

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-03-05 08:14:56 UTC
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-05-28 14:55:43 UTC
+++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -102,7 +102,7 @@ namespace {
@@ -104,7 +104,7 @@ namespace {
using Logger = autofill::SavePasswordProgressLogger;
@ -9,7 +9,7 @@
// Should be kept in sync with constant declared in
// bubble_controllers/relaunch_chrome_bubble_controller.cc.
constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
@@ -549,7 +549,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
@@ -562,7 +562,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
}
void ManagePasswordsUIController::OnKeychainError() {

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