diff options
author | Robert Nagy <rnagy@FreeBSD.org> | 2025-03-05 17:17:56 +0100 |
---|---|---|
committer | Robert Nagy <rnagy@FreeBSD.org> | 2025-03-05 17:18:36 +0100 |
commit | ec8d7dbd61300c9ae7162ef5616d431f42e4756f (patch) | |
tree | 556293b467cb873cd7d17c3f88928705b4092944 | |
parent | Bump all go ports for yesterday's releases (diff) |
www/chromium: update to 134.0.6998.35
Security: https://vuxml.freebsd.org/freebsd/9c62d3f0-f997-11ef-85f3-a8a1599412c6.html
417 files changed, 2080 insertions, 2063 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 51c559f1866d..df09acd32f1d 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= chromium -PORTVERSION= 133.0.6943.141 -PORTREVISION= 1 +PORTVERSION= 134.0.6998.35 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 1a09b91802eb..197ed8444076 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1740659808 -SHA256 (chromium-133.0.6943.141.tar.xz) = 0b3b15aa03f128a6b3d7ff67a7492bfaa2ffbb4acd80664b9ff320fd470c68be -SIZE (chromium-133.0.6943.141.tar.xz) = 7441353780 +TIMESTAMP = 1741161988 +SHA256 (chromium-134.0.6998.35.tar.xz) = d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7 +SIZE (chromium-134.0.6998.35.tar.xz) = 7019433248 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-133.0.6943.141-testdata.tar.xz) = a013597396af891cbd50e54aa80f790e9560ee4c4b951bda44abf29a4e98f14e -SIZE (chromium-133.0.6943.141-testdata.tar.xz) = 650975388 +SHA256 (chromium-134.0.6998.35-testdata.tar.xz) = 03077373ee1a2f8d5130ce740e17d5c6590320dd8134d9c6c6e62347cfd8c7a5 +SIZE (chromium-134.0.6998.35-testdata.tar.xz) = 653361148 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index eaa027cd1e21..4cf97c18f210 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ BUILD.gn @@ -71,7 +71,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -445,7 +444,7 @@ group("gn_all") { +@@ -446,7 +445,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -635,6 +634,15 @@ group("gn_all") { +@@ -636,6 +635,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -683,7 +691,7 @@ group("gn_all") { +@@ -684,7 +692,7 @@ group("gn_all") { } } @@ -51,16 +51,16 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -1171,7 +1179,7 @@ if (use_blink && !is_cronet_build) { +@@ -1125,7 +1133,7 @@ if (use_blink && !is_cronet_build) { ] - } -- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { -+ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { - script_test("chrome_wpt_tests") { - script = "//third_party/blink/tools/run_wpt_tests.py" - args = _common_web_test_options + [ "--product=chrome" ] -@@ -1264,7 +1272,7 @@ if (use_blink && !is_cronet_build) { + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && +- !is_castos) { ++ !is_castos && !is_bsd) { + deps += [ + ":chrome_wpt_tests", + ":headless_shell_wpt", +@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,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. -@@ -1278,7 +1286,7 @@ if (use_blink && !is_cronet_build) { +@@ -1289,7 +1297,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -78,7 +78,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. -@@ -1748,7 +1756,7 @@ group("chromium_builder_perf") { +@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 47e64abe77db..2a6a0b3162a3 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- base/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ base/BUILD.gn -@@ -1089,11 +1089,26 @@ component("base") { +@@ -1088,11 +1088,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" ] -@@ -1113,7 +1128,7 @@ component("base") { +@@ -1112,7 +1127,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2121,6 +2136,22 @@ component("base") { +@@ -2122,6 +2137,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2266,6 +2297,33 @@ component("base") { +@@ -2267,6 +2298,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2616,7 +2674,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2617,7 +2675,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" ] -@@ -3093,7 +3151,7 @@ if (is_apple) { +@@ -3096,7 +3154,7 @@ if (is_apple) { } } @@ -112,7 +112,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3779,7 +3837,7 @@ test("base_unittests") { +@@ -3781,7 +3839,7 @@ test("base_unittests") { ] } @@ -121,7 +121,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3807,7 +3865,7 @@ test("base_unittests") { +@@ -3809,7 +3867,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", -@@ -3818,7 +3876,7 @@ test("base_unittests") { +@@ -3820,7 +3878,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4006,7 +4064,7 @@ test("base_unittests") { +@@ -4008,7 +4066,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 2e3a81d95c03..47ed3fb65dc6 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-02-25 07:06:47 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-03-05 08:14:56 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -39,7 +39,7 @@ if (is_nacl) { +@@ -89,7 +89,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = true has_memory_tagging = @@ -8,8 +8,8 @@ + current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) declare_args() { - # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -290,7 +290,7 @@ declare_args() { + # Debug configuration. +@@ -347,7 +347,7 @@ declare_args() { declare_args() { # Shadow metadata is still under development and only supports Linux # for now. @@ -18,7 +18,7 @@ } declare_args() { -@@ -433,7 +433,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -490,7 +490,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 = diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index c141175d8450..5fba811b96b8 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -864,7 +864,7 @@ if (is_clang_or_gcc) { +@@ -865,7 +865,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index bb56cadc0970..a01d68759a37 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-09-30 07:45:04 UTC +--- 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 -@@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); +@@ -327,7 +327,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; -@@ -446,7 +446,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { +@@ -444,7 +444,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. diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index c0e054aa7097..5ab44c84e57c 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,6 +1,6 @@ ---- base/compiler_specific.h.orig 2025-01-15 09:18:26 UTC +--- base/compiler_specific.h.orig 2025-03-05 08:14:56 UTC +++ base/compiler_specific.h -@@ -683,6 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { +@@ -729,6 +729,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { #if __has_cpp_attribute(clang::preserve_most) && \ (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ !defined(COMPONENT_BUILD) && \ diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 8180842e9fc0..6efd5f262b2a 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/debugger_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/debug/debugger_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/debug/debugger_posix.cc @@ -41,6 +41,10 @@ #include <sys/sysctl.h> @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -100,33 +104,52 @@ bool BeingDebugged() { +@@ -99,33 +103,52 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 1aee86e0554b..3c9b50fe69c5 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- base/debug/elf_reader.cc.orig 2024-06-17 12:56:06 UTC +--- base/debug/elf_reader.cc.orig 2025-03-05 08:14:56 UTC +++ base/debug/elf_reader.cc -@@ -50,6 +50,10 @@ using Xword = Elf64_Xword; +@@ -49,6 +49,10 @@ using Xword = Elf64_Xword; constexpr char kGnuNoteName[] = "GNU"; diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index 8dea6d6b120a..0305287be3d2 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2025-02-19 07:43:18 UTC +--- base/debug/stack_trace.cc.orig 2025-03-05 08:14:56 UTC +++ base/debug/stack_trace.cc -@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -267,7 +267,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,7 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream +@@ -320,7 +320,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream } return; } @@ -19,7 +19,7 @@ } std::string StackTrace::ToString() const { -@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const { +@@ -329,7 +331,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -28,7 +28,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -353,7 +355,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 53932778ec08..d9d357a06731 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/debug/stack_trace_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/debug/stack_trace_posix.cc -@@ -46,7 +46,7 @@ +@@ -51,7 +51,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS // libc. #if BUILDFLAG(IS_APPLE) || \ @@ -9,7 +9,7 @@ #define HAVE_BACKTRACE #include <execinfo.h> #endif -@@ -64,8 +64,10 @@ +@@ -69,8 +69,10 @@ #include <AvailabilityMacros.h> #endif @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -324,7 +326,7 @@ void PrintToStderr(const char* output) { +@@ -329,7 +331,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -341,7 +343,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -346,7 +348,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -547,7 +553,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -552,7 +558,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -572,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -577,6 +583,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -586,6 +593,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -591,6 +598,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -778,6 +786,7 @@ class SandboxSymbolizeHelper { +@@ -783,6 +791,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // This class is copied from // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. // It aims at ensuring the process is dumpable before opening /proc/self/mem. -@@ -870,11 +879,15 @@ class SandboxSymbolizeHelper { +@@ -875,11 +884,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -892,6 +905,7 @@ class SandboxSymbolizeHelper { +@@ -897,6 +910,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base_files_drive__info__posix.cc b/www/chromium/files/patch-base_files_drive__info__posix.cc index 6f5f9077674b..70b23409738d 100644 --- a/www/chromium/files/patch-base_files_drive__info__posix.cc +++ b/www/chromium/files/patch-base_files_drive__info__posix.cc @@ -1,6 +1,6 @@ ---- base/files/drive_info_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/files/drive_info_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/files/drive_info_posix.cc -@@ -23,7 +23,7 @@ namespace base { +@@ -24,7 +24,7 @@ namespace base { std::optional<DriveInfo> GetFileDriveInfo(const FilePath& file_path) { DriveInfo drive_info; diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index 5011b20fd25a..02b2b0fbe21e 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2024-11-14 07:57:23 UTC +--- base/files/file_util_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/files/file_util_posix.cc -@@ -897,36 +897,33 @@ bool CreateNewTempDirectory(const FilePath::StringType +@@ -902,36 +902,33 @@ bool CreateNewTempDirectory(const FilePath::StringType bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index f71d6b96a928..3ed8911eb065 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2025-01-15 09:18:26 UTC +--- base/files/file_util_unittest.cc.orig 2025-03-05 08:14:56 UTC +++ base/files/file_util_unittest.cc -@@ -3908,7 +3908,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3911,7 +3911,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4645,7 +4645,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4648,7 +4648,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 294f678b312c..bdea71b2f47c 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,6 +1,6 @@ ---- base/linux_util.cc.orig 2025-02-19 07:43:18 UTC +--- base/linux_util.cc.orig 2025-03-05 08:14:56 UTC +++ base/linux_util.cc -@@ -159,10 +159,14 @@ void SetLinuxDistro(const std::string& distro) { +@@ -164,10 +164,14 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index f9d8d562e11a..436cbb4e3852 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory.cc.orig 2025-02-19 07:43:18 UTC +--- base/memory/discardable_memory.cc.orig 2025-03-05 08:14:56 UTC +++ base/memory/discardable_memory.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -38,7 +38,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, +@@ -44,7 +44,7 @@ BASE_FEATURE_ENUM_PARAM(DiscardableMemoryTrialGroup, namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -57,7 +57,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -63,7 +63,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -89,7 +89,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -95,7 +95,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 1b81a20c4128..b161045c7bc2 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -56,7 +56,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { +@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { } // namespace @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -176,7 +176,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -175,7 +175,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -205,7 +205,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -204,7 +204,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc b/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc index ebfa09fd121c..3e769273a4b1 100644 --- a/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc +++ b/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc @@ -1,6 +1,6 @@ ---- base/message_loop/message_pump_epoll.cc.orig 2024-10-22 08:31:56 UTC +--- base/message_loop/message_pump_epoll.cc.orig 2025-03-05 08:14:56 UTC +++ base/message_loop/message_pump_epoll.cc -@@ -42,7 +42,7 @@ std::atomic_bool g_use_batched_version = false; +@@ -47,7 +47,7 @@ std::atomic_bool g_use_batched_version = false; std::atomic_bool g_use_poll = false; constexpr std::pair<uint32_t, short int> kEpollToPollEvents[] = { diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index 4c45e4b82e15..700a45500bb8 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,6 +1,6 @@ ---- base/process/internal_linux.h.orig 2025-02-19 07:43:18 UTC +--- base/process/internal_linux.h.orig 2025-03-05 08:14:56 UTC +++ base/process/internal_linux.h -@@ -139,6 +139,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); +@@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); // arguments to the lambda. template <typename Lambda> void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { @@ -10,7 +10,7 @@ // Iterate through the different threads tracked in /proc/<pid>/task. FilePath fd_path = GetProcPidDir(process).Append("task"); -@@ -161,6 +164,7 @@ void ForEachProcessTask(base::ProcessHandle process, L +@@ -166,6 +169,7 @@ void ForEachProcessTask(base::ProcessHandle process, L FilePath task_path = fd_path.Append(tid_str); lambda(tid, task_path); } diff --git a/www/chromium/files/patch-base_process_process__metrics__unittest.cc b/www/chromium/files/patch-base_process_process__metrics__unittest.cc index 84f392e34942..a2e0b62bd1e6 100644 --- a/www/chromium/files/patch-base_process_process__metrics__unittest.cc +++ b/www/chromium/files/patch-base_process_process__metrics__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_unittest.cc.orig 2025-02-19 07:43:18 UTC +--- base/process/process_metrics_unittest.cc.orig 2025-03-05 08:14:56 UTC +++ base/process/process_metrics_unittest.cc -@@ -58,7 +58,8 @@ +@@ -63,7 +63,8 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 41f82361b715..c8ce97140751 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2025-02-19 07:43:18 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2025-03-05 08:14:56 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -46,7 +46,7 @@ +@@ -50,7 +50,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h index d3d150ddbc86..02d814a4ae20 100644 --- a/www/chromium/files/patch-base_rand__util.h +++ b/www/chromium/files/patch-base_rand__util.h @@ -1,6 +1,6 @@ ---- base/rand_util.h.orig 2025-01-15 09:18:26 UTC +--- base/rand_util.h.orig 2025-03-05 08:14:56 UTC +++ base/rand_util.h -@@ -141,7 +141,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -209,7 +209,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc index 4c33d84672fc..4a32567851bd 100644 --- a/www/chromium/files/patch-base_rand__util__posix.cc +++ b/www/chromium/files/patch-base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- base/rand_util_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/rand_util_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/rand_util_posix.cc -@@ -23,7 +23,7 @@ +@@ -28,7 +28,7 @@ #include "base/time/time.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -39,6 +39,7 @@ namespace base { +@@ -44,6 +44,7 @@ namespace base { namespace { @@ -17,7 +17,7 @@ #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -63,10 +64,11 @@ class URandomFd { +@@ -68,10 +69,11 @@ class URandomFd { private: const int fd_; }; @@ -30,7 +30,7 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -151,6 +153,7 @@ bool UseBoringSSLForRandBytes() { +@@ -156,6 +158,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { @@ -38,7 +38,7 @@ #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -185,6 +188,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi +@@ -190,6 +193,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,7 +48,7 @@ } } // namespace -@@ -204,9 +210,11 @@ void RandBytes(span<uint8_t> output) { +@@ -209,9 +215,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } diff --git a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc index fde8acf4a51f..232cd27d4134 100644 --- a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc +++ b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2025-02-19 07:43:18 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2025-03-05 08:14:56 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -744,6 +744,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -743,6 +743,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -760,6 +761,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -759,6 +760,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 9a7dbb5113c1..42c21c63cf1c 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2025-02-19 07:43:18 UTC +--- base/system/sys_info.cc.orig 2025-03-05 08:14:56 UTC +++ base/system/sys_info.cc -@@ -231,7 +231,7 @@ std::string SysInfo::SocManufacturer() { +@@ -224,7 +224,7 @@ std::string SysInfo::SocManufacturer() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index a8f51dfda062..423ee198ff3d 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2024-11-14 07:57:23 UTC +--- base/system/sys_info.h.orig 2025-03-05 08:14:56 UTC +++ base/system/sys_info.h -@@ -331,6 +331,8 @@ class BASE_EXPORT SysInfo { +@@ -332,6 +332,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -343,7 +345,7 @@ class BASE_EXPORT SysInfo { +@@ -344,7 +346,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index e64a817626a7..d7c0ad5cd84f 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/system/sys_info_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/system/sys_info_posix.cc -@@ -119,7 +119,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -124,7 +124,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() { +@@ -180,7 +180,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -263,6 +263,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -268,6 +268,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 82c19f4f875a..6505214daff1 100644 --- a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,6 +1,6 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2025-02-19 07:43:18 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2025-03-05 08:14:56 UTC +++ base/task/thread_pool/environment_config_unittest.cc -@@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio +@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread()); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ @@ -9,7 +9,7 @@ EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block -@@ -24,7 +24,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio +@@ -23,7 +23,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread()); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 659a9930fd59..7904479d11d3 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2025-01-15 09:18:26 UTC +--- base/test/launcher/test_launcher.cc.orig 2025-03-05 08:14:56 UTC +++ base/test/launcher/test_launcher.cc -@@ -75,6 +75,7 @@ +@@ -74,6 +74,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc index eeb09a926555..3ac11735f210 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_internal_posix.cc.orig 2025-02-19 07:43:18 UTC +--- base/threading/platform_thread_internal_posix.cc.orig 2025-03-05 08:14:56 UTC +++ base/threading/platform_thread_internal_posix.cc -@@ -43,7 +43,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest +@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest } int GetCurrentThreadNiceValue() { diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index 638633f1b246..3bfe87ef3cb2 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2025-02-19 07:43:18 UTC +--- base/threading/platform_thread_unittest.cc.orig 2025-03-05 08:14:56 UTC +++ base/threading/platform_thread_unittest.cc @@ -36,7 +36,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -371,7 +371,7 @@ TEST(PlatformThreadTest, +@@ -370,7 +370,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanChangeThreadType) { @@ -18,7 +18,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level unless we are root (euid == 0). bool kCanIncreasePriority = false; -@@ -625,12 +625,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -624,12 +624,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index a5e8c384e9f7..5b3e4277da06 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2025-02-19 07:43:18 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2025-03-05 08:14:56 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -31,6 +31,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -180,7 +182,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -371,6 +373,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -370,6 +372,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc b/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc index 2e8d8c586170..586f720f01cb 100644 --- a/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc +++ b/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc @@ -1,6 +1,6 @@ ---- base/trace_event/memory_dump_manager.cc.orig 2025-02-19 07:43:18 UTC +--- base/trace_event/memory_dump_manager.cc.orig 2025-03-05 08:14:56 UTC +++ base/trace_event/memory_dump_manager.cc -@@ -79,7 +79,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP +@@ -78,7 +78,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP #if defined(MALLOC_MEMORY_TRACING_SUPPORTED) MallocDumpProvider::kAllocatedObjects; #else diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 34c02634db48..4bb28bf4429c 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2025-02-19 07:43:18 UTC +--- base/trace_event/process_memory_dump.cc.orig 2025-03-05 08:14:56 UTC +++ base/trace_event/process_memory_dump.cc -@@ -120,7 +120,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident +@@ -119,7 +119,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) auto vec = base::HeapArray<PSAPI_WORKING_SET_EX_INFORMATION>::WithSize(max_vec_size); @@ -9,7 +9,7 @@ auto vec = base::HeapArray<char>::WithSize(max_vec_size); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size); -@@ -144,7 +144,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident +@@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) { resident_page_count += vec[i].VirtualAttributes.Valid; } diff --git a/www/chromium/files/patch-base_tracing_trace__time.cc b/www/chromium/files/patch-base_tracing_trace__time.cc index ae966d70778d..2040b12690a7 100644 --- a/www/chromium/files/patch-base_tracing_trace__time.cc +++ b/www/chromium/files/patch-base_tracing_trace__time.cc @@ -1,6 +1,6 @@ ---- base/tracing/trace_time.cc.orig 2025-02-19 07:43:18 UTC +--- base/tracing/trace_time.cc.orig 2025-03-05 08:14:56 UTC +++ base/tracing/trace_time.cc -@@ -8,13 +8,17 @@ +@@ -8,12 +8,16 @@ #include "build/build_config.h" #include "third_party/perfetto/include/perfetto/base/time.h" @@ -8,8 +8,7 @@ +#define CLOCK_BOOTTIME CLOCK_UPTIME +#endif + - namespace base { - namespace tracing { + namespace base::tracing { int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index fe1a3c5b53a5..c1c31e12d0c8 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- build/config/compiler/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ build/config/compiler/BUILD.gn @@ -198,7 +198,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1240,7 +1247,7 @@ config("compiler_cpu_abi") { +@@ -1234,7 +1241,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1255,7 +1262,7 @@ config("compiler_cpu_abi") { +@@ -1249,7 +1256,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" ] } -@@ -1589,7 +1596,7 @@ config("compiler_deterministic") { +@@ -1583,7 +1590,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,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1647,7 +1654,7 @@ config("compiler_deterministic") { +@@ -1641,7 +1648,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ current_os != "zos") { update_args = [ "--print-revision", -@@ -1968,9 +1975,6 @@ config("default_warnings") { +@@ -1962,9 +1969,6 @@ config("default_warnings") { cflags += [ # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. "-Wno-cast-function-type", @@ -93,17 +93,16 @@ ] cflags_cc += [ -@@ -1989,9 +1993,6 @@ config("default_warnings") { - - # TODO(crbug.com/356172342): Fix and re-enable. - cflags_cc += [ "-Wno-dangling-assignment-gsl" ] -- -- # TODO(crbug.com/376641662): Fix and re-enable. -- cflags += [ "-Wno-nontrivial-memcall" ] - } - } +@@ -1972,7 +1976,7 @@ config("default_warnings") { + "-Wenum-compare-conditional", + ] -@@ -2769,7 +2770,7 @@ config("afdo_optimize_size") { +- if (!is_nacl) { ++ if (!is_nacl && !is_bsd) { + cflags_cc += [ + # TODO(crbug.com/41486292): Fix and re-enable. + "-Wno-c++11-narrowing-const-reference", +@@ -2741,7 +2745,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") { @@ -112,7 +111,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2796,7 +2797,7 @@ config("afdo") { +@@ -2768,7 +2772,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -121,7 +120,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2973,7 +2974,7 @@ config("symbols") { +@@ -2945,7 +2949,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } diff --git a/www/chromium/files/patch-build_rust_std_BUILD.gn b/www/chromium/files/patch-build_rust_std_BUILD.gn index fe1e7d27fb89..f141786e7a19 100644 --- a/www/chromium/files/patch-build_rust_std_BUILD.gn +++ b/www/chromium/files/patch-build_rust_std_BUILD.gn @@ -1,5 +1,14 @@ ---- build/rust/std/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- build/rust/std/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ build/rust/std/BUILD.gn +@@ -89,7 +89,7 @@ if (toolchain_has_rust) { + # These are no longer present in the Windows toolchain. + stdlib_files += [ + "addr2line", +- "adler2", ++ "adler", + "gimli", + "libc", + "memchr", @@ -115,7 +115,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. diff --git a/www/chromium/files/patch-build_toolchain_toolchain.gni b/www/chromium/files/patch-build_toolchain_toolchain.gni index 5b6fc0aeba42..fb64db63a5e9 100644 --- a/www/chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/toolchain.gni.orig 2024-08-26 12:06:38 UTC +--- build/toolchain/toolchain.gni.orig 2025-03-05 08:14:56 UTC +++ build/toolchain/toolchain.gni -@@ -72,7 +72,7 @@ if (host_os == "mac") { +@@ -75,7 +75,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index a0a4af5bfa3b..c22a5e46b2d2 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2025-02-19 07:43:18 UTC +--- chrome/app/chrome_command_ids.h.orig 2025-03-05 08:14:56 UTC +++ chrome/app/chrome_command_ids.h -@@ -68,11 +68,11 @@ +@@ -72,11 +72,11 @@ #define IDC_TOGGLE_MULTITASK_MENU 34050 #endif diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 3e6775bc883b..3da5c6829097 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -145,7 +145,7 @@ - #include "components/about_ui/credit_utils.h" +@@ -146,7 +146,7 @@ + #include "components/webui/about/credit_utils.h" #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -189,17 +189,17 @@ +@@ -187,17 +187,17 @@ #include "v8/include/v8.h" #endif @@ -30,7 +30,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -340,7 +340,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -315,7 +315,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -39,25 +39,25 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -425,7 +425,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -398,7 +398,7 @@ bool HandleVersionSwitches(const base::CommandLine& co + return false; + } - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -437,7 +437,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -410,7 +410,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -519,7 +519,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -492,7 +492,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -66,7 +66,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -603,7 +603,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -570,7 +570,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -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. -@@ -699,7 +699,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -666,7 +666,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( -@@ -888,7 +888,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -825,7 +825,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -93,7 +93,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1089,7 +1089,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -973,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -102,17 +102,17 @@ is_canary_dev; #else false; -@@ -1238,7 +1238,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1120,7 +1120,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom + return 0; // Got a --credits switch; exit with a success error code. + } - // TODO(crbug.com/40118868): Revisit the macro expression once build flag - // switch of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1268,7 +1268,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom - #if BUILDFLAG(IS_CHROMEOS) +@@ -1145,7 +1145,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom + ash::RegisterPathProvider(); chromeos::dbus_paths::RegisterPathProvider(); #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -120,7 +120,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1563,7 +1563,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1433,7 +1433,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -129,7 +129,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1651,13 +1651,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1521,13 +1521,13 @@ absl::variant<int, content::MainFunctionParams> Chrome #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index d733dce73384..2e76aaeaf6c8 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/BUILD.gn -@@ -6957,6 +6957,13 @@ static_library("browser") { +@@ -6745,6 +6745,13 @@ static_library("browser") { [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ] } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index f2fc0c6cc445..c706ebf19987 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/about_flags.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/about_flags.cc @@ -254,7 +254,7 @@ #include "extensions/common/extension_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -341,7 +341,7 @@ +@@ -340,7 +340,7 @@ #include "device/vr/public/cpp/switches.h" #endif @@ -24,7 +24,7 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/contextual_cueing/contextual_cueing_features.h" + #include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -361,7 +361,7 @@ @@ -45,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -799,6 +799,26 @@ const FeatureEntry::FeatureVariation +@@ -817,6 +817,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1203,7 +1223,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1221,7 +1241,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1241,7 +1261,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada +@@ -1259,7 +1279,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -90,7 +90,7 @@ // A limited number of combinations of the rich autocompletion params. const FeatureEntry::FeatureParam -@@ -1834,7 +1854,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari +@@ -1799,7 +1819,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +99,7 @@ const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = { {"stale_threshold_duration", "10s"}, {"declutter_timer_interval", "10s"}, -@@ -3598,7 +3618,7 @@ const FeatureEntry::FeatureVariation +@@ -3591,7 +3611,7 @@ const FeatureEntry::FeatureVariation #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -108,16 +108,25 @@ const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4095,7 +4115,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari - {"dawn frontend validation disabled", kSkiaGraphite_ValidationDisabled, - std::size(kSkiaGraphite_ValidationDisabled), nullptr}}; +@@ -4105,7 +4125,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari + std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr}, + }; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { {"TranslationAPIAcceptLanguagesCheck", "false"}, {"TranslationAPILimitLanguagePackCount", "false"}}; -@@ -4907,7 +4927,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4175,7 +4195,7 @@ const FeatureEntry::FeatureVariation + 1, nullptr}, + }; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = { + {"BackoffTime", "0h"}, + {"BackoffMultiplierBase", "0.0"}, +@@ -4960,7 +4980,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) @@ -126,7 +135,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5463,7 +5483,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5503,7 +5523,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -135,7 +144,7 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5499,9 +5519,19 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5539,9 +5559,19 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWaylandLinuxDrmSyncobjName, flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux, FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)}, @@ -156,7 +165,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6407,7 +6437,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6437,7 +6467,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -165,7 +174,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6605,7 +6635,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6635,7 +6665,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -174,7 +183,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7162,7 +7192,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7174,7 +7204,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -183,16 +192,25 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8066,7 +8096,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kCooperativeSchedulingDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, +@@ -7442,7 +7472,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)}, + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + {"wasm-tts-component-updater-enabled", + flag_descriptions::kWasmTtsComponentUpdaterEnabledName, + flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop, +@@ -8106,7 +8136,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)}, + #endif // !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8751,7 +8781,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8784,7 +8814,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -201,7 +219,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)}, -@@ -8778,7 +8808,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8811,7 +8841,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -210,7 +228,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9255,7 +9285,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9278,7 +9308,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -237,7 +255,7 @@ {"enable-search-aggregator-policy", flag_descriptions::kEnableSearchAggregatorPolicyName, flag_descriptions::kEnableSearchAggregatorPolicyDescription, -@@ -10092,7 +10122,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10097,7 +10127,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)}, #endif @@ -246,7 +264,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10134,7 +10164,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10132,7 +10162,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -255,25 +273,16 @@ {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -10976,7 +11006,7 @@ const FeatureEntry kFeatureEntries[] = { - performance_manager::features::kPerformanceInterventionDemoMode)}, - #endif +@@ -10933,7 +10963,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCanvasHibernationDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"sync-enable-bookmarks-in-transport-mode", flag_descriptions::kSyncEnableBookmarksInTransportModeName, flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -11058,7 +11088,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"classify-url-on-process-response-event", - flag_descriptions::kClassifyUrlOnProcessResponseEventName, - flag_descriptions::kClassifyUrlOnProcessResponseEventDescription, -@@ -11067,7 +11097,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11024,7 +11054,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -282,16 +291,16 @@ {"tab-organization", flag_descriptions::kTabOrganizationName, flag_descriptions::kTabOrganizationDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kTabOrganization)}, -@@ -11123,7 +11153,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11072,7 +11102,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)}, #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"supervised-profile-hide-guest", - flag_descriptions::kSupervisedProfileHideGuestName, - flag_descriptions::kSupervisedProfileHideGuestDescription, -@@ -11393,7 +11423,7 @@ const FeatureEntry kFeatureEntries[] = { + {"supervised-profile-safe-search", + flag_descriptions::kSupervisedProfileSafeSearchName, + flag_descriptions::kSupervisedProfileSafeSearchDescription, +@@ -11316,7 +11346,7 @@ const FeatureEntry kFeatureEntries[] = { segmentation_platform::features::kSegmentationSurveyPage)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -300,7 +309,7 @@ {"autofill-enable-buy-now-pay-later-for-affirm", flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName, flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription, -@@ -11522,7 +11552,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11445,7 +11475,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, @@ -309,7 +318,7 @@ {"translation-api", flag_descriptions::kTranslationAPIName, flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI, -@@ -11548,7 +11578,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11482,7 +11512,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kPasswordFormClientsideClassifier)}, @@ -318,3 +327,12 @@ {"contextual-cueing", flag_descriptions::kContextualCueingName, flag_descriptions::kContextualCueingDescription, kOsLinux | kOsMac | kOsWin, +@@ -11776,7 +11806,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsMac | kOsWin | kOsLinux, + FEATURE_VALUE_TYPE(switches::kEnableSnackbarInSettings)}, + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName, + flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux, + FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)}, diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc index 7d6d29161c48..95234ce02940 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -1,15 +1,15 @@ ---- chrome/browser/browser_features.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/browser_features.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/browser_features.cc -@@ -71,7 +71,7 @@ BASE_FEATURE(kCertVerificationNetworkTime, +@@ -82,7 +82,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode, + "ContentUsesBrowserThemeColorMode", base::FEATURE_DISABLED_BY_DEFAULT); - #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables usage of os_crypt_async::SecretPortalKeyProvider. Once // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be // disabled without losing data. -@@ -87,7 +87,7 @@ BASE_FEATURE(kDbusSecretPortal, +@@ -104,7 +104,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -228,7 +228,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -237,7 +237,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_browser__features.h b/www/chromium/files/patch-chrome_browser_browser__features.h index cd3a18317782..fcd411f95c5a 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.h +++ b/www/chromium/files/patch-chrome_browser_browser__features.h @@ -1,20 +1,20 @@ ---- chrome/browser/browser_features.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/browser_features.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/browser_features.h -@@ -37,7 +37,7 @@ BASE_DECLARE_FEATURE(kBookmarkTriggerForPrerender2); - BASE_DECLARE_FEATURE(kCertificateTransparencyAskBeforeEnabling); - BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); +@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); + + BASE_DECLARE_FEATURE(kContentUsesBrowserThemeColorMode); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kDbusSecretPortal); + BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider); #endif - -@@ -102,7 +102,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed +@@ -101,7 +101,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kSecretPortalKeyProviderUseForEncryption); + BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProviderForEncryption); #endif - diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 677682e2bc25..f7ac35900048 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,15 +1,15 @@ ---- chrome/browser/browser_process_impl.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/browser_process_impl.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/browser_process_impl.cc -@@ -254,7 +254,7 @@ +@@ -259,7 +259,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_features.h" - #include "components/os_crypt/async/browser/secret_portal_key_provider.h" - #endif -@@ -1121,7 +1121,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim + #include "components/os_crypt/async/browser/fallback_linux_key_provider.h" + #include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h" +@@ -1135,7 +1135,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); @@ -18,8 +18,8 @@ os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1387,7 +1387,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { - features::kUseAppBoundEncryptionProviderForEncryption)))); +@@ -1405,7 +1405,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { + local_state()))); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) @@ -27,7 +27,7 @@ if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) { providers.emplace_back( /*precedence=*/10u, -@@ -1637,7 +1637,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1672,7 +1672,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index c4a36d984ada..4f06fa26d298 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/browser_process_impl.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/browser_process_impl.h -@@ -405,7 +405,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -413,7 +413,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index eaf00e643bde..0caf26068990 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,39 +1,24 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -126,12 +126,12 @@ +@@ -126,7 +126,7 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || 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" - #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 "ui/webui/resources/cr_components/app_management/app_management.mojom.h" -@@ -220,7 +220,7 @@ - #endif // BUILDFLAG(IS_ANDROID) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/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" -@@ -230,7 +230,7 @@ - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) +@@ -137,7 +137,7 @@ + #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/whats_new/whats_new_ui.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - -@@ -736,7 +736,7 @@ void BindMediaFoundationPreferences( +@@ -693,7 +693,7 @@ void BindMediaFoundationPreferences( #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -42,7 +27,7 @@ void BindScreenAIAnnotator( content::RenderFrameHost* frame_host, mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) { -@@ -883,7 +883,7 @@ void PopulateChromeFrameBinders( +@@ -833,7 +833,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -51,16 +36,16 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -977,7 +977,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -927,7 +927,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -988,7 +988,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -938,7 +938,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -69,7 +54,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); -@@ -1075,14 +1075,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -1025,14 +1025,14 @@ void PopulateChromeWebUIFrameBinders( page_image_service::mojom::PageImageServiceHandler, HistoryUI, HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); @@ -86,8 +71,8 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1609,7 +1609,7 @@ void PopulateChromeWebUIFrameBinders( - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -1566,7 +1566,7 @@ void PopulateChromeWebUIFrameBinders( + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index d49cdb3adb6f..1b4f1a97ba17 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -84,7 +84,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 7353a0941f77..b11e79808e2e 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -504,7 +504,7 @@ +@@ -508,7 +508,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,8 +9,8 @@ #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) -@@ -616,11 +616,11 @@ - #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" +@@ -620,11 +620,11 @@ + #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -23,7 +23,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -631,7 +631,7 @@ +@@ -635,7 +635,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -32,7 +32,7 @@ #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" -@@ -640,7 +640,7 @@ +@@ -644,7 +644,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -41,7 +41,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS) -@@ -649,7 +649,7 @@ +@@ -653,7 +653,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" -@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1537,7 +1537,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -59,7 +59,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1745,7 +1745,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS) main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( is_integration_test, &startup_data_); @@ -68,7 +68,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1781,7 +1781,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1774,7 +1774,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 +77,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1798,7 +1798,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1791,7 +1791,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); #endif @@ -86,7 +86,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1817,7 +1817,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1810,7 +1810,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,7 +95,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2694,7 +2694,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2692,7 +2692,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -105,7 +105,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2703,7 +2705,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2701,7 +2703,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -114,7 +114,7 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -3049,7 +3051,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3057,7 +3059,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -123,7 +123,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4897,7 +4899,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4902,7 +4904,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -132,7 +132,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5409,7 +5411,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5421,7 +5423,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -141,7 +141,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5426,7 +5428,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5438,7 +5440,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -150,7 +150,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5465,7 +5467,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5477,7 +5479,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -159,7 +159,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7374,7 +7376,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7388,7 +7390,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 1b09a0d03c38..b1fc88e95160 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -545,7 +545,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -550,7 +550,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc index b1c38165fe99..ab635411cd56 100644 --- a/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc -@@ -83,7 +83,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo +@@ -100,7 +100,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo // This configuration object allows us to control platform specific behavior. MessagingBackendConfiguration configuration; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_component__updater_registration.cc b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc index afeff7c37fd8..5ba16ed824b3 100644 --- a/www/chromium/files/patch-chrome_browser_component__updater_registration.cc +++ b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/component_updater/registration.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/component_updater/registration.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/component_updater/registration.cc @@ -101,7 +101,7 @@ #endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) @@ -9,7 +9,16 @@ #include "components/component_updater/installer_policies/amount_extraction_heuristic_regexes_component_installer.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -251,7 +251,7 @@ void RegisterComponentsForUpdate() { +@@ -114,7 +114,7 @@ + #include "chrome/browser/component_updater/lacros_component_remover.h" + #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) + #include "chrome/browser/component_updater/wasm_tts_engine_component_installer.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -258,12 +258,12 @@ void RegisterComponentsForUpdate() { RegisterCookieReadinessListComponent(cus); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,3 +27,9 @@ RegisterAmountExtractionHeuristicRegexesComponent(cus); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (features::IsWasmTtsComponentUpdaterEnabled()) { + RegisterWasmTtsEngineComponent(cus); + } diff --git a/www/chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc new file mode 100644 index 000000000000..c8c13a7c805a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc @@ -0,0 +1,20 @@ +--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc +@@ -8,7 +8,7 @@ + #include "base/functional/callback.h" + #include "base/logging.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 "ui/accessibility/accessibility_features.h" +@@ -69,7 +69,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR + VLOG(1) << "Component ready, version " << version.GetString() << " in " + << install_dir.value(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (features::IsWasmTtsComponentUpdaterEnabled()) { + EmbeddedA11yExtensionLoader::GetInstance()->Init(); + EmbeddedA11yExtensionLoader::GetInstance()->InstallExtensionWithIdAndPath( diff --git a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index e301fc8bd2d4..95814f3d15a2 100644 --- a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc -@@ -46,7 +46,7 @@ +@@ -41,7 +41,7 @@ #include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" -@@ -79,7 +79,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: +@@ -73,7 +73,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: const char ImageLoaderComponentName[] = "WidevineCdm"; #endif @@ -18,7 +18,7 @@ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. As a result there is no need to register the CDM // with Chrome as it can't be used until Chrome is restarted. -@@ -107,7 +107,7 @@ void RegisterWidevineCdmWithChrome(const base::Version +@@ -101,7 +101,7 @@ void RegisterWidevineCdmWithChrome(const base::Version } #endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) @@ -27,12 +27,12 @@ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. To locate the Widevine CDM at startup, a hint file // is used. Update the hint file with the new Widevine CDM path. -@@ -401,7 +401,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat +@@ -394,7 +394,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat return; } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version; // This is running on a thread that allows IO, so simply update the hint file. diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index e25c9323135a..b1f1d5ffadb7 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1842,7 +1842,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1858,7 +1858,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(); } -@@ -1985,7 +1985,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1994,7 +1994,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()) { -@@ -2067,7 +2067,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -2076,7 +2076,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index ed867d9471af..945383043a0c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/download/download_commands.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/download/download_commands.cc -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -165,7 +165,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -177,7 +177,7 @@ void DownloadCommands::ExecuteCommand(Command command) } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 7f329c3a8fd4..7b19fd23a52d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/download/download_item_model.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/download/download_item_model.cc @@ -760,7 +760,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1194,7 +1194,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1196,7 +1196,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc index ac419799b579..88aa9eb4e0ec 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/common.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/enterprise/connectors/common.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/enterprise/connectors/common.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #include "components/policy/core/common/policy_loader_lacros.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -266,7 +266,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -199,7 +199,7 @@ std::string GetProfileEmail(Profile* profile) { std::string email = GetProfileEmail(IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index 24a1e448a879..1969c3c6790d 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -509,7 +509,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -507,7 +507,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index f706ed4d94a8..e7c8811a3e6d 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,17 +1,17 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -21,7 +21,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "components/policy/core/common/management/management_service.h" +@@ -24,7 +24,7 @@ + #include "chrome/browser/enterprise/connectors/connectors_service.h" + #endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/enterprise/core/dependency_factory_impl.h" -@@ -58,7 +58,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P - enterprise_signals::ContextInfoFetcher::CreateInstance( +@@ -64,7 +64,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); + #endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index eea255884d98..af7965b9f406 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2023-10-11 18:22:24 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" #endif -@@ -67,7 +67,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -74,7 +74,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return CreateInstanceInternal(); } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc index a8bec3b7befe..7936196a4d32 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc @@ -4,12 +4,23 @@ @@ -21,9 +21,9 @@ +#include <net/if_dl.h> +#endif + + #include <algorithm> #include <string> - #include "base/environment.h" @@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() { // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. diff --git a/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc new file mode 100644 index 000000000000..0c7c653dc7c6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/enterprise/util/managed_browser_utils.cc +@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile + .GetProfileAttributesWithPath(profile->GetPath()); + if (entry) { + entry->SetUserAcceptedAccountManagement(accepted); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + entry->SetEnterpriseProfileLabel(GetEnterpriseLabel(profile)); + #endif + } diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 86e7f20aeef3..ed33cbd86f08 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1418,6 +1418,10 @@ source_set("extensions") { +@@ -1398,6 +1398,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc deleted file mode 100644 index 9c3781ae8cdb..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2025-02-19 07:43:18 UTC -+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -51,7 +51,7 @@ - #include "pdf/buildflags.h" - #endif // BUILDFLAG(ENABLE_EXTENSIONS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" - #endif - -@@ -123,7 +123,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt - extensions::SettingsPrivateEventRouterFactory::GetInstance(); - extensions::SettingsOverridesAPI::GetFactoryInstance(); - extensions::SidePanelService::GetFactoryInstance(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - extensions::SystemIndicatorManagerFactory::GetInstance(); - #endif - extensions::TabGroupsEventRouterFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 5d64f0b6bb34..0e61fb151a08 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,7 +9,7 @@ #include <optional> #include "base/strings/string_util.h" -@@ -160,7 +160,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -157,7 +157,7 @@ api::enterprise_reporting_private::ContextInfo ToConte } bool AllowClientCertificateReportingForUsers() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled( enterprise_signals::features::kAllowClientCertificateReportingForUsers); #else -@@ -173,7 +173,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin +@@ -170,7 +170,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin return pref && pref->IsManaged(); } @@ -27,7 +27,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -235,7 +235,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -232,7 +232,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -36,7 +36,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -673,7 +673,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -672,7 +672,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 58f5c097e8d2..94e200529eb7 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -645,7 +645,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -634,7 +634,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 1450ae481e6d..6f91a483eff7 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -293,7 +293,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 3f93fd6a743e..491da8dd13dd 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -190,7 +190,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = settings_api::PrefType::kBoolean; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,7 +8,7 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = settings_api::PrefType::kBoolean; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] = @@ -210,7 +210,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 7007f8c7399c..6472f94c27ea 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -913,7 +913,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -918,7 +918,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc b/www/chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc index 158b210cf776..0e29da45b7f2 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc @@ -48,7 +48,7 @@ bool IsComponentExtensionAllowlisted(const std::string #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extension_misc::kTTSEngineExtensionId, + extension_misc::kComponentUpdaterTTSEngineExtensionId, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - }); -@@ -84,7 +84,7 @@ bool IsComponentExtensionAllowlisted(int manifest_reso +@@ -85,7 +85,7 @@ bool IsComponentExtensionAllowlisted(int manifest_reso case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST: case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3: case IDR_READING_MODE_GDOCS_HELPER_MANIFEST: diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 9d18fdb38536..50cde597158e 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,7 +1,7 @@ ---- chrome/browser/flag_descriptions.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/flag_descriptions.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/flag_descriptions.cc -@@ -492,7 +492,7 @@ const char kAutofillDisableLocalCardMigrationDescripti - "from checkout flows and from the payment methods settings page."; +@@ -521,7 +521,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB + "Autofill suggestions on the allowlisted merchant websites."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ const char kAutofillEnableAmountExtractionDesktopName[] = "Enable checkout amount extraction on Chrome desktop"; const char kAutofillEnableAmountExtractionDesktopDescription[] = -@@ -501,7 +501,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr +@@ -530,7 +530,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -1038,7 +1038,7 @@ const char kCompressionDictionaryTransportRequireKnown +@@ -1049,7 +1049,7 @@ const char kCompressionDictionaryTransportRequireKnown "when the connection is using a well known root cert or when the server is " "a localhost."; @@ -36,7 +36,7 @@ const char kContextualCueingName[] = "Contextual cueing"; const char kContextualCueingDescription[] = "Enables the contextual cueing system to support showing actions"; -@@ -2222,7 +2222,7 @@ const char kContextualPageActionsShareModelDescription +@@ -2228,7 +2228,7 @@ const char kContextualPageActionsShareModelDescription "Enables share model data collection."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,8 +45,8 @@ const char kEnableSearchAggregatorPolicyName[] = "Enable EnterpriseSearchAggregatorSettings policy"; const char kEnableSearchAggregatorPolicyDescription[] = -@@ -3541,7 +3541,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] - "but in the same SiteInstanceGroup, and thus the same process."; +@@ -3520,7 +3520,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = + "SiteInstance."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -54,7 +54,7 @@ const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing"; const char kPwaNavigationCapturingDescription[] = "Enables opening links from Chrome in an installed PWA. Currently under " -@@ -3785,7 +3785,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ +@@ -3758,7 +3758,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ "Force the Translate Triggering on English pages experiment to be enabled " "with the selected language model active."; @@ -63,7 +63,16 @@ const char kTranslationAPIName[] = "Experimental translation API"; const char kTranslationAPIDescription[] = "Enables the on-device language translation API. " -@@ -7491,7 +7491,7 @@ const char kTetheringExperimentalFunctionalityDescript +@@ -5404,7 +5404,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes + "Enables a mitigation during web app install on CrOS for syncing " + "user_display_mode: kStandalone to non-CrOS devices."; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + const char kWasmTtsComponentUpdaterEnabledName[] = + "Enable Wasm TTS Extension Component"; + const char kWasmTtsComponentUpdaterEnabledDescription[] = +@@ -7441,7 +7441,7 @@ const char kTetheringExperimentalFunctionalityDescript #endif // BUILDFLAG(IS_CHROMEOS) @@ -72,7 +81,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7721,7 +7721,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b +@@ -7671,7 +7671,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- @@ -81,7 +90,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7767,6 +7767,18 @@ const char kWaylandUiScalingDescription[] = +@@ -7717,6 +7717,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."; @@ -100,7 +109,7 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -7779,7 +7791,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7729,7 +7741,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -109,7 +118,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7805,7 +7817,7 @@ const char kTaskManagerDesktopRefreshDescription[] = +@@ -7762,7 +7774,7 @@ const char kTaskManagerDesktopRefreshDescription[] = "Enables a refreshed design for the Task Manager on Desktop platforms."; #endif // BUILDFLAG(IS_ANDROID) @@ -118,7 +127,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7837,7 +7849,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7794,7 +7806,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -127,7 +136,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7987,7 +7999,7 @@ const char kElementCaptureDescription[] = +@@ -7944,7 +7956,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -136,7 +145,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8043,7 +8055,7 @@ const char kComposeUpfrontInputModesDescription[] = +@@ -8000,7 +8012,7 @@ const char kComposeUpfrontInputModesDescription[] = "Enables upfront input modes in the Compose dialog"; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -145,7 +154,7 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8178,7 +8190,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = +@@ -8133,7 +8145,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = "Enable the OS settings for overlay scrollbars on ChromeOS."; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index c83e07cb4c50..019abace10ed 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,7 +1,7 @@ ---- chrome/browser/flag_descriptions.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/flag_descriptions.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/flag_descriptions.h -@@ -310,13 +310,13 @@ extern const char kAutofillDisableLocalCardMigrationNa - extern const char kAutofillDisableLocalCardMigrationDescription[]; +@@ -331,13 +331,13 @@ extern const char + kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -16,16 +16,16 @@ extern const char kAutofillEnableBuyNowPayLaterForAffirmName[]; extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[]; -@@ -558,7 +558,7 @@ extern const char kCompactModeId[]; - extern const char kCompactModeName[]; - extern const char kCompactModeDescription[]; +@@ -560,7 +560,7 @@ extern const char kCanvasOopRasterizationDescription[] + extern const char kCapturedSurfaceControlName[]; + extern const char kCapturedSurfaceControlDescription[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kContextualCueingName[]; extern const char kContextualCueingDescription[]; #endif // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -741,7 +741,7 @@ extern const char kDevicePostureName[]; +@@ -735,7 +735,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -33,8 +33,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -1250,7 +1250,7 @@ extern const char kContextualPageActionsShareModelName + +@@ -1247,7 +1247,7 @@ extern const char kContextualPageActionsShareModelName extern const char kContextualPageActionsShareModelDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -43,8 +43,8 @@ extern const char kEnableSearchAggregatorPolicyName[]; extern const char kEnableSearchAggregatorPolicyDescription[]; #endif -@@ -2036,7 +2036,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] - extern const char kSiteInstanceGroupsForDataUrlsDescription[]; +@@ -2026,7 +2026,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; + extern const char kDefaultSiteInstanceGroupsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -52,7 +52,7 @@ extern const char kPwaNavigationCapturingName[]; extern const char kPwaNavigationCapturingDescription[]; #endif -@@ -2202,7 +2202,7 @@ extern const char kTouchTextEditingRedesignDescription +@@ -2189,7 +2189,7 @@ extern const char kTouchTextEditingRedesignDescription extern const char kTranslateForceTriggerOnEnglishName[]; extern const char kTranslateForceTriggerOnEnglishDescription[]; @@ -61,7 +61,16 @@ extern const char kTranslationAPIName[]; extern const char kTranslationAPIDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -4373,7 +4373,7 @@ extern const char kTetheringExperimentalFunctionalityD +@@ -3156,7 +3156,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio + extern const char kUserDisplayModeSyncStandaloneMitigationName[]; + extern const char kUserDisplayModeSyncStandaloneMitigationDescription[]; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kWasmTtsComponentUpdaterEnabledName[]; + extern const char kWasmTtsComponentUpdaterEnabledDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +@@ -4358,7 +4358,7 @@ extern const char kTetheringExperimentalFunctionalityD #endif // #if BUILDFLAG(IS_CHROMEOS) @@ -70,7 +79,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4508,7 +4508,7 @@ extern const char kEnableArmHwdrmDescription[]; +@@ -4493,7 +4493,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- @@ -79,7 +88,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4536,6 +4536,9 @@ extern const char kWaylandTextInputV3Description[]; +@@ -4521,6 +4521,9 @@ extern const char kWaylandTextInputV3Description[]; extern const char kWaylandUiScalingName[]; extern const char kWaylandUiScalingDescription[]; @@ -89,7 +98,7 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -4555,7 +4558,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4540,7 +4543,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -98,7 +107,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4571,7 +4574,7 @@ extern const char kScreenlockReauthCardDescription[]; +@@ -4556,7 +4559,7 @@ extern const char kScreenlockReauthCardDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -107,7 +116,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4585,7 +4588,7 @@ extern const char kTaskManagerDesktopRefreshName[]; +@@ -4570,7 +4573,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -116,7 +125,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4682,7 +4685,7 @@ extern const char kElementCaptureDescription[]; +@@ -4667,7 +4670,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -125,7 +134,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4724,7 +4727,7 @@ extern const char kComposeUpfrontInputModesName[]; +@@ -4709,7 +4712,7 @@ extern const char kComposeUpfrontInputModesName[]; extern const char kComposeUpfrontInputModesDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -134,7 +143,7 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4805,7 +4808,7 @@ extern const char kEnablePolicyPromotionBannerName[]; +@@ -4790,7 +4793,7 @@ extern const char kEnablePolicyPromotionBannerName[]; extern const char kEnablePolicyPromotionBannerDescription[]; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc b/www/chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc index 55d37ad8b20e..25e9e9343bd1 100644 --- a/www/chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc +++ b/www/chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc @@ -1,11 +1,29 @@ ---- chrome/browser/glic/launcher/glic_status_icon.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/glic/launcher/glic_status_icon.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/glic/launcher/glic_status_icon.cc -@@ -30,7 +30,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control - // TODO(crbug.com/382287104): Use correct icon. - // TODO(crbug.com/386839488): Chose color based on system theme. - gfx::ImageSkia status_tray_icon = gfx::CreateVectorIcon(kGlicButtonIcon, +@@ -84,7 +84,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control + if (!status_icon_) { + return; + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - SK_ColorWHITE - #else - SK_ColorBLACK + // Set a vector icon for proper themeing on Linux. + status_icon_->SetIcon( + GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON)); +@@ -108,7 +108,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control + GlicStatusIcon::~GlicStatusIcon() { + context_menu_ = nullptr; + if (status_icon_) { +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + status_icon_->RemoveObserver(this); + #endif + std::unique_ptr<StatusIcon> removed_icon = +@@ -196,7 +196,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)); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_EXIT, + l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_EXIT)); + #endif diff --git a/www/chromium/files/patch-chrome_browser_global__features.cc b/www/chromium/files/patch-chrome_browser_global__features.cc index b4d55a5f6df9..e32b00245293 100644 --- a/www/chromium/files/patch-chrome_browser_global__features.cc +++ b/www/chromium/files/patch-chrome_browser_global__features.cc @@ -1,4 +1,4 @@ ---- chrome/browser/global_features.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/global_features.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/global_features.cc @@ -21,7 +21,7 @@ #include "chrome/browser/glic/launcher/glic_background_mode_manager.h" // nogncheck @@ -18,7 +18,7 @@ whats_new_registry_ = CreateWhatsNewRegistry(); #endif -@@ -79,7 +79,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( +@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( return system_permission_settings::PlatformHandle::Create(); } diff --git a/www/chromium/files/patch-chrome_browser_global__features.h b/www/chromium/files/patch-chrome_browser_global__features.h index f7b681695f8a..77061e3b363d 100644 --- a/www/chromium/files/patch-chrome_browser_global__features.h +++ b/www/chromium/files/patch-chrome_browser_global__features.h @@ -1,4 +1,4 @@ ---- chrome/browser/global_features.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/global_features.h.orig 2025-03-05 08:14:56 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 -@@ -52,7 +52,7 @@ class GlobalFeatures { +@@ -55,7 +55,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(); } -@@ -77,7 +77,7 @@ class GlobalFeatures { +@@ -80,7 +80,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 -@@ -87,7 +87,7 @@ class GlobalFeatures { +@@ -90,7 +90,7 @@ class GlobalFeatures { std::unique_ptr<system_permission_settings::PlatformHandle> system_permissions_platform_handle_; diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index 93812d34bd93..639f940efa96 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc -@@ -4,7 +4,11 @@ +@@ -9,7 +9,11 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" @@ -12,7 +12,7 @@ #include <string.h> #include <sys/ioctl.h> #include <sys/socket.h> -@@ -19,6 +23,7 @@ namespace media_router { +@@ -24,6 +28,7 @@ namespace media_router { bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); @@ -20,7 +20,7 @@ base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); if (!ioctl_socket.is_valid()) { // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there -@@ -41,6 +46,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: +@@ -46,6 +51,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: ssid_out->assign(ssid); return true; } diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 7e6757faf316..a661736fb182 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -106,7 +106,7 @@ std::string GetLogUploadProduct() { +@@ -108,7 +108,7 @@ std::string GetLogUploadProduct() { const char product[] = "Chrome_Mac"; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 6dbca4311b52..a1fe6a50fccd 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,7 +1,7 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -197,11 +197,11 @@ - #include "chrome/notification_helper/notification_helper_constants.h" +@@ -201,11 +201,11 @@ + #include "chrome/browser/metrics/google_update_metrics_provider_mac.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -14,7 +14,7 @@ #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif -@@ -215,7 +215,7 @@ +@@ -219,7 +219,7 @@ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #endif @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/bluetooth_metrics_provider.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -538,7 +538,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -542,7 +542,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -32,7 +32,7 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -729,7 +729,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -733,7 +733,7 @@ void ChromeMetricsServiceClient::Initialize() { std::make_unique<metrics::dwa::DwaService>(this, local_state); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -41,7 +41,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -787,7 +787,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -791,7 +791,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -50,7 +50,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -883,7 +883,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -59,7 +59,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -979,7 +979,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -992,7 +992,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -68,7 +68,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1166,7 +1166,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1179,7 +1179,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -77,7 +77,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1515,7 +1515,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1528,7 +1528,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); diff --git a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index d32c9fb36402..4bda612a27c0 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -147,7 +147,7 @@ CPUIdentity GetCPUIdentity() { +@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); diff --git a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc index 480dbcd128a5..348deb04c9ab 100644 --- a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,7 +1,7 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -145,7 +145,7 @@ - #include "chromeos/startup/browser_params_proxy.h" +@@ -134,7 +134,7 @@ + #include "extensions/common/constants.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -272,7 +272,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet +@@ -261,7 +261,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,10 +18,10 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -1224,7 +1224,7 @@ ProfileNetworkContextService::CreateClientCertStore() - store = std::make_unique<ClientCertStoreLacros>( - std::move(certificate_provider), cert_db_initializer, std::move(store)); - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -1202,7 +1202,7 @@ ProfileNetworkContextService::CreateClientCertStore() + std::make_unique<net::ClientCertStoreNSS>( + base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate, + kCryptoModulePasswordClientAuth)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return GetWrappedCertStore(profile_, std::move(store)); diff --git a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc index 952b69ca0ae2..fdc23610089e 100644 --- a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service_factory.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/net/profile_network_context_service_factory.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/net/profile_network_context_service_factory.cc -@@ -23,7 +23,7 @@ +@@ -24,7 +24,7 @@ #include "chrome/browser/net/server_certificate_database_service_factory.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #endif -@@ -66,7 +66,7 @@ ProfileNetworkContextServiceFactory::ProfileNetworkCon +@@ -68,7 +68,7 @@ ProfileNetworkContextServiceFactory::ProfileNetworkCon #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) DependsOn(net::ServerCertificateDatabaseServiceFactory::GetInstance()); #endif diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index ab58cf1dfd48..dc178047e2f9 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,15 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -102,7 +102,7 @@ - - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "chrome/common/chrome_paths_internal.h" - #include "chrome/grit/branded_strings.h" - #include "ui/base/l10n/l10n_util.h" -@@ -146,7 +146,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +9,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -154,7 +154,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +18,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -200,7 +200,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +27,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +36,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -225,7 +225,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +45,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -267,11 +267,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +59,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -287,7 +287,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +68,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -531,7 +531,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -520,7 +520,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +77,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -589,7 +589,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -578,7 +578,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +86,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -603,7 +603,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -592,7 +592,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,16 +95,16 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -674,7 +674,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -657,7 +657,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, + std::string()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -699,11 +699,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -682,11 +682,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -127,7 +118,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -756,7 +756,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)); @@ -136,7 +127,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -975,7 +975,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -958,7 +958,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } diff --git a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc index 48644913ca0d..f800cdd52988 100644 --- a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc +++ b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/new_tab_page/new_tab_page_util.cc -@@ -25,7 +25,7 @@ bool IsOsSupportedForCart() { +@@ -28,7 +28,7 @@ bool IsOsSupportedForCart() { } bool IsOsSupportedForDrive() { diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 8ec86918d6f5..f9722e503303 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -629,7 +629,7 @@ void ChromePasswordManagerClient:: +@@ -637,7 +637,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; } -@@ -894,7 +894,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -915,7 +915,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc index 04fc4b5be79a..6c505faf7cb0 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/platform_util_linux.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/platform_util_linux.cc -@@ -222,7 +222,9 @@ void OnLaunchOptionsCreated(const std::string& command +@@ -303,7 +303,9 @@ void OnLaunchOptionsCreated(const std::string& command argv.push_back(command); argv.push_back(arg); options.current_directory = working_directory; diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index de1bd950738f..c2fbd14b8c12 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -253,19 +253,19 @@ +@@ -253,7 +253,7 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -9,7 +9,8 @@ #include "chrome/browser/enterprise/idle/action.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -264,12 +264,12 @@ + #endif // BUILDFLAG(ENABLE_GLIC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) @@ -23,7 +24,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) -@@ -279,13 +279,13 @@ +@@ -283,13 +283,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -39,7 +40,7 @@ #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) || -@@ -580,7 +580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -590,7 +590,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, @@ -48,7 +49,7 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -961,7 +961,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -57,7 +58,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -948,7 +948,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -970,7 +970,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -66,7 +67,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1788,7 +1788,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1810,7 +1810,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -75,7 +76,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1847,7 +1847,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1869,7 +1869,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -84,7 +85,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1873,12 +1873,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1895,12 +1895,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -99,7 +100,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1911,7 +1911,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -108,7 +109,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1923,7 +1923,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 +118,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -2002,7 +2002,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2024,7 +2024,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -126,7 +127,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2107,7 +2107,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2129,7 +2129,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -135,7 +136,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2181,7 +2181,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2203,7 +2203,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +145,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2210,7 +2210,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2232,7 +2232,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -153,7 +154,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2250,7 +2250,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2272,7 +2272,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,7 +163,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2276,7 +2276,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -171,7 +172,7 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2432,7 +2432,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2484,7 +2484,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -180,7 +181,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2448,7 +2448,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2500,7 +2500,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -189,8 +190,8 @@ handlers->AddHandler( std::make_unique<SearchAggregatorPolicyHandler>(chrome_schema)); handlers->AddHandler( -@@ -2655,7 +2655,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - #endif // BUILDFLAG(IS_ANDROID) +@@ -2713,7 +2713,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) @@ -198,7 +199,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2708,7 +2708,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2766,7 +2766,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -207,7 +208,7 @@ handlers->AddHandler(std::make_unique<GuestModePolicyHandler>()); handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); -@@ -2800,7 +2800,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2852,7 +2852,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) || \ @@ -216,7 +217,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -3167,7 +3167,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3219,7 +3219,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -225,7 +226,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3175,7 +3175,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3227,7 +3227,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -234,7 +235,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3193,7 +3193,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3245,7 +3245,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -243,7 +244,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3216,7 +3216,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3268,7 +3268,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -252,7 +253,7 @@ handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -3234,7 +3234,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3286,7 +3286,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> gen_ai_default_policies; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 546887b40f84..f1680e2f72e5 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,7 +1,7 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -315,7 +315,7 @@ - #include "components/user_notes/user_notes_prefs.h" +@@ -318,7 +318,7 @@ + #include "components/ntp_tiles/custom_links_manager_impl.h" #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -485,18 +485,18 @@ +@@ -488,18 +488,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -531,7 +531,7 @@ +@@ -534,7 +534,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -40,7 +40,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1819,7 +1819,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1749,7 +1749,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) @@ -49,7 +49,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1990,7 +1990,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1920,7 +1920,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -58,7 +58,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2354,12 +2354,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2285,12 +2285,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 2faa052d5949..d011c1d64732 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -209,7 +209,7 @@ const char* const kPersistentPrefNames[] = { +@@ -203,7 +203,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index a3cbe35be936..25bc48a53032 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -346,7 +346,7 @@ +@@ -354,7 +354,7 @@ #include "chrome/browser/profiles/gaia_info_update_service_factory.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -436,18 +436,18 @@ +@@ -443,18 +443,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,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" -@@ -559,7 +559,7 @@ +@@ -564,7 +564,7 @@ #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -40,7 +40,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_observer_factory.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -732,7 +732,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -49,21 +49,31 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -834,7 +834,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - enterprise_connectors::ConnectorsServiceFactory::GetInstance(); +@@ -791,7 +791,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + commerce::ShoppingServiceFactory::GetInstance(); + ConsentAuditorFactory::GetInstance(); + ContentIndexProviderFactory::GetInstance(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + contextual_cueing::ContextualCueingServiceFactory::GetInstance(); #endif + CookieControlsServiceFactory::GetInstance(); +@@ -842,7 +842,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #endif + enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -842,25 +842,25 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -850,26 +850,26 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) && \ ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(ENTERPRISE_LOCAL_CONTENT_ANALYSIS) enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -89,7 +99,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -988,7 +988,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -997,7 +997,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) MerchantViewerDataManagerFactory::GetInstance(); #endif @@ -97,8 +107,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif - NavigationPredictorKeyedServiceFactory::GetInstance(); -@@ -1100,7 +1100,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if !BUILDFLAG(IS_ANDROID) +@@ -1113,7 +1113,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -107,7 +117,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1147,7 +1147,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1159,7 +1159,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -116,16 +126,16 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1166,7 +1166,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #endif +@@ -1179,7 +1179,7 @@ void ChromeBrowserMainExtraPartsProfiles:: ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); + regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance(); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1355,7 +1355,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1368,7 +1368,7 @@ void ChromeBrowserMainExtraPartsProfiles:: WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index b7f6588d5a56..e97c5af61f73 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,7 +1,7 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -267,6 +267,10 @@ - #include "chrome/browser/spellchecker/spellcheck_service.h" +@@ -270,6 +270,10 @@ + #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif +#if BUILDFLAG(IS_BSD) @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -591,7 +595,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -594,7 +598,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async policy_provider = GetUserCloudPolicyManagerAsh(); #else // !BUILDFLAG(IS_CHROMEOS) { @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -887,7 +891,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -892,7 +896,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__manager.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__manager.cc new file mode 100644 index 000000000000..8bdf454a63e6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/profiles/profile_manager.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/profiles/profile_manager.cc +@@ -1500,7 +1500,7 @@ void ProfileManager::DoFinalInitForServices(Profile* p + // Ensure PreloadingModelKeyedService is started. + PreloadingModelKeyedServiceFactory::GetForProfile(profile); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + contextual_cueing::ContextualCueingServiceFactory::GetForProfile(profile); + #endif + diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 53fda794231f..3a29a1dca29f 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2024-11-14 07:57:23 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -190,7 +190,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -188,7 +188,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -9,21 +9,21 @@ DCHECK(local_state); // Check if guest mode enforcement commandline switch or policy are provided. -@@ -226,7 +226,7 @@ bool IsGuestModeEnabled() { +@@ -224,7 +224,7 @@ bool IsGuestModeEnabled() { return false; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // If there are any supervised profiles, disable guest mode. - if (base::FeatureList::IsEnabled( - supervised_user::kHideGuestModeForSupervisedUsers) && -@@ -245,7 +245,7 @@ bool IsGuestModeEnabled() { + if (std::ranges::any_of(g_browser_process->profile_manager() + ->GetProfileAttributesStorage() +@@ -240,7 +240,7 @@ bool IsGuestModeEnabled() { } bool IsGuestModeEnabled(const Profile& profile) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - supervised_user::kHideGuestModeForSupervisedUsers)) { - ProfileAttributesEntry* profile_attributes = + ProfileAttributesEntry* profile_attributes = + g_browser_process->profile_manager() + ->GetProfileAttributesStorage() diff --git a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc new file mode 100644 index 000000000000..bdee9dee0344 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc @@ -0,0 +1,29 @@ +--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc +@@ -8,7 +8,7 @@ + #include "base/strings/string_util.h" + #include "components/country_codes/country_codes.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/variations/service/variations_service.h" + #endif + +@@ -20,7 +20,7 @@ + #endif + + namespace regional_capabilities { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + RegionalCapabilitiesServiceClient::RegionalCapabilitiesServiceClient( + variations::VariationsService* variations_service) +@@ -56,7 +56,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId + base::android::AttachCurrentThread(), + reinterpret_cast<intptr_t>(heap_callback.release())); + } +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void RegionalCapabilitiesServiceClient::FetchCountryId( + CountryIdCallback on_country_id_fetched) { + std::move(on_country_id_fetched).Run(variations_country_id_); diff --git a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h new file mode 100644 index 000000000000..96cd8c09366b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h @@ -0,0 +1,20 @@ +--- chrome/browser/regional_capabilities/regional_capabilities_service_client.h.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/regional_capabilities/regional_capabilities_service_client.h +@@ -21,7 +21,7 @@ namespace regional_capabilities { + class RegionalCapabilitiesServiceClient + : public RegionalCapabilitiesService::Client { + public: +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + explicit RegionalCapabilitiesServiceClient( + variations::VariationsService* variations_service); + #else +@@ -35,7 +35,7 @@ class RegionalCapabilitiesServiceClient + void FetchCountryId(CountryIdCallback country_id_fetched_callback) override; + + private: +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const int variations_country_id_; + #endif + }; diff --git a/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc new file mode 100644 index 000000000000..11f11df7ae7b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc +@@ -12,7 +12,7 @@ + #include "chrome/browser/regional_capabilities/regional_capabilities_service_client.h" + #include "components/regional_capabilities/regional_capabilities_service.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/variations/service/variations_service.h" + #endif + +@@ -57,7 +57,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan + Profile* profile = Profile::FromBrowserContext(context); + auto regional_capabilities_service_client = + std::make_unique<RegionalCapabilitiesServiceClient>( +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + g_browser_process->variations_service() + #endif + ); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index d0c8bae12604..ac0e47ea0c69 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -176,7 +176,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -181,7 +181,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -199,7 +199,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -204,7 +204,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index 94bd23b0e797..74c1434d94af 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #include "net/base/url_util.h" #include "third_party/abseil-cpp/absl/types/variant.h" @@ -9,12 +9,3 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -451,7 +451,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil - Profile* profile, - const enterprise_connectors::AnalysisSettings& settings) { - // Local content analysis is supported only on desktop platforms. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (settings.cloud_or_local_settings.is_cloud_analysis()) { - return CloudBinaryUploadServiceFactory::GetForProfile(profile); - } else { diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc new file mode 100644 index 000000000000..8d14509fa596 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc +@@ -12,7 +12,7 @@ + #include "content/public/browser/web_contents.h" + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/browser_window/public/browser_window_features.h" + #include "chrome/browser/ui/toasts/api/toast_id.h" +@@ -59,7 +59,7 @@ SafeBrowsingPrefChangeHandler::~SafeBrowsingPrefChange + void SafeBrowsingPrefChangeHandler:: + MaybeShowEnhancedProtectionSettingChangeNotification() { + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (!profile_ || + !base::FeatureList::IsEnabled(safe_browsing::kEsbAsASyncedSetting)) { + return; diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_safe__browsing__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_safe__browsing__service.cc deleted file mode 100644 index e7cbb48b9fa3..000000000000 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_safe__browsing__service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/safe_browsing/safe_browsing_service.cc.orig 2025-02-19 07:43:18 UTC -+++ chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -83,7 +83,7 @@ - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/browser_window/public/browser_window_features.h" - #include "chrome/browser/ui/toasts/api/toast_id.h" -@@ -572,7 +572,7 @@ void SafeBrowsingServiceImpl::EnhancedProtectionPrefCh - void SafeBrowsingServiceImpl::MaybeShowEnhancedProtectionSettingChangeToast( - Profile* profile) { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (!base::FeatureList::IsEnabled(safe_browsing::kEsbAsASyncedSetting) || - !profile) { - return; diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc index 5475e488665a..efd628397ce7 100644 --- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc +++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc @@ -1,4 +1,4 @@ ---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-11-14 07:57:23 UTC +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/screen_ai/screen_ai_install_state.cc @@ -16,7 +16,7 @@ #include "services/screen_ai/public/cpp/utilities.h" @@ -10,7 +10,7 @@ #include "base/files/file_util.h" #endif @@ -26,7 +26,7 @@ const int kScreenAICleanUpDelayInDays = 30; - const char kMinExpectedVersion[] = "124.2"; + const char kMinExpectedVersion[] = "127.9"; bool IsDeviceCompatible() { -#if BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index d860c1353f2f..f5c2ca5b3c28 100644 --- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-12-11 13:49:08 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -318,7 +318,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -316,7 +316,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())}; -@@ -332,7 +332,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -330,7 +330,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc index 378205100a82..66de594700c5 100644 --- a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/sessions/session_restore.cc -@@ -102,7 +102,7 @@ +@@ -100,7 +100,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1138,7 +1138,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1121,7 +1121,7 @@ class SessionRestoreImpl : public BrowserListObserver bool is_first_tab = true; for (const auto& startup_tab : startup_tabs) { const GURL& url = startup_tab.url; diff --git a/www/chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc b/www/chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc index 7c0e204ffbea..292919c994f5 100644 --- a/www/chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc +++ b/www/chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/accounts_policy_manager.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/signin/accounts_policy_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/signin/accounts_policy_manager.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "chrome/browser/ui/webui/profile_helper.h" #endif @@ -9,7 +9,7 @@ #include "components/policy/core/common/features.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -208,7 +208,7 @@ void AccountsPolicyManager::Initialize() { +@@ -209,7 +209,7 @@ void AccountsPolicyManager::Initialize() { &AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged, weak_pointer_factory_.GetWeakPtr())); @@ -18,7 +18,7 @@ auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_); identity_manager_observation_.Observe(identity_manager); profile_pref_change_registrar_.Init(profile_->GetPrefs()); -@@ -223,7 +223,7 @@ void AccountsPolicyManager::Initialize() { +@@ -224,7 +224,7 @@ void AccountsPolicyManager::Initialize() { } void AccountsPolicyManager::Shutdown() { @@ -27,7 +27,7 @@ profile_pref_change_registrar_.RemoveAll(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) local_state_pref_registrar_.RemoveAll(); -@@ -340,7 +340,7 @@ void AccountsPolicyManager::OnUserConfirmedProfileDele +@@ -341,7 +341,7 @@ void AccountsPolicyManager::OnUserConfirmedProfileDele } #endif // defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc index 4dd4c1641baf..3ced814d493b 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc @@ -1,11 +1,20 @@ ---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-02-19 07:43:18 UTC +--- 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 -@@ -218,7 +218,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu - case SupervisedUserNavigationThrottle::kCancelWithInterstitial: { +@@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& stream, + } + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool ShouldShowReAuthInterstitial( + content::NavigationHandle& navigation_handle) { + Profile* profile = Profile::FromBrowserContext( +@@ -230,7 +230,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu + } + case InterstitialResultCallbackActions::kCancelWithInterstitial: { CHECK(navigation_handle()); - // LINT.IfChange(cancel_with_interstitial) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (ShouldShowReAuthInterstitial(*navigation_handle(), is_main_frame)) { + if (ShouldShowReAuthInterstitial(*navigation_handle())) { // Show the re-authentication interstitial if the user signed out of // the content area, as parent's approval requires authentication. diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index 3b414ea1e0b3..1e43c4457ab2 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc @@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -471,7 +471,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index f3bbb0e7c3db..d5817248aa74 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc @@ -34,12 +34,12 @@ #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" @@ -15,7 +15,7 @@ namespace { bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) { if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) { -@@ -162,7 +162,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc +@@ -161,7 +161,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc deleted file mode 100644 index 255b9036219e..000000000000 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2025-02-19 07:43:18 UTC -+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc -@@ -208,7 +208,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR - case kCancelWithInterstitial: { - CHECK(navigation_handle()); - // LINT.IfChange(cancel_with_interstitial) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (supervised_user::ShouldShowReAuthInterstitial(*navigation_handle(), - is_main_frame)) { - // Show the re-authentication interstitial if the user signed out of -@@ -239,7 +239,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR - } - - namespace supervised_user { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - - bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle, - bool is_main_frame) { diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h deleted file mode 100644 index 2f12955fcffe..000000000000 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_throttle.h.orig 2024-11-14 07:57:23 UTC -+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.h -@@ -22,7 +22,7 @@ - class Profile; - - namespace supervised_user { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle, - bool is_main_frame); - #endif diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index e35acf9baf58..c2f191e6e3fa 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -41,7 +41,7 @@ const int kBackgroundRefreshTypesMask = +@@ -36,7 +36,7 @@ const int kBackgroundRefreshTypesMask = #if BUILDFLAG(IS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_NACL) -@@ -126,7 +126,7 @@ TaskGroup::TaskGroup( +@@ -117,7 +117,7 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -18,7 +18,7 @@ open_fd_count_(-1), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) idle_wakeups_per_second_(-1), -@@ -145,7 +145,7 @@ TaskGroup::TaskGroup( +@@ -132,7 +132,7 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -27,7 +27,7 @@ base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -324,7 +324,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -302,7 +302,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 87e0c02326ba..7e00f7b85976 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -41,7 +41,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -152,7 +152,7 @@ class TaskGroup { +@@ -144,7 +144,7 @@ class TaskGroup { } #endif // BUILDFLAG(ENABLE_NACL) @@ -18,7 +18,7 @@ int open_fd_count() const { return open_fd_count_; } void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -172,7 +172,7 @@ class TaskGroup { +@@ -164,7 +164,7 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -27,7 +27,7 @@ void OnOpenFdCountRefreshDone(int open_fd_count); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -244,7 +244,7 @@ class TaskGroup { +@@ -235,7 +235,7 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index d3437192df38..5f2e5a908260 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -46,7 +46,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -9,7 +9,7 @@ const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority) -@@ -56,7 +56,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -18,7 +18,7 @@ on_open_fd_count_callback_(on_open_fd_count), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) on_process_priority_callback_(on_process_priority) { -@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -27,7 +27,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -36,7 +36,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -153,7 +153,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -152,7 +152,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 1f5adb010432..72bf7ecb0049 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -226,7 +226,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -227,7 +227,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index ebad4c342d23..c31a1c12a19f 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -50,7 +50,7 @@ enum RefreshType { +@@ -46,7 +46,7 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc index ffee5be5e763..fc8fb599d72d 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/themes/theme_service.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/themes/theme_service.cc -@@ -70,7 +70,7 @@ +@@ -71,7 +71,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 500f9ea3c578..2eabffd807f9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,9 +1,9 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -506,7 +506,7 @@ - IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ - E(kActionContentContextQuickAnswersInlineQuery, \ - IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) +@@ -492,7 +492,7 @@ + #if BUILDFLAG(IS_CHROMEOS) + #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ + E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc index c1f36b8c300d..964cb88fd096 100644 --- a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc +++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-01-15 09:18:26 UTC +--- 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 -@@ -49,7 +49,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { +@@ -57,7 +57,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) } -@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -142,7 +142,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h index b150946495b8..731ddf3e4496 100644 --- a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h +++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-01-15 09:18:26 UTC +--- 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 @@ -14,7 +14,7 @@ #include "components/autofill/core/browser/payments/payments_window_manager.h" @@ -18,7 +18,7 @@ public BrowserListObserver, #endif // BUILDFLAG(IS_LINUX) public content::WebContentsObserver { -@@ -58,7 +58,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi +@@ -59,7 +59,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi content::NavigationHandle* navigation_handle) override; void WebContentsDestroyed() override; @@ -27,9 +27,9 @@ // BrowserListObserver: void OnBrowserSetLastActive(Browser* browser) override; #endif // BUILDFLAG(IS_LINUX) -@@ -136,7 +136,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi - std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl> - payments_window_user_consent_dialog_controller_; +@@ -161,7 +161,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_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h index b13b80ed33cc..6817880469e2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/browser.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/browser.h -@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver, +@@ -300,7 +300,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 06cb2a663c1d..403072868f7b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -126,7 +126,7 @@ #include "components/user_manager/user_manager.h" @@ -27,25 +27,16 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -580,7 +580,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo - - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - case IDC_MINIMIZE_WINDOW: - browser_->window()->Minimize(); - break; -@@ -592,7 +592,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -575,7 +575,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - case IDC_USE_SYSTEM_TITLE_BAR: { - PrefService* prefs = profile()->GetPrefs(); - prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -798,7 +798,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + case IDC_MINIMIZE_WINDOW: + browser_->window()->Minimize(); + break; +@@ -790,7 +790,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); @@ -54,7 +45,7 @@ chrome::CreateDesktopShortcutForActiveWebContents(browser_); #else web_app::CreateWebAppFromCurrentWebContents( -@@ -970,7 +970,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -957,7 +957,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) case IDC_CHROME_WHATS_NEW: #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ @@ -63,22 +54,16 @@ ShowChromeWhatsNew(browser_); break; #else -@@ -1285,12 +1285,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1264,7 +1264,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 - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); - #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool use_system_title_bar = true; - #if BUILDFLAG(IS_OZONE) - use_system_title_bar = ui::OzonePlatform::GetInstance() -@@ -1634,7 +1634,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1614,7 +1614,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc index 3ce5610bff9b..23edc09fb493 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2033,7 +2033,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -1995,7 +1995,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index 66aaab440052..691f6afd796a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry +@@ -71,7 +71,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, base::Time()); @@ -9,7 +9,7 @@ registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser, -@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index b86b58a46dcd..ccf3a53e5f9d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -15,7 +15,7 @@ +@@ -14,7 +14,7 @@ namespace { @@ -9,7 +9,7 @@ bool GetCustomFramePrefDefault() { #if BUILDFLAG(IS_OZONE) return ui::OzonePlatform::GetInstance() -@@ -31,7 +31,7 @@ bool GetCustomFramePrefDefault() { +@@ -30,7 +30,7 @@ bool GetCustomFramePrefDefault() { void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 2240944f9649..17315a7f1243 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -88,7 +88,7 @@ +@@ -85,7 +85,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -383,7 +383,7 @@ void ShowChromeTips(Browser* browser) { +@@ -379,7 +379,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,9 +18,9 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -735,7 +735,7 @@ void ShowShortcutCustomizationApp(Profile* profile, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h index 0b4d2caca763..0d2fd1d22305 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/chrome_pages.h @@ -39,7 +39,7 @@ namespace signin { enum class ConsentLevel; @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -175,7 +175,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profile* profile, const std::string& category); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc index 66f2a68736cb..453b21e66d0e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/managed_ui.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/managed_ui.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/managed_ui.cc -@@ -442,7 +442,7 @@ std::optional<std::string> GetDeviceManagerIdentity() +@@ -433,7 +433,7 @@ std::optional<std::string> GetDeviceManagerIdentity() g_browser_process->platform_part()->browser_policy_connector_ash(); return connector->GetEnterpriseDomainManager(); #else @@ -9,7 +9,7 @@ if (base::FeatureList::IsEnabled( features::kEnterpriseManagementDisclaimerUsesCustomLabel)) { std::string custom_management_label = -@@ -481,7 +481,7 @@ std::optional<std::string> GetAccountManagerIdentity(P +@@ -463,7 +463,7 @@ std::optional<std::string> GetAccountManagerIdentity(P return std::nullopt; } diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index c06a814490f0..093dfeaa8af2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1976,7 +1976,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1985,7 +1985,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { return omnibox::kShareMacChromeRefreshIcon; #elif BUILDFLAG(IS_WIN) return omnibox::kShareWinChromeRefreshIcon; diff --git a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 940c2437a8aa..ae8dc06d3ec7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-02-19 07:43:18 UTC +--- 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 -@@ -99,7 +99,7 @@ namespace { +@@ -102,7 +102,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; -@@ -539,7 +539,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -549,7 +549,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 33723e9e0c89..fb3c0d7c6f5b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -489,7 +489,7 @@ void SigninViewController::ShowModalManagedUserNoticeD +@@ -412,7 +412,7 @@ void SigninViewController::ShowModalSyncConfirmationDi + void SigninViewController::ShowModalManagedUserNoticeDialog( std::unique_ptr<signin::EnterpriseProfileCreationDialogParams> create_param) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) CloseModalSignin(); dialog_ = std::make_unique<SigninModalDialogImpl>( SigninViewControllerDelegate::CreateManagedUserNoticeDelegate( diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h index 7f6fa6668ffe..2494d5bc28a7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-11-14 07:57:23 UTC +--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/signin/signin_view_controller_delegate.h -@@ -85,7 +85,7 @@ class SigninViewControllerDelegate { - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -79,7 +79,7 @@ class SigninViewControllerDelegate { + base::OnceCallback<void(ChromeSignoutConfirmationChoice)> callback); + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Returns a platform-specific SigninViewContolllerDelegate instance that // displays the managed user notice modal dialog. The returned object // should delete itself when the window it's managing is closed. diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 60aed658cce6..47184f9ca13f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -231,7 +231,7 @@ +@@ -222,7 +222,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,12 +9,12 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -690,12 +690,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -672,12 +672,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc b/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc index 410f0a4ed427..964df9050b2b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/features.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -59,7 +59,7 @@ bool CanShowTabSearchPositionSetting() { +@@ -53,7 +53,7 @@ bool CanShowTabSearchPositionSetting() { } // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. diff --git a/www/chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc b/www/chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc new file mode 100644 index 000000000000..92996c165205 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/ui/tabs/tab_dialog_manager.cc +@@ -83,7 +83,7 @@ bool SupportsGlobalScreenCoordinates() { + } + + bool PlatformClipsChildrenToViewport() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc index 169000a0895c..330721cdd694 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/tabs/tab_strip_prefs.cc -@@ -20,7 +20,7 @@ namespace tabs { +@@ -21,7 +21,7 @@ namespace tabs { bool GetDefaultTabSearchRightAligned() { // These platforms are all left aligned, the others should be right. diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h index 5a7d8a49059f..6bca2d88332b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.h.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.h -@@ -278,7 +278,7 @@ inline constexpr std::array kColumns = { +@@ -277,7 +277,7 @@ inline constexpr std::array kColumns = { .default_visibility = false}, #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index ea79ff6c4259..3fe38d85c282 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc @@ -527,7 +527,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -891,7 +891,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -895,7 +895,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc index 90163ad92783..72099c90af15 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/test/test_browser_ui.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/test/test_browser_ui.cc -@@ -22,7 +22,7 @@ +@@ -19,7 +19,7 @@ + #include "ui/views/widget/widget.h" + #endif - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "content/public/common/content_switches.h" #include "ui/base/test/skia_gold_matching_algorithm.h" -@@ -39,7 +39,7 @@ + #include "ui/compositor/compositor.h" +@@ -33,7 +33,7 @@ + #endif + // TODO(crbug.com/40625383) support Mac for pixel tests. - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define SUPPORTS_PIXEL_TEST #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc index b7401847fe2d..fa3edb5635c6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/ui_features.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/ui_features.cc -@@ -90,7 +90,7 @@ bool IsExtensionMenuInRootAppMenu() { +@@ -74,7 +74,7 @@ bool IsExtensionMenuInRootAppMenu() { return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu); } @@ -9,16 +9,7 @@ // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -264,7 +264,7 @@ BASE_FEATURE(kTabOrganizationAppMenuItem, - base::FEATURE_ENABLED_BY_DEFAULT); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kMultiTabOrganization, - "MultiTabOrganization", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -412,7 +412,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, +@@ -382,7 +382,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h index b98e4b13cd77..c4ef9801d6bf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/ui_features.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/ui_features.h -@@ -68,7 +68,7 @@ extern const base::FeatureParam<bool> kAppMenuChipColo +@@ -52,7 +52,7 @@ extern const base::FeatureParam<int> kMaxPromptCount; BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu); bool IsExtensionMenuInRootAppMenu(); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -244,7 +244,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); +@@ -229,7 +229,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 315bb7409e49..3877c0f4eb56 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -68,11 +68,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -67,11 +67,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -100,7 +100,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -152,7 +152,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -151,7 +151,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index e0469fc54c39..d276aedacb47 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2368,7 +2368,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating +@@ -2489,7 +2489,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index b47b7fb14232..4afa491636ee 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -62,7 +62,7 @@ #include "ui/aura/window.h" @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -584,7 +584,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -649,7 +649,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,7 +36,7 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -800,7 +800,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -873,7 +873,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); } @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -880,7 +880,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -962,7 +962,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1171,7 +1171,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1253,7 +1253,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1326,7 +1326,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1408,7 +1408,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1344,7 +1344,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1426,7 +1426,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS) return gfx::Insets(kResizeBorder); -@@ -1365,7 +1365,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1447,7 +1447,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 047e419139ae..5cf5eb1c7d60 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -28,7 +28,7 @@ +@@ -30,7 +30,7 @@ #include "ui/views/layout/flex_layout_view.h" #include "ui/views/widget/widget_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -88,7 +88,7 @@ class PictureInPictureBrowserFrameView +@@ -90,7 +90,7 @@ class PictureInPictureBrowserFrameView void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -18,7 +18,7 @@ gfx::Insets RestoredMirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -180,7 +180,7 @@ class PictureInPictureBrowserFrameView +@@ -182,7 +182,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; @@ -27,7 +27,7 @@ // Returns whether a client-side shadow should be drawn for the window. bool ShouldDrawFrameShadow() const; -@@ -351,7 +351,7 @@ class PictureInPictureBrowserFrameView +@@ -391,7 +391,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 0f2f78fd9d67..66c2c09231f7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -72,7 +72,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -70,7 +70,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER_CONTEXT_MENU, IDS_TASK_MANAGER); } @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -164,7 +164,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -158,7 +158,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc index cccf0f03544f..b7620c85eb93 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -231,7 +231,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr +@@ -227,7 +227,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr new_tab_button_->GetViewAccessibility().SetName( l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB)); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index d057568cfef5..d28eedd23ba3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -2054,7 +2054,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -2063,7 +2063,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc index 426280219e93..d267263ec21e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc @@ -42,7 +42,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -158,7 +158,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -172,7 +172,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create } else if (model_state == password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { view = new SharedPasswordsNotificationView(web_contents, anchor_view); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc index bb92c45c7f4f..48b5adecb2d7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -90,7 +90,7 @@ +@@ -91,7 +91,7 @@ #include "ui/strings/grit/ui_strings.h" #include "ui/views/accessibility/view_accessibility.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -558,7 +558,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { +@@ -563,7 +563,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { case signin_util::SignedInState::kSignedOut: case signin_util::SignedInState::kWebOnlySignedIn: { std::string profile_user_display_name, profile_user_email; @@ -18,7 +18,7 @@ profile_user_display_name = profile->GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserDisplayName); profile_user_email = profile->GetPrefs()->GetString( -@@ -660,7 +660,7 @@ void ProfileMenuView::BuildIdentity() { +@@ -669,7 +669,7 @@ void ProfileMenuView::BuildIdentity() { badge_image_model, menu_title_, menu_subtitle_, management_label); } else { std::string profile_user_display_name, profile_user_email; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 9192e2ec2f15..49ff6e27f37c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -640,7 +640,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -642,7 +642,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder, /*has_dotted_ring=*/false); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 633d8e8f50f7..49ff23a5f64a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -58,7 +58,7 @@ +@@ -64,7 +64,7 @@ namespace { const int kModalDialogWidth = 448; @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; -@@ -180,7 +180,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -191,7 +191,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -339,7 +339,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -370,7 +370,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone)); @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -429,7 +429,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -460,7 +460,7 @@ void SigninViewControllerDelegateViews::DisplayModal() content_view_->RequestFocus(); } @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -505,7 +505,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -536,7 +536,7 @@ SigninViewControllerDelegate::CreateSignoutConfirmatio } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 01f1da72d6ce..67f5c0ac039b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews - bool show_supervised_user_iph = false); +@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews + base::OnceCallback<void(ChromeSignoutConfirmationChoice)> callback); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -138,7 +138,7 @@ class SigninViewControllerDelegateViews +@@ -141,7 +141,7 @@ class SigninViewControllerDelegateViews std::optional<int> dialog_width, InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc index 9bdbeaa18eb2..8cd87ad4ab03 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc @@ -1,14 +1,14 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2025-02-19 07:43:18 UTC -+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -213,7 +213,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc +@@ -212,7 +212,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + VLOG(1) << __func__ << " image size=" << image.size().ToString(); aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); - if (aura::client::GetDragDropClient(root_window)) { @@ -415,7 +415,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash @@ -18,7 +18,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -990,7 +990,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1004,7 +1004,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon SetCapture(target_context); } @@ -27,7 +27,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2058,7 +2058,7 @@ void TabDragController::CompleteDrag() { +@@ -2137,7 +2137,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -36,7 +36,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2532,7 +2532,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2616,7 +2616,7 @@ TabDragController::Liveness TabDragController::GetLoca } } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index fafe5bd490b0..cf307f1859b4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -633,7 +633,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -632,7 +632,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc index ee89bc423aa5..7e4ffe10adf9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc -@@ -84,7 +84,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow +@@ -96,7 +96,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged, base::Unretained(this)))); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index b30689f55cf3..9cee96a947f8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -552,7 +552,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con +@@ -528,7 +528,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con if (!IsHoverAnimationActive()) { return base_opacity; } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index bee0625e1692..56b7a3891030 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -893,7 +893,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -889,7 +889,7 @@ void MaybeRegisterChromeFeaturePromos( "defaulted to saved for the first time."))); } @@ -9,7 +9,7 @@ // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1134,7 +1134,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1143,7 +1143,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered to inform users of the availability of the " "new translate screen feature on the Lens Overlay."))); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index 1bca7a642b98..7578cb205247 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -504,7 +504,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -510,7 +510,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2051,7 +2051,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2057,7 +2057,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3371,7 +3371,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3377,7 +3377,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3386,7 +3386,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3392,7 +3392,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -36,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3396,7 +3396,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3402,7 +3402,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3412,7 +3412,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3418,7 +3418,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4232,7 +4232,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4242,7 +4242,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4432,7 +4432,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4442,7 +4442,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override().IsShortcutCreated(profile, id, name); -@@ -4476,7 +4476,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4486,7 +4486,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index 2f1fb988758d..b22497d44d7f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about/about_ui.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/about/about_ui.cc -@@ -500,7 +500,7 @@ std::string ChromeURLs(content::BrowserContext* browse +@@ -496,7 +496,7 @@ std::string ChromeURLs(content::BrowserContext* browse return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -542,7 +542,7 @@ TermsUIConfig::TermsUIConfig() +@@ -538,7 +538,7 @@ TermsUIConfig::TermsUIConfig() : AboutUIConfigBase(chrome::kChromeUITermsHost) {} #endif @@ -18,7 +18,7 @@ LinuxProxyConfigUI::LinuxProxyConfigUI() : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {} #endif -@@ -594,7 +594,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -590,7 +590,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc index 14b630f4f18b..33b4bd9f04ea 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc -@@ -216,7 +216,7 @@ CertificateManagerPageHandler::GetCertSource( +@@ -221,7 +221,7 @@ CertificateManagerPageHandler::GetCertSource( CERTIFICATE_TRUST_TYPE_DISTRUSTED, profile_, &remote_client_); break; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index 7005917d22d4..91334a38941c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc @@ -54,7 +54,7 @@ #include "net/ssl/client_cert_store_mac.h" @@ -9,16 +9,16 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto +@@ -174,7 +174,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto }; #endif --#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader( Profile* profile) { #if BUILDFLAG(IS_WIN) -@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC +@@ -189,7 +189,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC } #endif @@ -27,25 +27,25 @@ // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -350,7 +350,7 @@ class ClientCertSource : public CertificateManagerPage +@@ -347,7 +347,7 @@ class ClientCertSource : public CertificateManagerPage std::optional<net::CertificateList> certs_; }; --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // ChromeOS currently can use either Kcer or NSS for listing client certs, and // Linux uses NSS only. This interface provides an abstraction to hide that // from WritableClientCertSource. Currently this class only handles reading -@@ -1057,7 +1057,7 @@ CreatePlatformClientCertSource( +@@ -1078,7 +1078,7 @@ CreatePlatformClientCertSource( mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>* remote_client, Profile* profile) { --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<WritableClientCertSource>(remote_client, profile); #else return std::make_unique<ClientCertSource>( -@@ -1065,7 +1065,7 @@ CreatePlatformClientCertSource( +@@ -1086,7 +1086,7 @@ CreatePlatformClientCertSource( #endif } @@ -54,7 +54,7 @@ std::unique_ptr<CertificateManagerPageHandler::CertSource> CreateProvisionedClientCertSource(Profile* profile) { return std::make_unique<ClientCertSource>( -@@ -1116,7 +1116,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow +@@ -1135,7 +1135,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow return client_cert_policy_ == ClientCertificateManagementPermission::kAll; } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h index d9cc36c7d50a..7b28c8bc727e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2025-01-15 09:18:26 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h @@ -19,7 +19,7 @@ CreatePlatformClientCertSource( remote_client, @@ -13,8 +13,8 @@ CreateExtensionsClientCertSource(Profile* profile); #endif --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class ClientCertManagementAccessControls { public: enum KeyStorage { diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index 8cb1212b8bf7..275a5710c277 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -140,26 +140,26 @@ +@@ -137,26 +137,26 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif // BUILDFLAG(IS_WIN) @@ -19,11 +19,11 @@ // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_ASH) + // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -31,16 +31,16 @@ #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -190,7 +190,7 @@ +@@ -184,7 +184,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_ui.h" - #endif // !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) + #endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() { +@@ -318,7 +318,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>()); #endif // BUILDFLAG(IS_ANDROID) @@ -49,7 +49,7 @@ map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_OPENBSD) -@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() { +@@ -343,7 +343,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>()); #endif // BUILDFLAG(IS_WIN) @@ -58,7 +58,7 @@ map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>()); map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>()); map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>()); -@@ -356,20 +356,20 @@ void RegisterChromeWebUIConfigs() { +@@ -351,13 +351,13 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -69,16 +69,8 @@ // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - map.AddWebUIConfig( - std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_ASH) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig( + std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>()); map.AddWebUIConfig(std::make_unique<DiscardsUIConfig>()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index 9514a849e450..75db072939d8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -75,7 +75,7 @@ +@@ -74,7 +74,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif @@ -9,16 +9,16 @@ #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" -@@ -400,7 +400,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa - kRequestUrl)); +@@ -407,7 +407,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa } + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr<SupervisedUserVerificationPageForYouTube> CreateSupervisedUserVerificationPageForYouTube( content::WebContents* web_contents, -@@ -621,7 +621,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -634,7 +634,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 10c234cb687b..c7049b168afb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -173,11 +173,11 @@ void ManagementUI::GetLocalizedStrings( +@@ -175,11 +175,11 @@ void ManagementUI::GetLocalizedStrings( IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index 0dd7bb9eeff1..8cfe7622ce14 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -58,7 +58,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -348,7 +348,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -359,7 +359,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } @@ -18,7 +18,7 @@ auto device_signal_data = GetDeviceSignalGrantedMessage(); if (!device_signal_data.empty()) { report_sources->Append(std::move(device_signal_data)); -@@ -370,7 +370,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -381,7 +381,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } @@ -27,7 +27,7 @@ auto device_signal_data = GetDeviceSignalGrantedMessage(); if (!device_signal_data.empty()) { report_sources->Append(std::move(device_signal_data)); -@@ -550,7 +550,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -567,7 +567,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 0dccbdf3d6d5..ba45d7233ad7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -34,7 +34,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -33,7 +33,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseTheme, base::Unretained(this), ui::SystemTheme::kDefault)); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 6e6771c2b7d4..bfa08627d588 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -141,7 +141,7 @@ - #include "chrome/browser/ui/chrome_pages.h" +@@ -137,7 +137,7 @@ + #include "chrome/browser/ui/webui/settings/system_handler.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -160,7 +160,7 @@ +@@ -156,7 +156,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -563,7 +563,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -581,7 +581,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -571,7 +571,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -589,7 +589,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -595,7 +595,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -613,7 +613,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht html_source->AddBoolean("toolbarPinningEnabled", features::IsToolbarPinningEnabled()); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index 7af37da34649..fc265a94a542 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -198,7 +198,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr +@@ -164,7 +164,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name); if (AccountInfo::IsManaged(entry->GetHostedDomain())) { profile_entry.Set("avatarBadge", "cr:domain"); @@ -9,12 +9,3 @@ } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { -@@ -1066,7 +1066,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil - } - - void ProfilePickerHandler::MaybeUpdateGuestMode() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (!base::FeatureList::IsEnabled( - supervised_user::kHideGuestModeForSupervisedUsers)) { - return; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc index 612156aab530..d0e6ece9250f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc -@@ -45,7 +45,7 @@ +@@ -50,7 +50,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "net/base/url_util.h" -@@ -85,7 +85,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( +@@ -90,7 +90,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( } whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index e9143d8c3506..f3c3023dcaca 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -626,7 +626,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -657,7 +657,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc index 6f9edb67197c..a6bba21078ae 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -191,7 +191,7 @@ void ShortcutSubManager::Execute( +@@ -199,7 +199,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index 6927530b0768..9edd233cab54 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-11-14 07:57:23 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -106,7 +106,7 @@ namespace web_app { +@@ -107,7 +107,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 1abe074996c5..173f78e60aee 100644 --- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -631,7 +631,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -636,7 +636,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc index 2365581ffb38..2d6fed302802 100644 --- a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -686,7 +686,7 @@ base::flat_set<GaiaId> GetGaiaIDs( +@@ -710,7 +710,7 @@ base::flat_set<GaiaId> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return label; #else return std::string("placeholder"); -@@ -696,7 +696,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -720,7 +720,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 24580c938eed..18454fd664bb 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/common/chrome_features.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/common/chrome_features.cc @@ -75,7 +75,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -226,7 +226,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -220,7 +220,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -252,7 +252,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -246,7 +246,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -788,7 +788,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -817,7 +817,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -801,7 +801,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -830,7 +830,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 35c4019ceff8..14a6a40ad826 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2025-02-19 07:43:18 UTC +--- chrome/common/chrome_features.h.orig 2025-03-05 08:14:56 UTC +++ chrome/common/chrome_features.h @@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -155,7 +155,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -153,7 +153,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -465,7 +465,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -500,7 +500,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -473,7 +473,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -508,7 +508,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index f91a479a43bb..5b2c889de074 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/common/chrome_switches.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/common/chrome_switches.cc -@@ -892,7 +892,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -888,7 +888,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,8 +9,8 @@ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. -@@ -908,7 +908,7 @@ const char kGlicGuestURL[] = "glic-guest-url"; - const char kCSPOverride[] = "glic-webui-csp-override"; +@@ -906,7 +906,7 @@ const char kGlicAlwaysOpenFre[] = "glic-always-open-fr + const char kGlicFreURL[] = "glic-fre-url"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index b0192dd2e203..21a8eb964d9f 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2025-02-19 07:43:18 UTC +--- chrome/common/chrome_switches.h.orig 2025-03-05 08:14:56 UTC +++ chrome/common/chrome_switches.h -@@ -278,7 +278,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -275,7 +275,7 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,8 +9,8 @@ extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; extern const char kForceNtpMobilePromo[]; -@@ -289,7 +289,7 @@ extern const char kGlicGuestURL[]; - extern const char kCSPOverride[]; +@@ -288,7 +288,7 @@ extern const char kGlicAlwaysOpenFre[]; + extern const char kGlicFreURL[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_common_crash__keys.cc b/www/chromium/files/patch-chrome_common_crash__keys.cc index 261c8800bce9..d5a485f66da9 100644 --- a/www/chromium/files/patch-chrome_common_crash__keys.cc +++ b/www/chromium/files/patch-chrome_common_crash__keys.cc @@ -1,6 +1,6 @@ ---- chrome/common/crash_keys.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/common/crash_keys.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/common/crash_keys.cc -@@ -56,7 +56,9 @@ class CrashKeyWithName { +@@ -52,7 +52,9 @@ class CrashKeyWithName { ~CrashKeyWithName() = delete; std::string_view Name() const { return name_; } @@ -10,7 +10,7 @@ void Clear() { crash_key_.Clear(); } void Set(std::string_view value) { crash_key_.Set(value); } -@@ -201,6 +203,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ +@@ -197,6 +199,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ GetCommandLineStringAnnotations().emplace_back(std::string(key)).Set(value); } @@ -18,7 +18,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::CommandLine* command_line) { std::string string_annotations; for (const auto& crash_key : GetCommandLineStringAnnotations()) { -@@ -212,6 +215,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co +@@ -211,6 +214,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co } command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations); } diff --git a/www/chromium/files/patch-chrome_common_extensions_extension__constants.cc b/www/chromium/files/patch-chrome_common_extensions_extension__constants.cc index c5867693f238..98552f827a7c 100644 --- a/www/chromium/files/patch-chrome_common_extensions_extension__constants.cc +++ b/www/chromium/files/patch-chrome_common_extensions_extension__constants.cc @@ -1,4 +1,4 @@ ---- chrome/common/extensions/extension_constants.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/common/extensions/extension_constants.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/common/extensions/extension_constants.cc @@ -46,7 +46,7 @@ const char* const kBuiltInFirstPartyExtensionIds[] = { #if !BUILDFLAG(IS_CHROMEOS_LACROS) @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) kTTSEngineExtensionId, + kComponentUpdaterTTSEngineExtensionId, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - nullptr, // Null-terminated array. diff --git a/www/chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/www/chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc index 80a2b15f15dd..e16c9458ccdf 100644 --- a/www/chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc +++ b/www/chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc @@ -1,7 +1,7 @@ ---- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc -@@ -285,7 +285,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId() - } +@@ -280,7 +280,7 @@ class USBDevicesFormatter : public ChromePermissionMes + int GetEnterpriseReportingPrivatePermissionMessageId() { #if BUILDFLAG(IS_WIN) return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN; -#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc index fcca44a4ae7e..9b4c23709ea1 100644 --- a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,4 +1,4 @@ ---- chrome/common/media/cdm_registration.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/common/media/cdm_registration.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/common/media/cdm_registration.cc @@ -33,7 +33,7 @@ #if BUILDFLAG(ENABLE_WIDEVINE) @@ -9,8 +9,8 @@ #include "base/native_library.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" -@@ -86,7 +86,7 @@ void ReportLacrosUMA(LacrosBundledWidevine value) { - +@@ -52,7 +52,7 @@ using Robustness = content::CdmInfo::Robustness; + #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -18,7 +18,7 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo( -@@ -131,7 +131,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid +@@ -97,7 +97,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ @@ -27,30 +27,30 @@ // On Linux/ChromeOS we have to preload the CDM since it uses the zygote // sandbox. On Windows and Mac, CDM registration is handled by Component // Update (as the CDM can be loaded only when needed). -@@ -185,7 +185,7 @@ std::unique_ptr<content::CdmInfo> GetAshBundledWidevin - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -121,7 +121,7 @@ std::unique_ptr<content::CdmInfo> GetBundledWidevine() + // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) - #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))) || \ -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))) // This code checks to see if Component Updater picked a version of the Widevine // CDM to be used last time it ran. (Component Updater may choose the bundled -@@ -232,7 +232,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd + // CDM if there is not a new version available for download.) If there is one +@@ -163,7 +163,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, kWidevineCdmType, base::Version(), base::FilePath()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) - base::Version glibc_version(gnu_get_libc_version()); - DCHECK(glibc_version.IsValid()); -@@ -493,7 +493,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd + // The Widevine CDM on Linux/ChromeOS needs to be registered (and loaded) + // before the zygote is locked down. The CDM can be found from the version + // bundled with Chrome (if BUNDLE_WIDEVINE_CDM = true) and/or the version +@@ -388,7 +388,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd } #if BUILDFLAG(ENABLE_WIDEVINE) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) std::vector<content::CdmInfo> GetSoftwareSecureWidevine() { std::vector<content::CdmInfo> cdms; AddSoftwareSecureWidevine(&cdms); diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index c970a21d277a..c37ad098d887 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2025-02-19 07:43:18 UTC +--- chrome/common/pref_names.h.orig 2025-03-05 08:14:56 UTC +++ chrome/common/pref_names.h -@@ -1356,7 +1356,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1340,7 +1340,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1533,7 +1533,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1517,7 +1517,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -2147,7 +2147,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2135,7 +2135,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2608,14 +2608,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2630,14 +2630,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2707,7 +2707,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ +@@ -2729,7 +2729,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ inline constexpr char kIsolatedWebAppPendingInitializationCount[] = "profile.isolated_web_app.install.pending_initialization_count"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3253,7 +3253,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3834,7 +3834,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo +@@ -3845,7 +3845,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -4030,7 +4030,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -4041,7 +4041,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +80,7 @@ // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4124,7 +4124,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4135,7 +4135,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 79467c281bc7..9879d634960f 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2025-02-19 07:43:18 UTC +--- chrome/common/url_constants.h.orig 2025-03-05 08:14:56 UTC +++ chrome/common/url_constants.h -@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -978,7 +978,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index fd00be055835..d85cc1cdab4b 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2025-02-19 07:43:18 UTC +--- chrome/common/webui_url_constants.h.orig 2025-03-05 08:14:56 UTC +++ chrome/common/webui_url_constants.h -@@ -497,18 +497,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome +@@ -508,18 +508,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -520,11 +520,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -531,11 +531,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,7 +36,7 @@ inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser"; -@@ -545,7 +545,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue +@@ -557,7 +557,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[ inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif diff --git a/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc index 00fb52ef84fd..c7f4870fe30d 100644 --- a/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc +++ b/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc @@ -1,6 +1,6 @@ ---- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2025-02-19 07:43:18 UTC +--- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/enterprise_companion/enterprise_companion_client.cc -@@ -37,7 +37,7 @@ namespace { +@@ -35,7 +35,7 @@ namespace { #if BUILDFLAG(IS_MAC) constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service"; diff --git a/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc b/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc new file mode 100644 index 000000000000..7310d42bf2af --- /dev/null +++ b/www/chromium/files/patch-chrome_enterprise__companion_event__logger.cc @@ -0,0 +1,11 @@ +--- chrome/enterprise_companion/event_logger.cc.orig 2025-03-05 08:14:56 UTC ++++ chrome/enterprise_companion/event_logger.cc +@@ -124,7 +124,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() { + metadata.set_application_arch(proto::ARM64); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + metadata.set_os_platform(proto::LINUX); + #elif BUILDFLAG(IS_MAC) + metadata.set_os_platform(proto::MAC); diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index 174970fe98b7..e3b3c4be436b 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2025-01-15 09:18:26 UTC +--- chrome/updater/configurator.cc.orig 2025-03-05 08:14:56 UTC +++ chrome/updater/configurator.cc -@@ -72,7 +72,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> +@@ -73,7 +73,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> return std::nullopt; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) }()) { diff --git a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc index 81b9e621b9b1..15ea9225c94c 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-02-19 07:43:18 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-03-05 08:14:56 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc -@@ -1150,7 +1150,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar +@@ -1168,7 +1168,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows, Mac, and Fuchsia. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ @@ -9,7 +9,7 @@ // This option should only be shown for users that have not enabled the Sync // Feature and that have server credit cards available. // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and -@@ -2005,7 +2005,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( +@@ -2021,7 +2021,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( bool PaymentsDataManager::AreBnplIssuersSupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc b/www/chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc index dd27c84737e8..b2c5626f1774 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig 2025-02-19 07:43:18 UTC +--- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig 2025-03-05 08:14:56 UTC +++ components/autofill/core/browser/integrators/autofill_optimization_guide.cc -@@ -185,7 +185,7 @@ void AutofillOptimizationGuide::OnDidParseForm( +@@ -211,7 +211,7 @@ void AutofillOptimizationGuide::OnDidParseForm( } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (has_credit_card_field && - !personal_data_manager.payments_data_manager() - .GetServerCreditCards() + if (!server_cards.empty() && + base::FeatureList::IsEnabled( + features::kAutofillEnableAmountExtractionDesktop)) { diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 9be3f7277029..59b8629c09b6 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,15 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2025-02-19 07:43:18 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2025-03-05 08:14:56 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -11,7 +11,7 @@ BASE_FEATURE(kAutofillDisableLocalCardMigration, - "AutofillDisableLocalCardMigration", - base::FEATURE_DISABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) - // When enabled, Chrome will extract the checkout amount from the checkout page - // of the allowlisted merchant websites. -@@ -322,7 +322,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -292,7 +292,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, #endif // BUILDFLAG(IS_ANDROID) bool ShouldShowImprovedUserConsentForCreditCardSave() { diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.h b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.h deleted file mode 100644 index 4ce6f0674621..000000000000 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/common/autofill_payments_features.h.orig 2025-01-15 09:18:26 UTC -+++ components/autofill/core/common/autofill_payments_features.h -@@ -17,7 +17,7 @@ COMPONENT_EXPORT(AUTOFILL) - BASE_DECLARE_FEATURE(kAutofillDisableLocalCardMigration); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(AUTOFILL) - BASE_DECLARE_FEATURE(kAutofillEnableAmountExtractionDesktop); - #endif diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc index b74c6be88a69..35f4f4d82c0f 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc @@ -1,4 +1,4 @@ ---- components/autofill/core/common/autofill_prefs.cc.orig 2025-02-19 07:43:18 UTC +--- components/autofill/core/common/autofill_prefs.cc.orig 2025-03-05 08:14:56 UTC +++ components/autofill/core/common/autofill_prefs.cc @@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif @@ -8,4 +8,22 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled, false); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + registry->RegisterBooleanPref( +@@ -294,7 +294,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void SetAutofillBnplEnabled(PrefService* prefs, bool value) { + prefs->SetBoolean(kAutofillBnplEnabled, value); + } +@@ -303,7 +303,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v + + bool IsAutofillBnplEnabled(const PrefService* prefs) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return prefs->GetBoolean(kAutofillBnplEnabled); + #else + return false; diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h index c1cd54418b32..4a35dfefabfd 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h @@ -1,6 +1,15 @@ ---- components/autofill/core/common/autofill_prefs.h.orig 2025-02-19 07:43:18 UTC +--- components/autofill/core/common/autofill_prefs.h.orig 2025-03-05 08:14:56 UTC +++ components/autofill/core/common/autofill_prefs.h -@@ -74,7 +74,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = +@@ -26,7 +26,7 @@ namespace autofill::prefs { + inline constexpr std::string_view kAutofillAblationSeedPref = + "autofill.ablation_seed"; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Boolean that is true if BNPL on Autofill is enabled. + inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -80,7 +80,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = inline constexpr char kAutofillPaymentCardBenefits[] = "autofill.payment_card_benefits"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,3 +18,12 @@ // Boolean that controls improved autofill filling predictions. When enabled, // the autofill functionality is enhanced with adopting user data to // the form being filled in, which is triggered by the user via an extra +@@ -235,7 +235,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, + bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void SetAutofillBnplEnabled(PrefService* prefs, bool value); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 414096f943cb..6f2a01695b4d 100644 --- a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,6 +1,6 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2025-02-19 07:43:18 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2025-03-05 08:14:56 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -165,7 +165,7 @@ BASE_FEATURE(kPriceInsights, +@@ -157,7 +157,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,16 +9,16 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -235,7 +235,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, - +@@ -218,7 +218,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page"; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::FeatureParam<bool> kDiscountOnShoppyPage{ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true}; #else -@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ +@@ -227,7 +227,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,16 +27,16 @@ BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, "EnableDiscountInfoApiRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -258,7 +258,7 @@ const char kHistoryClustersBehaviorParam[] = "history- - const char kMerchantWideBehaviorParam[] = "merchant-wide-behavior"; +@@ -242,7 +242,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting, "DiscountDialogAutoPopupBehaviorSetting", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -299,7 +299,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -283,7 +283,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc index 30f344873a7c..faa88c6fe635 100644 --- a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2025-02-19 07:43:18 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2025-03-05 08:14:56 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -371,7 +371,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -375,7 +375,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc b/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc index d6098350dd67..fbe55befab9f 100644 --- a/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc +++ b/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc @@ -1,7 +1,7 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2025-02-19 07:43:18 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2025-03-05 08:14:56 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -50,7 +50,7 @@ bool IsNewFunctionEnabled(NewEvFunction new_ev_functio - } +@@ -11,7 +11,7 @@ BASE_FEATURE(kAllowClientCertificateReportingForUsers, + base::FEATURE_ENABLED_BY_DEFAULT); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_device__signals_core_common_signals__features.h b/www/chromium/files/patch-components_device__signals_core_common_signals__features.h index 760248a56ebf..7b5218956a0e 100644 --- a/www/chromium/files/patch-components_device__signals_core_common_signals__features.h +++ b/www/chromium/files/patch-components_device__signals_core_common_signals__features.h @@ -1,7 +1,7 @@ ---- components/device_signals/core/common/signals_features.h.orig 2025-02-19 07:43:18 UTC +--- components/device_signals/core/common/signals_features.h.orig 2025-03-05 08:14:56 UTC +++ components/device_signals/core/common/signals_features.h -@@ -31,7 +31,7 @@ enum class NewEvFunction { kFileSystemInfo, kSettings, - bool IsNewFunctionEnabled(NewEvFunction new_ev_function); +@@ -14,7 +14,7 @@ namespace enterprise_signals::features { + BASE_DECLARE_FEATURE(kAllowClientCertificateReportingForUsers); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc index d4abc55ba6f3..633e4d5d40f7 100644 --- a/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc +++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils.cc.orig 2025-02-19 07:43:18 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2025-03-05 08:14:56 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -481,6 +481,9 @@ std::string GetPlatformForUAMetadata() { +@@ -451,6 +451,9 @@ std::string GetPlatformForUAMetadata() { # else return "Chromium OS"; # endif diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index ecc313f02de5..209ddbd2d421 100644 --- a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,4 +1,4 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2024-06-17 12:56:06 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-03-05 08:14:56 UTC +++ components/embedder_support/user_agent_utils_unittest.cc @@ -71,7 +71,7 @@ const char kDesktop[] = "X11; CrOS x86_64 14541.0.0" @@ -18,7 +18,7 @@ // Post-UA Reduction there is a single <unifiedPlatform> value for Linux: // X11; Linux x86_64 ASSERT_EQ(2u, pieces.size()); -@@ -727,7 +727,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { +@@ -703,7 +703,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { #endif #elif BUILDFLAG(IS_ANDROID) EXPECT_EQ(metadata.platform, "Android"); diff --git a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc index 3f16ff09e2bf..e860661b4992 100644 --- a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc +++ b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- components/eye_dropper/eye_dropper_view.cc.orig 2024-09-30 07:45:04 UTC +--- components/eye_dropper/eye_dropper_view.cc.orig 2025-03-05 08:14:56 UTC +++ components/eye_dropper/eye_dropper_view.cc -@@ -203,7 +203,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, +@@ -208,7 +208,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 4a58f28cd2bc..6b8a6bf5392b 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2025-02-19 07:43:18 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2025-03-05 08:14:56 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -95,7 +95,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro +@@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { @@ -9,7 +9,7 @@ // The IPH bubble for link capturing has a trigger set to ANY so that it // always shows up. The per app specific guardrails are independently stored -@@ -114,7 +114,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -119,7 +119,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1644,7 +1644,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1724,7 +1724,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 40a49183a11d..48ac92bf4bd2 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2025-02-19 07:43:18 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2025-03-05 08:14:56 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -646,7 +646,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -667,7 +667,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature, "IPH_AutofillCardInfoRetrievalSuggestion", -@@ -790,7 +790,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -811,7 +811,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index dcb0838e0511..e4295b27db20 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2025-02-19 07:43:18 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2025-03-05 08:14:56 UTC +++ components/feature_engagement/public/feature_constants.h @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -285,7 +285,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg +@@ -295,7 +295,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg #endif // BUILDFLAG(IS_IOS) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) FEATURE_CONSTANTS_DECLARE_FEATURE( kIPHAutofillCardInfoRetrievalSuggestionFeature); -@@ -343,7 +343,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA +@@ -353,7 +353,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 03e5fbb2d016..159ef00da4b5 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2025-02-19 07:43:18 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2025-03-05 08:14:56 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -162,7 +162,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSSharedTabGroupForeground, +@@ -165,7 +165,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSReminderNotificationsOverflowMenuBubbleFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -232,7 +232,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -236,7 +236,7 @@ const base::Feature* const kAllFeatures[] = { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) &kIPHAutofillCardInfoRetrievalSuggestionFeature, &kIPHAutofillCreditCardBenefitFeature, -@@ -286,7 +286,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -290,7 +290,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index e3168af11305..555b2ec49e5c 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2025-02-19 07:43:18 UTC +--- components/feature_engagement/public/feature_list.h.orig 2025-03-05 08:14:56 UTC +++ components/feature_engagement/public/feature_list.h -@@ -279,7 +279,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSharedTabGroupForeground +@@ -291,7 +291,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSReminderNotificationsOve #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -389,7 +389,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe +@@ -402,7 +402,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); -@@ -483,7 +484,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -496,7 +497,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS) @@ -28,16 +28,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab, -@@ -644,7 +645,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat - VARIATION_ENTRY(kIPHiOSLensOverlayEntrypointTipFeature), - VARIATION_ENTRY(kIPHiOSSharedTabGroupForeground), +@@ -662,7 +663,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat + VARIATION_ENTRY(kIPHiOSDefaultBrowserBannerPromoFeature), + VARIATION_ENTRY(kIPHiOSReminderNotificationsOverflowMenuBubbleFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -703,7 +704,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -722,7 +723,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -47,7 +47,7 @@ VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature), VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), -@@ -755,7 +757,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -774,7 +776,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index eae574ea9802..4be8e9547118 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2025-02-19 07:43:18 UTC +--- components/flags_ui/flags_state.cc.orig 2025-03-05 08:14:56 UTC +++ components/flags_ui/flags_state.cc -@@ -751,7 +751,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -761,7 +761,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS) return kOsCrOS; diff --git a/www/chromium/files/patch-components_media__router_common_media__source.cc b/www/chromium/files/patch-components_media__router_common_media__source.cc index d3a5a0090ee5..5b5347d8f429 100644 --- a/www/chromium/files/patch-components_media__router_common_media__source.cc +++ b/www/chromium/files/patch-components_media__router_common_media__source.cc @@ -1,6 +1,6 @@ ---- components/media_router/common/media_source.cc.orig 2024-06-17 12:56:06 UTC +--- components/media_router/common/media_source.cc.orig 2025-03-05 08:14:56 UTC +++ components/media_router/common/media_source.cc -@@ -57,7 +57,7 @@ bool IsSystemAudioCaptureSupported() { +@@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() { if (!media::IsSystemLoopbackCaptureSupported()) { return false; } diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc new file mode 100644 index 000000000000..424ac1c72a2b --- /dev/null +++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider.cc @@ -0,0 +1,11 @@ +--- components/metrics/drive_metrics_provider.cc.orig 2025-03-05 08:14:56 UTC ++++ components/metrics/drive_metrics_provider.cc +@@ -113,7 +113,7 @@ void DriveMetricsProvider::FillDriveMetrics( + response.has_seek_penalty); + RecordTriStateMetric("UMA.SeekPenaltyResult.Base", + response.has_seek_penalty_base); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable); + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index f64c9bae4eb4..ca38f88d7b63 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2025-02-19 07:43:18 UTC +--- components/metrics/metrics_log.cc.orig 2025-03-05 08:14:56 UTC +++ components/metrics/metrics_log.cc -@@ -60,7 +60,7 @@ +@@ -61,7 +61,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -150,7 +150,7 @@ void RecordCurrentTime( +@@ -157,7 +157,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -413,7 +413,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -435,7 +435,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -430,7 +430,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -452,7 +452,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/chromium/files/patch-components_os__crypt_async_common_encryptor.cc b/www/chromium/files/patch-components_os__crypt_async_common_encryptor.cc deleted file mode 100644 index 029da6c61a3d..000000000000 --- a/www/chromium/files/patch-components_os__crypt_async_common_encryptor.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/os_crypt/async/common/encryptor.cc.orig 2025-02-19 07:43:18 UTC -+++ components/os_crypt/async/common/encryptor.cc -@@ -275,7 +275,7 @@ std::optional<std::string> Encryptor::DecryptData( - // or not encryption worked or not, and certainly not advisable to recommend - // a re-encryption of this potentially invalid data. - // TODO(crbug.com/365712505): Remove this fallback. --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ - !(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ - BUILDFLAG(IS_FUCHSIA) - if (plaintext == string_data) { diff --git a/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h b/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h index 5a8e33bda432..a74e88ac3d40 100644 --- a/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h @@ -1,6 +1,6 @@ ---- components/os_crypt/sync/os_crypt.h.orig 2025-02-19 07:43:18 UTC +--- components/os_crypt/sync/os_crypt.h.orig 2025-03-05 08:14:56 UTC +++ components/os_crypt/sync/os_crypt.h -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "build/chromecast_buildflags.h" #include "crypto/subtle_passkey.h" @@ -9,16 +9,7 @@ class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -24,7 +24,7 @@ class PrefRegistrySimple; - class PrefService; - #endif // BUILDFLAG(IS_WIN) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - namespace crypto { - class SymmetricKey; - } -@@ -37,7 +37,7 @@ struct Config; +@@ -32,7 +32,7 @@ struct Config; // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions // of what each function does. namespace OSCrypt { @@ -27,7 +18,7 @@ COMPONENT_EXPORT(OS_CRYPT) void SetConfig(std::unique_ptr<os_crypt::Config> config); #endif // BUILDFLAG(IS_LINUX) -@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b +@@ -77,7 +77,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); #endif // BUILDFLAG(IS_WIN) @@ -36,7 +27,16 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> -@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -86,7 +86,7 @@ COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting() + COMPONENT_EXPORT(OS_CRYPT) + void SetEncryptionPasswordForTesting(const std::string& password); + #endif // (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ + !(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ + BUILDFLAG(IS_FUCHSIA) + COMPONENT_EXPORT(OS_CRYPT) +@@ -111,7 +111,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { // Returns singleton instance of OSCryptImpl. static OSCryptImpl* GetInstance(); @@ -45,7 +45,7 @@ // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -203,7 +203,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { void ResetStateForTesting(); #endif @@ -54,8 +54,8 @@ // For unit testing purposes, inject methods to be used. // |storage_provider_factory| provides the desired |KeyStorage| // implementation. If the provider returns |nullptr|, a hardcoded password -@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { - crypto::SymmetricKey* GetEncryptionKey(); +@@ -227,13 +227,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + bool DeriveKey(); #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc index 38022b8324d7..8ea73d80c90e 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/features/password_features.cc @@ -35,7 +35,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -113,7 +113,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, +@@ -107,7 +107,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, "ReuseDetectionBasedOnPasswordHashes", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h index eeb0391f8a30..d3840714e9ee 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -114,7 +114,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable) +@@ -108,7 +108,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable) // Detects password reuse based on hashed password values. BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes); diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc index 731795457561..96dc37b9f2a6 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -433,7 +433,7 @@ void PasswordManager::RegisterProfilePrefs( - prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); - #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) +@@ -471,7 +471,7 @@ void PasswordManager::RegisterProfilePrefs( + false); + #endif registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -446,7 +446,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -484,7 +484,7 @@ void PasswordManager::RegisterProfilePrefs( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index e605a7bfbfa8..b6e0a2f7ce86 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -31,7 +31,7 @@ #include "net/cert/cert_status_flags.h" @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #include "ui/gfx/geometry/rect_f.h" -@@ -559,7 +559,7 @@ class PasswordManagerClient { +@@ -549,7 +549,7 @@ class PasswordManagerClient { CredentialsCallback callback); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index ced753e91d32..90ec0a3d108d 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-01-15 09:18:26 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -44,7 +44,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri +@@ -45,7 +45,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ // Returns the password form corresponding to the `payload` data. In most // cases there is only one such form stored, but having more than one or no // forms is also possible. If there is more than one form, showing any of them -@@ -293,7 +293,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -294,7 +294,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( } case autofill::SuggestionType::kViewPasswordDetails: { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ std::optional<password_manager::PasswordForm> credentials = GetCorrespondingPasswordForm( suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), -@@ -428,7 +428,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass +@@ -429,7 +429,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass const Suggestion::PasswordSuggestionDetails& payload, base::OnceClosure on_allowed) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index 0732be00becf..a9e9d7f150ed 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -195,7 +195,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -199,7 +199,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h index fdd07f5355c3..04c38555a477 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.h.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/browser/stub_password_manager_client.h -@@ -76,7 +76,7 @@ class StubPasswordManagerClient : public PasswordManag +@@ -77,7 +77,7 @@ class StubPasswordManagerClient : public PasswordManag MockPasswordFeatureManager* GetPasswordFeatureManager(); version_info::Channel GetChannel() const override; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index 9b47b705efb5..f8d9812a5b2c 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-02-19 07:43:18 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-03-05 08:14:56 UTC +++ components/password_manager/core/common/password_manager_pref_names.h @@ -50,7 +50,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif @@ -9,7 +9,7 @@ // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -349,7 +349,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -359,7 +359,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/chromium/files/patch-components_performance__manager_public_features.h b/www/chromium/files/patch-components_performance__manager_public_features.h index 99908eed5fea..f0d33dd27a8a 100644 --- a/www/chromium/files/patch-components_performance__manager_public_features.h +++ b/www/chromium/files/patch-components_performance__manager_public_features.h @@ -1,6 +1,6 @@ ---- components/performance_manager/public/features.h.orig 2024-07-30 11:12:21 UTC +--- components/performance_manager/public/features.h.orig 2025-03-05 08:14:56 UTC +++ components/performance_manager/public/features.h -@@ -21,7 +21,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSync); +@@ -17,7 +17,7 @@ namespace performance_manager::features { #if !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc new file mode 100644 index 000000000000..3b841504c64a --- /dev/null +++ b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc @@ -0,0 +1,11 @@ +--- components/regional_capabilities/regional_capabilities_service.cc.orig 2025-03-05 08:14:56 UTC ++++ components/regional_capabilities/regional_capabilities_service.cc +@@ -85,7 +85,7 @@ void RegionalCapabilitiesService::InitializeCountryIdC + base::UmaHistogramEnumeration(kUnknownCountryIdStored, + UnknownCountryIdStored::kValidCountryId); + } else { +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) { + profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall); + country_id.reset(); diff --git a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc new file mode 100644 index 000000000000..e81f7e4e3f76 --- /dev/null +++ b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc @@ -0,0 +1,11 @@ +--- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-03-05 08:14:56 UTC ++++ components/regional_capabilities/regional_capabilities_switches.cc +@@ -6,7 +6,7 @@ + + namespace switches { + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kClearPrefForUnknownCountry, + "ClearCountryPrefForStoredUnknownCountry", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h new file mode 100644 index 000000000000..4a51372f6b6d --- /dev/null +++ b/www/chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h @@ -0,0 +1,11 @@ +--- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-03-05 08:14:56 UTC ++++ components/regional_capabilities/regional_capabilities_switches.h +@@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] = + inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA"; + inline constexpr char kEeaListCountryOverride[] = "EEA_ALL"; + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // When the `country_codes::kCountryIDUnknown` is stored in prefs and this + // feature is enabled the pref will be cleared allowing a valid country to be + // set again. diff --git a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc deleted file mode 100644 index cc409d3f1c43..000000000000 --- a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/safe_browsing/core/common/features.cc.orig 2025-02-19 07:43:18 UTC -+++ components/safe_browsing/core/common/features.cc -@@ -262,7 +262,7 @@ constexpr base::FeatureParam<std::string> kRedWarningS - BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, - "SafeBrowsingAsyncRealTimeCheck", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc deleted file mode 100644 index c7452e728d05..000000000000 --- a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2025-02-19 07:43:18 UTC -+++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -625,7 +625,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref - - int SearchEngineChoiceService::GetCountryIdInternal() { - // `country_codes::kCountryIDAtInstall` may not be set yet. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // On Android, ChromeOS and Linux, `country_codes::kCountryIDAtInstall` is - // computed asynchronously using platform-specific signals, and may not be - // available yet. diff --git a/www/chromium/files/patch-components_search__engines_search__engines__switches.cc b/www/chromium/files/patch-components_search__engines_search__engines__switches.cc deleted file mode 100644 index 5cc754823d8f..000000000000 --- a/www/chromium/files/patch-components_search__engines_search__engines__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/search_engines/search_engines_switches.cc.orig 2025-02-19 07:43:18 UTC -+++ components/search_engines/search_engines_switches.cc -@@ -107,7 +107,7 @@ const base::FeatureParam<bool> kReconcileWithAllKnownE - "reconcile_with_all_known_engines", - false); - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(SEARCH_ENGINES_SWITCHES) - BASE_FEATURE(kClearPrefForUnknownCountry, - "ClearCountryPrefForStoredUnknownCountry", diff --git a/www/chromium/files/patch-components_search__engines_search__engines__switches.h b/www/chromium/files/patch-components_search__engines_search__engines__switches.h deleted file mode 100644 index 875124e35627..000000000000 --- a/www/chromium/files/patch-components_search__engines_search__engines__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- components/search_engines/search_engines_switches.h.orig 2025-02-19 07:43:18 UTC -+++ components/search_engines/search_engines_switches.h -@@ -113,7 +113,7 @@ BASE_DECLARE_FEATURE(kTemplateUrlReconciliation); - COMPONENT_EXPORT(SEARCH_ENGINES_SWITCHES) - extern const base::FeatureParam<bool> kReconcileWithAllKnownEngines; - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // When the `country_codes::kCountryIDUnknown` is stored in prefs and this - // feature is enabled the pref will be cleared allowing a valid country to be - // set again. diff --git a/www/chromium/files/patch-components_search__engines_template__url__service.cc b/www/chromium/files/patch-components_search__engines_template__url__service.cc index 8f98bf69f896..448bad788e1f 100644 --- a/www/chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2025-02-19 07:43:18 UTC +--- components/search_engines/template_url_service.cc.orig 2025-03-05 08:14:56 UTC +++ components/search_engines/template_url_service.cc -@@ -3218,7 +3218,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3229,7 +3229,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSearchManager> TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.cc b/www/chromium/files/patch-components_supervised__user_core_common_features.cc index becaaf653ac1..36f9a891ee4c 100644 --- a/www/chromium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/chromium/files/patch-components_supervised__user_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/features.cc.orig 2025-02-19 07:43:18 UTC +--- components/supervised_user/core/common/features.cc.orig 2025-03-05 08:14:56 UTC +++ components/supervised_user/core/common/features.cc -@@ -60,7 +60,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt +@@ -68,7 +68,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -75,7 +75,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -83,7 +83,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); @@ -18,25 +18,16 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -96,7 +96,7 @@ BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, +@@ -104,7 +104,7 @@ BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, "CustomProfileStringsForSupervisedUsers", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, - "EnableSupervisedUserVersionSignOutDialog", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -106,7 +106,7 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, - base::FEATURE_DISABLED_BY_DEFAULT); - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kHideGuestModeForSupervisedUsers, - "HideGuestModeForSupervisedUsers", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -114,13 +114,13 @@ BASE_FEATURE(kHideGuestModeForSupervisedUsers, + BASE_FEATURE(kShowKiteForSupervisedUsers, + "ShowKiteForSupervisedUsers", +@@ -113,13 +113,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers, "ForceSafeSearchForUnauthenticatedSupervisedUsers", @@ -49,10 +40,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kForceSupervisedUserReauthenticationForYouTube, - "ForceSupervisedUserReauthenticationForYouTube", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -149,7 +149,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, + BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, + "EnableSupervisedUserVersionSignOutDialog", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -141,7 +141,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, // platform #defines. BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers, "UncredentialedFilteringFallbackForSupervisedUsers", diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.h b/www/chromium/files/patch-components_supervised__user_core_common_features.h index 3c36ea5cff6c..dfc7ddbd9abb 100644 --- a/www/chromium/files/patch-components_supervised__user_core_common_features.h +++ b/www/chromium/files/patch-components_supervised__user_core_common_features.h @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/features.h.orig 2025-02-19 07:43:18 UTC +--- components/supervised_user/core/common/features.h.orig 2025-03-05 08:14:56 UTC +++ components/supervised_user/core/common/features.h -@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( +@@ -30,7 +30,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -55,11 +55,11 @@ BASE_DECLARE_FEATURE(kCustomProfileStringsForSupervise +@@ -60,7 +60,7 @@ BASE_DECLARE_FEATURE(kCustomProfileStringsForSupervise // Displays a Family Link kite badge on the supervised user avatar in various // surfaces. @@ -18,17 +18,12 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Uses supervised user strings on the signout dialog. - BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog); - -@@ -74,7 +74,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) +@@ -68,7 +68,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); // unauthenticated (e.g. signed out of the content area) account. BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Force re-authentication when an unauthenticated supervised user tries to - // access YouTube, so that content restrictions can be applied. - BASE_DECLARE_FEATURE(kForceSupervisedUserReauthenticationForYouTube); + // Uses supervised user strings on the signout dialog. + BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog); + diff --git a/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc new file mode 100644 index 000000000000..107a9e4c4de6 --- /dev/null +++ b/www/chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc @@ -0,0 +1,11 @@ +--- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-03-05 08:14:56 UTC ++++ components/sync_preferences/common_syncable_prefs_database.cc +@@ -327,7 +327,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = + PrefSensitivity::kNone, MergeBehavior::kNone}}, + #endif // BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {autofill::prefs::kAutofillBnplEnabled, + {syncable_prefs_ids::kAutofillBnplEnabled, syncer::PREFERENCES, + PrefSensitivity::kNone, MergeBehavior::kNone}}, diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index 3f4f94748cfd..910d31e61b21 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2025-02-19 07:43:18 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2025-03-05 08:14:56 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -299,7 +299,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -298,7 +298,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/chromium/files/patch-components_variations_service_variations__service.cc b/www/chromium/files/patch-components_variations_service_variations__service.cc index 1433ed96d35e..cb59dfff157f 100644 --- a/www/chromium/files/patch-components_variations_service_variations__service.cc +++ b/www/chromium/files/patch-components_variations_service_variations__service.cc @@ -1,6 +1,6 @@ ---- components/variations/service/variations_service.cc.orig 2025-02-19 07:43:18 UTC +--- components/variations/service/variations_service.cc.orig 2025-03-05 08:14:56 UTC +++ components/variations/service/variations_service.cc -@@ -99,7 +99,7 @@ std::string GetPlatformString() { +@@ -100,7 +100,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 295657097445..e274d188c548 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-02-19 07:43:18 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-03-05 08:14:56 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1506,7 +1506,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1505,7 +1505,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc index 3664c656969f..24f8879055cc 100644 --- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2025-02-19 07:43:18 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2025-03-05 08:14:56 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1369,7 +1369,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1376,7 +1376,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index be3ef941d6be..7c1966ee9d99 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-02-19 07:43:18 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-03-05 08:14:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -122,7 +122,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -832,7 +832,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -812,7 +812,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 590af6cf1875..7546d00deae2 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-09-30 07:45:04 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-03-05 08:14:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -231,7 +231,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -228,7 +228,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // See comments on `EvictionHandler`. EvictionHandler eviction_handler_; diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index f2256ddb964f..b2072efb4bef 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2025-02-19 07:43:18 UTC +--- content/app/content_main.cc.orig 2025-03-05 08:14:56 UTC +++ content/app/content_main.cc -@@ -221,7 +221,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -226,7 +226,7 @@ NO_STACK_PROTECTOR int RunContentProcess( base::EnableTerminationOnOutOfMemory(); logging::RegisterAbslAbortHook(); @@ -9,7 +9,7 @@ // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client -@@ -306,7 +306,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -311,7 +311,7 @@ NO_STACK_PROTECTOR int RunContentProcess( command_line->AppendSwitch(switches::kUseMobileUserAgent); #endif diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index d2387ee28b90..e4ba8d22e2c5 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2025-02-19 07:43:18 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/app/content_main_runner_impl.cc -@@ -146,18 +146,20 @@ +@@ -142,18 +142,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -23,7 +23,7 @@ #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -186,6 +188,10 @@ +@@ -182,6 +184,10 @@ #include "media/base/media_switches.h" #endif @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -380,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -422,7 +428,10 @@ void PreloadLibraryCdms() { +@@ -418,7 +424,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -434,9 +443,16 @@ void PreSandboxInit() { +@@ -430,9 +439,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -746,7 +762,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -742,7 +758,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); bool start_hang_watcher_now; @@ -80,7 +80,7 @@ // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is // initialized, because the sandbox can't be started with multiple threads. // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. -@@ -856,11 +872,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -855,11 +871,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,7 +94,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1041,8 +1056,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1040,8 +1055,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -115,7 +115,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1139,6 +1166,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1138,6 +1165,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index a43d09edfd19..23ef0ad46fb3 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- content/browser/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ content/browser/BUILD.gn -@@ -2504,6 +2504,14 @@ source_set("browser") { +@@ -2523,6 +2523,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2549,6 +2557,15 @@ source_set("browser") { +@@ -2568,6 +2576,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] diff --git a/www/chromium/files/patch-content_browser_audio_audio__service.cc b/www/chromium/files/patch-content_browser_audio_audio__service.cc index 69abc73cec38..fd3f992eccd7 100644 --- a/www/chromium/files/patch-content_browser_audio_audio__service.cc +++ b/www/chromium/files/patch-content_browser_audio_audio__service.cc @@ -1,6 +1,6 @@ ---- content/browser/audio/audio_service.cc.orig 2024-05-21 18:07:39 UTC +--- content/browser/audio/audio_service.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/audio/audio_service.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) #include "ui/display/util/edid_parser.h" @@ -9,7 +9,7 @@ #include "ui/display/display_util.h" #endif // BUILDFLAG(IS_LINUX) -@@ -200,7 +200,7 @@ audio::mojom::AudioService& GetAudioService() { +@@ -201,7 +201,7 @@ audio::mojom::AudioService& GetAudioService() { ->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&ScanEdidBitstreams), base::BindOnce(&LaunchAudioService, std::move(receiver))); diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index cf4239f7a7ee..89d9b34b03e5 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/browser_child_process_host_impl.cc @@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kLogBestEffortTasks, @@ -8,7 +8,7 @@ }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -655,7 +656,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -690,7 +691,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h index e2c5a6226021..f5673dcef553 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.h.orig 2025-02-19 07:43:18 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2025-03-05 08:14:56 UTC +++ content/browser/browser_child_process_host_impl.h @@ -36,7 +36,7 @@ #include "base/win/object_watcher.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -270,7 +270,7 @@ class BrowserChildProcessHostImpl +@@ -287,7 +287,7 @@ class BrowserChildProcessHostImpl std::unique_ptr<tracing::SystemTracingService> system_tracing_service_; #endif diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc index be6079ddca2f..a76c3ff20809 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig 2023-12-10 06:10:27 UTC +--- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/browser_child_process_host_impl_receiver_bindings.cc -@@ -62,7 +62,7 @@ void BrowserChildProcessHostImpl::BindHostReceiver( +@@ -64,7 +64,7 @@ void BrowserChildProcessHostImpl::BindHostReceiver( } } diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h index ba6438936766..d371acee9152 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper.h.orig 2024-11-14 07:57:23 UTC +--- content/browser/child_process_launcher_helper.h.orig 2025-03-05 08:14:56 UTC +++ content/browser/child_process_launcher_helper.h -@@ -304,7 +304,7 @@ class ChildProcessLauncherHelper +@@ -308,7 +308,7 @@ class ChildProcessLauncherHelper std::optional<base::ProcessId> process_id_ = std::nullopt; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 92bd62962fbc..5d48aef78c30 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -109,7 +109,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 85718aacff86..5cf6b8248b89 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-01-15 09:18:26 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1675,7 +1675,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1672,7 +1672,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 105723ad1339..f55ff99c226b 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -317,7 +317,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc index 1b98e6119033..e369683fd528 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc @@ -26,7 +26,7 @@ #include "media/base/media_switches.h" @@ -9,7 +9,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -@@ -176,7 +176,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs +@@ -183,7 +183,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs } #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 79ef689bf605..373ee8efad8c 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -220,7 +220,7 @@ +@@ -221,7 +221,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1085,7 +1085,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1086,7 +1086,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1253,7 +1253,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1254,7 +1254,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3269,7 +3269,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3328,7 +3328,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -36,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3325,6 +3325,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3384,6 +3384,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5135,7 +5136,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5229,7 +5230,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr // - Win: https://crbug.com/707022 . uint64_t total_size = 0; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 37aa6d00c1ef..41e6e24911ff 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2025-02-19 07:43:18 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -101,7 +101,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -981,7 +981,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -989,7 +989,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -18,7 +18,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -1228,7 +1228,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1238,7 +1238,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // if the request isn't handled on the IO thread. void OnBindHostReceiver(mojo::GenericPendingReceiver receiver); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc index 93c05940ab43..f236f2f7ba70 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2024-08-26 12:06:38 UTC +--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc @@ -52,7 +52,7 @@ #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #include "content/browser/media/video_encode_accelerator_provider_launcher.h" -@@ -341,7 +341,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost +@@ -343,7 +343,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost } #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 8ae45042b5e1..bff333f67f82 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-11-14 07:57:23 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -274,7 +274,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index b6fbfd8f7566..be65e1fb5cc7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" @@ -18,7 +18,7 @@ ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1852,7 +1852,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1867,7 +1867,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2822,7 +2822,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2843,7 +2843,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -3006,7 +3006,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3027,7 +3027,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 31078b4066e4..e56bbd807bda 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2025-02-19 07:43:18 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2025-03-05 08:14:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -274,7 +274,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -276,7 +276,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 84adb04f27f3..3bd2c92c011d 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -339,7 +339,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -337,7 +337,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index dbfa7ae2a020..74e402858bbb 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/utility_process_host.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/utility_process_host.cc @@ -63,7 +63,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -18,7 +18,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -412,7 +412,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -413,7 +413,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -27,7 +27,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -429,7 +429,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -430,7 +430,7 @@ bool UtilityProcessHost::StartProcess() { if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { bool pass_gpu_buffer_flag = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index f4b511aacee4..e5fd544f24da 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -173,7 +173,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -258,7 +258,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1328,7 +1328,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1327,7 +1327,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index e077ff8b543d..6775c09486bd 100644 --- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2025-02-19 07:43:18 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2025-03-05 08:14:56 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -18,8 +18,10 @@ +@@ -23,8 +23,10 @@ #include "build/build_config.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -11,7 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" -@@ -37,6 +39,7 @@ namespace content { +@@ -42,6 +44,7 @@ namespace content { namespace { @@ -19,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, +@@ -64,6 +67,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -27,7 +27,7 @@ } // namespace -@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -73,9 +77,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -88,6 +96,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -49,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -137,6 +146,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -142,6 +151,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -57,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -161,6 +171,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -166,6 +176,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -65,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -229,9 +240,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -234,9 +245,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/chromium/files/patch-content_child_BUILD.gn b/www/chromium/files/patch-content_child_BUILD.gn index 21da862c001d..3645493f0ac9 100644 --- a/www/chromium/files/patch-content_child_BUILD.gn +++ b/www/chromium/files/patch-content_child_BUILD.gn @@ -1,4 +1,4 @@ ---- content/child/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- content/child/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ content/child/BUILD.gn @@ -134,6 +134,13 @@ target(link_target_type, "child") { ] @@ -13,4 +13,4 @@ + if (is_win) { sources += [ - "dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc", + "child_process_sandbox_support_impl_win.cc", diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc index 55c3198fed7b..2e4551e6eb1e 100644 --- a/www/chromium/files/patch-content_common_features.cc +++ b/www/chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2025-02-19 07:43:18 UTC +--- content/common/features.cc.orig 2025-03-05 08:14:56 UTC +++ content/common/features.cc -@@ -130,7 +130,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, +@@ -125,7 +125,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host diff --git a/www/chromium/files/patch-content_common_features.h b/www/chromium/files/patch-content_common_features.h index df195c34572c..911c15ef8e47 100644 --- a/www/chromium/files/patch-content_common_features.h +++ b/www/chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2025-02-19 07:43:18 UTC +--- content/common/features.h.orig 2025-03-05 08:14:56 UTC +++ content/common/features.h -@@ -29,7 +29,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn +@@ -28,7 +28,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking); CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint); CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 8b8fa849fd1c..9d2ffae9cc38 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2023-04-05 11:05:06 UTC +--- content/common/user_agent.cc.orig 2025-03-05 08:14:56 UTC +++ content/common/user_agent.cc -@@ -45,7 +45,7 @@ std::string GetUserAgentPlatform() { +@@ -50,7 +50,7 @@ std::string GetUserAgentPlatform() { return ""; #elif BUILDFLAG(IS_MAC) return "Macintosh; "; @@ -9,7 +9,7 @@ return "X11; "; // strange, but that's what Firefox uses #elif BUILDFLAG(IS_ANDROID) return "Linux; "; -@@ -71,7 +71,7 @@ std::string GetUnifiedPlatform() { +@@ -76,7 +76,7 @@ std::string GetUnifiedPlatform() { return "Windows NT 10.0; Win64; x64"; #elif BUILDFLAG(IS_FUCHSIA) return "Fuchsia"; @@ -18,7 +18,7 @@ return "X11; Linux x86_64"; #elif BUILDFLAG(IS_IOS) if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { -@@ -296,6 +296,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -301,6 +301,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 963de477ef9b..e5734f7a03b2 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2025-02-19 07:43:18 UTC +--- content/gpu/gpu_main.cc.orig 2025-03-05 08:14:56 UTC +++ content/gpu/gpu_main.cc @@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" @@ -34,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -300,7 +304,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -298,7 +302,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -326,7 +330,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -324,7 +328,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -459,7 +464,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -457,7 +462,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -499,7 +504,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -497,7 +502,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc index 1d6f5e0cf92a..2d0f03ae81d3 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2024-07-30 11:12:21 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2025-03-05 08:14:56 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc @@ -52,6 +52,11 @@ #include "gin/v8_initializer.h" @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -141,7 +146,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -139,7 +144,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/chromium/files/patch-content_public_browser_content__browser__client.cc b/www/chromium/files/patch-content_public_browser_content__browser__client.cc index f7c85d00c30b..10c3f4b76085 100644 --- a/www/chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2025-02-19 07:43:18 UTC +--- content/public/browser/content_browser_client.cc.orig 2025-03-05 08:14:56 UTC +++ content/public/browser/content_browser_client.cc -@@ -1361,7 +1361,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1377,7 +1377,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index d1ca38c144cc..4a148ea5628c 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2025-02-19 07:43:18 UTC +--- content/public/common/content_features.cc.orig 2025-03-05 08:14:56 UTC +++ content/public/common/content_features.cc -@@ -68,7 +68,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, +@@ -74,7 +74,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, // Runs the audio service in a separate process. BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1209,9 +1209,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1207,9 +1207,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -21,7 +21,7 @@ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1258,7 +1258,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, +@@ -1262,7 +1262,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 9b67d0a09bb1..6745b352295b 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2025-02-19 07:43:18 UTC +--- content/public/common/content_switches.cc.orig 2025-03-05 08:14:56 UTC +++ content/public/common/content_switches.cc -@@ -346,6 +346,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -342,6 +342,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -946,7 +948,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -954,7 +956,7 @@ const char kPreventResizingContentsForTesting[] = "prevent-resizing-contents-for-testing"; #endif diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 56a55f22bf38..b39ba88313e7 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2025-02-19 07:43:18 UTC +--- content/public/common/content_switches.h.orig 2025-03-05 08:14:56 UTC +++ content/public/common/content_switches.h @@ -108,6 +108,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -258,7 +259,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -262,7 +263,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[]; #endif diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 4a4424c378f5..112329a5d0df 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2025-02-19 07:43:18 UTC +--- content/renderer/render_thread_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/renderer/render_thread_impl.cc @@ -211,6 +211,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1047,7 +1049,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1043,7 +1045,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1056,7 +1058,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1052,7 +1054,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1849,7 +1851,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( +@@ -1845,7 +1847,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index d54c28fe8dfc..e3211e2d2f8a 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2025-02-19 07:43:18 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -129,7 +129,7 @@ @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -198,13 +198,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -26,20 +26,20 @@ RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -224,7 +224,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - #endif } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -285,7 +285,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl - #endif +@@ -288,7 +288,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return sandbox_support_.get(); #else // These platforms do not require sandbox support. diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 49e0b3956df8..9f632a10651e 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,11 +1,11 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2025-02-19 07:43:18 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2025-03-05 08:14:56 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -256,7 +256,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, +@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const gpu::GPUInfo& gpu_info) const; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 20860634d98f..f5274d64e844 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- content/shell/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ content/shell/BUILD.gn -@@ -1082,7 +1082,7 @@ group("content_shell_crash_test") { +@@ -1083,7 +1083,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc index ded3fdb2150c..8d59de4f66eb 100644 --- a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,6 +1,6 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2023-03-09 06:31:50 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2025-03-05 08:14:56 UTC +++ content/shell/utility/shell_content_utility_client.cc -@@ -38,7 +38,7 @@ +@@ -43,7 +43,7 @@ #include "sandbox/policy/sandbox.h" #include "services/test/echo/echo_service.h" @@ -9,7 +9,7 @@ #include "content/test/sandbox_status_service.h" #endif -@@ -187,7 +187,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -192,7 +192,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), base::SingleThreadTaskRunner::GetCurrentDefault()); diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 87b7212eae57..56a2020d394b 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2025-03-05 08:14:56 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc @@ -9,7 +9,7 @@ @@ -7,9 +7,9 @@ -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" - #endif - -@@ -17,7 +17,7 @@ namespace content { + #elif BUILDFLAG(IS_WIN) + #include "content/child/child_process_sandbox_support_impl_win.h" +@@ -19,7 +19,7 @@ namespace content { UtilityBlinkPlatformWithSandboxSupportImpl:: UtilityBlinkPlatformWithSandboxSupportImpl() { @@ -18,12 +18,12 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: - +@@ -40,7 +40,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return sandbox_support_.get(); #else return nullptr; diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h index fbf629fa8aa6..34259cf2bd22 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,11 +1,11 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2023-05-31 08:12:17 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2025-03-05 08:14:56 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h -@@ -33,7 +33,7 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub - blink::WebSandboxSupport* GetSandboxSupport() override; +@@ -34,7 +34,7 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub private: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif }; diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 224fff12716e..03a015e65b05 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2025-02-19 07:43:18 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2025-03-05 08:14:56 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -74,7 +74,7 @@ namespace { +@@ -77,7 +77,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -634,7 +634,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -643,7 +643,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_common_command.cc b/www/chromium/files/patch-extensions_common_command.cc index f956012ace24..e2c1af7ef1e2 100644 --- a/www/chromium/files/patch-extensions_common_command.cc +++ b/www/chromium/files/patch-extensions_common_command.cc @@ -1,11 +1,11 @@ ---- extensions/common/command.cc.orig 2025-02-19 07:43:18 UTC +--- extensions/common/command.cc.orig 2025-03-05 08:14:56 UTC +++ extensions/common/command.cc -@@ -281,7 +281,7 @@ std::string Command::CommandPlatform() { - return values::kKeybindingPlatformMac; +@@ -116,7 +116,7 @@ std::string Command::CommandPlatform() { + return ui::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) - return values::kKeybindingPlatformChromeOs; + return ui::kKeybindingPlatformChromeOs; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return values::kKeybindingPlatformLinux; + return ui::kKeybindingPlatformLinux; #elif BUILDFLAG(IS_FUCHSIA) // TODO(crbug.com/40220501): Change this once we decide what string should be diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index 979f3131f1c3..57203e00e6f6 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,6 +1,6 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2025-01-15 09:18:26 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2025-03-05 08:14:56 UTC +++ extensions/renderer/bindings/api_binding_util.cc -@@ -128,7 +128,7 @@ void InvalidateContext(v8::Local<v8::Context> context) +@@ -129,7 +129,7 @@ void InvalidateContext(v8::Local<v8::Context> context) std::string GetPlatformString() { #if BUILDFLAG(IS_CHROMEOS) return "chromeos"; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index f03bc8ce627e..b7194a52cf5c 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-02-19 07:43:18 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -324,7 +324,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -341,7 +341,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 68e4a7a84019..bb814210244a 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-02-19 07:43:18 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2864,7 +2864,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2862,7 +2862,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc index 963d95f1a18f..06c1bd02a808 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_context_state.cc.orig 2025-02-19 07:43:18 UTC +--- gpu/command_buffer/service/shared_context_state.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/shared_context_state.cc -@@ -62,7 +62,7 @@ +@@ -67,7 +67,7 @@ #include "gpu/vulkan/vulkan_implementation.h" #include "gpu/vulkan/vulkan_util.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_semaphore_pool.h" #endif -@@ -388,7 +388,7 @@ SharedContextState::SharedContextState( +@@ -393,7 +393,7 @@ SharedContextState::SharedContextState( if (gr_context_type_ == GrContextType::kVulkan) { if (vk_context_provider_) { #if BUILDFLAG(ENABLE_VULKAN) && \ @@ -18,7 +18,7 @@ external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this); #endif use_virtualized_gl_contexts_ = false; -@@ -425,7 +425,7 @@ SharedContextState::~SharedContextState() { +@@ -430,7 +430,7 @@ SharedContextState::~SharedContextState() { } #if BUILDFLAG(ENABLE_VULKAN) && \ diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index 2f917384c1c0..edd53d27af18 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-11-14 07:57:23 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -176,7 +176,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, +@@ -168,7 +168,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, SharedImageUsageSet SupportedUsage() { SharedImageUsageSet supported_usage = diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index da34997dad78..f1b8eb3fc6bd 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-01-15 09:18:26 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" #include "gpu/vulkan/vulkan_device_queue.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #endif -@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -113,7 +113,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -18,7 +18,7 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -316,7 +316,7 @@ SharedImageFactory::SharedImageFactory( +@@ -317,7 +317,7 @@ SharedImageFactory::SharedImageFactory( context_state_, workarounds_); factories_.push_back(std::move(ozone_factory)); } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index 3bc420e9344c..3a484d057aa3 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2025-02-19 07:43:18 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -605,7 +605,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -756,7 +756,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 4b5c5426e5cd..06bbf8fc5441 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,15 +1,15 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-02-19 07:43:18 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1364,7 +1364,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( - force_fallback_adapter = true; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!shared_context_state_->GrContextIsVulkan() && - !shared_context_state_->IsGraphiteDawnVulkan() && - use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -2061,7 +2061,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1752,7 +1752,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte + backend_types = {wgpu::BackendType::D3D12}; + #elif BUILDFLAG(IS_MAC) + backend_types = {wgpu::BackendType::Metal}; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (shared_context_state_->GrContextIsVulkan() || + shared_context_state_->IsGraphiteDawnVulkan()) { + backend_types = {wgpu::BackendType::Vulkan}; +@@ -1994,7 +1994,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 5deecc875c4b..ad60dc122ba4 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2025-02-19 07:43:18 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -392,7 +392,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -430,7 +430,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -431,7 +431,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -532,7 +532,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -531,7 +531,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -614,7 +614,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -613,7 +613,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -784,7 +784,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -783,7 +783,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -839,7 +839,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -835,7 +835,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1036,7 +1036,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1032,7 +1032,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1091,7 +1091,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1087,7 +1087,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index b529ed3470ca..2dca070077c4 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -154,7 +154,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -156,7 +156,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -297,7 +297,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -303,7 +303,7 @@ bool VulkanDeviceQueue::Initialize( // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler // support. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h index 79a8de3dc3df..06fd6b7fc146 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2024-07-30 11:12:21 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2025-03-05 08:14:56 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -179,7 +179,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue +@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc index 7dca76d0f5c3..30788bb283bc 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_util.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2025-03-05 08:14:56 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -473,7 +473,7 @@ bool CheckVulkanCompatibilities( +@@ -468,7 +468,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc index 7c451c6b73e5..bc34b2dedab6 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2025-02-19 07:43:18 UTC +--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2025-03-05 08:14:56 UTC +++ headless/lib/browser/headless_browser_main_parts_posix.cc -@@ -22,13 +22,13 @@ +@@ -27,13 +27,13 @@ #include "content/public/browser/browser_thread.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -16,7 +16,7 @@ #include "device/bluetooth/dbus/bluez_dbus_manager.h" #endif -@@ -162,7 +162,7 @@ class BrowserShutdownHandler { +@@ -167,7 +167,7 @@ class BrowserShutdownHandler { } // namespace @@ -25,7 +25,7 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -170,9 +170,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo +@@ -175,9 +175,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo BrowserShutdownHandler::Install(base::BindOnce( &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr())); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 35f447880cb0..e657ab506154 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,4 +1,4 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2025-02-19 07:43:18 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2025-03-05 08:14:56 UTC +++ headless/lib/browser/headless_content_browser_client.cc @@ -56,7 +56,7 @@ #include "content/public/common/content_descriptors.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" // nogncheck #include "content/public/browser/network_service_util.h" #endif -@@ -517,7 +517,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll +@@ -518,7 +518,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll void HeadlessContentBrowserClient::SetEncryptionKey( ::network::mojom::NetworkService* network_service) { diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index 2cf63da6f2b6..516fd4fadc91 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2023-01-11 09:17:16 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2025-03-05 08:14:56 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -45,7 +45,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -46,7 +46,7 @@ class HeadlessContentBrowserClient : public content::C CreateDevToolsManagerDelegate() override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 7692f2a1f693..ceb38bf70203 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2024-11-14 07:57:23 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 0b1c49c55797..9a3ebb3f7733 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2022-09-24 10:57:32 UTC +--- ipc/ipc_message_utils.h.orig 2025-03-05 08:14:56 UTC +++ ipc/ipc_message_utils.h -@@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> { +@@ -215,7 +215,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index c2915dc50222..86410c13e4d1 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2025-01-15 09:18:26 UTC +--- media/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ media/BUILD.gn -@@ -99,6 +99,9 @@ config("media_config") { +@@ -100,6 +100,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 2c0cb8dcc5a1..309f63dc9531 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2025-01-15 09:18:26 UTC +--- media/audio/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ media/audio/BUILD.gn -@@ -269,9 +269,23 @@ source_set("audio") { +@@ -273,9 +273,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } diff --git a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index c49fec118cae..cc929e343586 100644 --- a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,6 +1,6 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2024-09-30 07:45:04 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2025-03-05 08:14:56 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -100,7 +100,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -106,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; // Loop through the physical sound cards to get ALSA device hints. @@ -10,7 +10,7 @@ void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -112,7 +114,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -118,7 +120,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -195,7 +199,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -201,7 +205,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, std::size(kDeviceTypeDesired) - 1) == 0; } -@@ -247,7 +255,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -253,7 +261,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -271,7 +281,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -277,7 +287,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 241abc7125db..89f47d4d54e4 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2025-02-19 07:43:18 UTC +--- media/base/media_switches.cc.orig 2025-03-05 08:14:56 UTC +++ media/base/media_switches.cc @@ -20,7 +20,7 @@ #include "ui/gl/gl_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -378,8 +378,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, +@@ -371,8 +371,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, "UseSCContentSharingPicker", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -389,6 +389,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -382,6 +382,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, BASE_FEATURE(kPulseaudioLoopbackForScreenShare, "PulseaudioLoopbackForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); @@ -49,7 +49,7 @@ #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -634,7 +656,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -624,7 +646,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -58,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -657,7 +679,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -647,7 +669,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -669,7 +691,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -659,7 +681,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -698,7 +720,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -688,7 +710,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -85,7 +85,7 @@ // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default // on chromeos, but needs an experiment on linux. BASE_FEATURE(kAcceleratedVideoDecodeLinux, -@@ -802,7 +824,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, +@@ -791,7 +813,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, "VSyncMjpegDecoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -94,7 +94,7 @@ // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS. BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding, "V4L2H264TemporalLayerHWEncoding", -@@ -1380,7 +1402,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1357,7 +1379,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -103,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1460,7 +1482,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1439,7 +1461,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index 85c38ac25b05..c73645a1e7e3 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2025-02-19 07:43:18 UTC +--- media/base/media_switches.h.orig 2025-03-05 08:14:56 UTC +++ media/base/media_switches.h -@@ -326,13 +326,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu +@@ -324,13 +324,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -28,7 +28,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -346,7 +358,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); +@@ -344,7 +356,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); @@ -37,7 +37,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); -@@ -368,7 +380,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay +@@ -366,7 +378,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -46,7 +46,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -499,7 +511,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide +@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index d5e0de3bf70a..ec2c0600af75 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2025-02-19 07:43:18 UTC +--- media/base/video_frame.cc.orig 2025-03-05 08:14:56 UTC +++ media/base/video_frame.cc -@@ -90,7 +90,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -104,7 +104,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -106,7 +106,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -27,7 +27,7 @@ bool is_native_buffer = gpu_memory_buffer ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -906,7 +906,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -913,7 +913,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -36,7 +36,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1592,7 +1592,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1598,7 +1598,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index b170d823da08..dda74d228d37 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2025-02-19 07:43:18 UTC +--- media/base/video_frame.h.orig 2025-03-05 08:14:56 UTC +++ media/base/video_frame.h @@ -42,7 +42,7 @@ #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -86,7 +86,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -88,7 +88,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,7 @@ STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. #endif STORAGE_GPU_MEMORY_BUFFER = 6, -@@ -409,7 +409,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -424,7 +424,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -723,7 +723,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -734,7 +734,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // wait for the included sync point. scoped_refptr<gpu::ClientSharedImage> shared_image() const; @@ -36,7 +36,7 @@ // The number of DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -982,7 +982,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -963,7 +963,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index 086225449b8c..c1df68787774 100644 --- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2025-02-19 07:43:18 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2025-03-05 08:14:56 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -563,7 +563,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -569,7 +569,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 7e125d097d48..4f22e5f73af0 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2025-02-19 07:43:18 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc -@@ -5,8 +5,10 @@ +@@ -10,8 +10,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" #include <fcntl.h> @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -29,17 +31,19 @@ +@@ -34,17 +36,19 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" @@ -32,7 +32,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -49,6 +53,14 @@ using media::mojom::MeteringMode; +@@ -54,6 +58,14 @@ using media::mojom::MeteringMode; #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') #endif @@ -47,7 +47,7 @@ namespace media { namespace { -@@ -268,7 +280,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -273,7 +285,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -56,7 +56,7 @@ const int special_control_id = GetControllingSpecialControl(control_id); if (!special_control_id) { // The control is not controlled by a special control thus the control is -@@ -324,7 +336,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -329,7 +341,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -65,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -451,7 +463,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -456,7 +468,7 @@ void V4L2CaptureDelegate::AllocateAndStart( client_->OnStarted(); @@ -74,7 +74,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(); } -@@ -795,7 +807,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -800,7 +812,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -83,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -805,7 +817,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -810,7 +822,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -92,7 +92,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -816,6 +828,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -821,6 +833,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -100,7 +100,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -843,6 +856,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -848,6 +861,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1023,7 +1037,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1028,7 +1042,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -120,7 +120,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1061,6 +1079,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1066,6 +1084,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -128,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1094,6 +1113,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1099,6 +1118,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -136,7 +136,7 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1147,7 +1167,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1152,7 +1172,7 @@ void V4L2CaptureDelegate::DoCapture() { // workable on Linux. // See http://crbug.com/959919. @@ -145,7 +145,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), -@@ -1221,7 +1241,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1226,7 +1246,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc index 4093cfee5214..3c15c6bb7846 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2025-01-15 09:18:26 UTC +--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2025-03-05 08:14:56 UTC +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc -@@ -38,6 +38,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf +@@ -43,6 +43,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf return a.descriptor < b.descriptor; } @@ -8,7 +8,7 @@ // USB VID and PID are both 4 bytes long. const size_t kVidPidSize = 4; const size_t kMaxInterfaceNameSize = 256; -@@ -70,11 +71,24 @@ std::string ExtractFileNameFromDeviceId(const std::str +@@ -75,11 +76,24 @@ std::string ExtractFileNameFromDeviceId(const std::str DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE)); return device_id.substr(strlen(kDevDir), device_id.length()); } @@ -33,7 +33,7 @@ const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -82,9 +96,13 @@ class DevVideoFilePathsDeviceProvider +@@ -87,9 +101,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -47,7 +47,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -101,9 +119,13 @@ class DevVideoFilePathsDeviceProvider +@@ -106,9 +124,13 @@ class DevVideoFilePathsDeviceProvider } return usb_id; @@ -61,7 +61,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -114,6 +136,7 @@ class DevVideoFilePathsDeviceProvider +@@ -119,6 +141,7 @@ class DevVideoFilePathsDeviceProvider return std::string(); } return display_name; @@ -69,7 +69,7 @@ } }; -@@ -219,7 +242,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( +@@ -224,7 +247,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( std::move(callback).Run(std::move(devices_info)); } diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 996bcc17eb01..d2a620913d59 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2025-01-15 09:18:26 UTC +--- media/media_options.gni.orig 2025-03-05 08:14:56 UTC +++ media/media_options.gni -@@ -197,12 +197,15 @@ declare_args() { +@@ -202,12 +202,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index becd69fa8598..afcd036344c5 100644 --- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2025-02-19 07:43:18 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2025-03-05 08:14:56 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -856,7 +856,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -861,7 +861,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -877,7 +877,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -882,7 +882,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 83cdf5365c6a..45c152ea8687 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-02-19 07:43:18 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-03-05 08:14:56 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -643,7 +643,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -644,7 +644,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasSharedImage(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1051,7 +1051,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1054,7 +1054,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = handle.native_pixmap_handle.supports_zero_copy_webgpu_import; #endif -@@ -1231,7 +1231,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr +@@ -1225,7 +1225,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT; } diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index adcbf347913f..52b0f88b1a01 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,20 +1,11 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2025-02-19 07:43:18 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2025-03-05 08:14:56 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -159,7 +159,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( - config.input_format = PIXEL_FORMAT_I420; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (format != PIXEL_FORMAT_I420 || - !VideoFrame::IsStorageTypeMappable(storage_type)) { - // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -522,7 +522,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal - profile_, options_, format, first_frame->storage_type(), - supported_rc_modes_, required_encoder_type_, is_gpu_supported_format); +@@ -463,7 +463,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele + auto format = PIXEL_FORMAT_I420; + auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Linux/ChromeOS require a special configuration to use dmabuf storage. - // We need to keep sending frames the same way the first frame was sent. - // Other platforms will happily mix GpuMemoryBuffer storage with regular + // We need to keep sending frames with the same storage type. + // Other platforms will happily mix GpuMemoryBuffer storage with shared-mem diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index 5a5e8a76ec69..95e36aa82aae 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,11 +1,38 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2025-01-15 09:18:26 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2025-03-05 08:14:56 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -458,7 +458,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -260,7 +260,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest, InitializeAf + }); + + VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + expected_input_format = PIXEL_FORMAT_NV12; + #endif + vea()->SetEncodingCallback(base::BindLambdaForTesting( +@@ -369,7 +369,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest, FlushDuringI + }); + + VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + expected_input_format = PIXEL_FORMAT_NV12; + #endif + +@@ -467,7 +467,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (pixel_format != PIXEL_FORMAT_I420 || !small_frame->IsMappable()) expected_input_format = PIXEL_FORMAT_NV12; #endif + const gfx::ColorSpace expected_color_space = +@@ -674,7 +674,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest, + }); + + VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + expected_input_format = PIXEL_FORMAT_NV12; + #endif + vea()->SetEncodingCallback(base::BindLambdaForTesting( diff --git a/www/chromium/files/patch-media_webrtc_audio__processor.cc b/www/chromium/files/patch-media_webrtc_audio__processor.cc index 9530eb468528..54a2aa637f5f 100644 --- a/www/chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2025-02-19 07:43:18 UTC +--- media/webrtc/audio_processor.cc.orig 2025-03-05 08:14:56 UTC +++ media/webrtc/audio_processor.cc -@@ -506,7 +506,7 @@ std::optional<double> AudioProcessor::ProcessData( +@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni index 09408082c893..b5b59a33264c 100644 --- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2025-02-19 07:43:18 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2025-03-05 08:14:56 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -796,6 +796,16 @@ template("mojom") { +@@ -787,6 +787,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index b7fbf20c8240..9e47b7cbc80a 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- net/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ net/BUILD.gn @@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1303,6 +1303,19 @@ component("net") { +@@ -1309,6 +1309,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1466,7 +1479,7 @@ component("net") { +@@ -1472,7 +1485,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2982,7 +2995,7 @@ target(_test_target_type, "net_unittests") { +@@ -2989,7 +3002,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3076,6 +3089,10 @@ target(_test_target_type, "net_unittests") { +@@ -3083,6 +3096,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3142,7 +3159,7 @@ target(_test_target_type, "net_unittests") { +@@ -3149,7 +3166,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3281,7 +3298,7 @@ target(_test_target_type, "net_unittests") { +@@ -3288,7 +3305,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc index 52b74a9ecd54..c14b200ca11a 100644 --- a/www/chromium/files/patch-net_base_features.cc +++ b/www/chromium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2025-02-19 07:43:18 UTC +--- net/base/features.cc.orig 2025-03-05 08:14:56 UTC +++ net/base/features.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -530,7 +530,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -549,7 +549,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-net_base_sockaddr__util__posix.cc b/www/chromium/files/patch-net_base_sockaddr__util__posix.cc index b1423f6802ea..da4e6d269c67 100644 --- a/www/chromium/files/patch-net_base_sockaddr__util__posix.cc +++ b/www/chromium/files/patch-net_base_sockaddr__util__posix.cc @@ -1,6 +1,6 @@ ---- net/base/sockaddr_util_posix.cc.orig 2025-02-19 07:43:18 UTC +--- net/base/sockaddr_util_posix.cc.orig 2025-03-05 08:14:56 UTC +++ net/base/sockaddr_util_posix.cc -@@ -40,7 +40,8 @@ bool FillUnixAddress(const std::string& socket_path, +@@ -45,7 +45,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } diff --git a/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index b68dae371837..cd5c8f3f6db3 100644 --- a/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,7 +1,7 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2025-02-19 07:43:18 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2025-03-05 08:14:56 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -31,7 +31,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit - } // namespace +@@ -37,7 +37,17 @@ bool SimpleFileTracker::TrackedFiles::InLRUList() cons + } SimpleFileTracker::SimpleFileTracker(int file_limit) +#if defined(OS_OPENBSD) diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 5d6b0c294ed1..e6ea2fe9d73e 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2025-02-19 07:43:18 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2025-03-05 08:14:56 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -101,7 +101,7 @@ +@@ -108,7 +108,7 @@ #include "ui/accessibility/ax_features.mojom-features.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -534,7 +534,7 @@ void InitializeSDK(bool enable_v8, +@@ -541,7 +541,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc b/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc index 7235a85ba9c9..baba0a86aab7 100644 --- a/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc +++ b/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc @@ -1,6 +1,6 @@ ---- printing/backend/cups_ipp_helper.cc.orig 2024-06-17 12:56:06 UTC +--- printing/backend/cups_ipp_helper.cc.orig 2025-03-05 08:14:56 UTC +++ printing/backend/cups_ipp_helper.cc -@@ -202,7 +202,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -201,7 +201,7 @@ void ExtractResolutions(const CupsOptionProvider& prin // Provide a default DPI if no valid DPI is found. #if BUILDFLAG(IS_MAC) constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); diff --git a/www/chromium/files/patch-remoting_base_chromoting__event.cc b/www/chromium/files/patch-remoting_base_chromoting__event.cc index 85d96833a2f5..0226e6c52ce4 100644 --- a/www/chromium/files/patch-remoting_base_chromoting__event.cc +++ b/www/chromium/files/patch-remoting_base_chromoting__event.cc @@ -1,11 +1,11 @@ ---- remoting/base/chromoting_event.cc.orig 2022-11-30 08:12:58 UTC +--- remoting/base/chromoting_event.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/base/chromoting_event.cc -@@ -192,7 +192,7 @@ void ChromotingEvent::AddSystemInfo() { +@@ -191,7 +191,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Os os = Os::CHROMOTING_LINUX; - #elif BUILDFLAG(IS_CHROMEOS_ASH) + #elif BUILDFLAG(IS_CHROMEOS) Os os = Os::CHROMOTING_CHROMEOS; diff --git a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc index 68ec36ae06c7..5e1aadb32e5a 100644 --- a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc +++ b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc @@ -1,11 +1,11 @@ ---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2024-10-22 08:31:56 UTC +--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/codec/webrtc_video_encoder_vpx.cc -@@ -93,7 +93,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config +@@ -92,7 +92,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config const webrtc::DesktopSize& size) { SetCommonCodecParameters(config, size); --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On Linux, using too many threads for VP8 encoding has been linked to high // CPU usage on machines that are under stress. See http://crbug.com/1151148. // 5/3/2022 update: Perf testing has shown that doubling the number of threads diff --git a/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc b/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc index aeb2aa8bd1cc..2e7146d59246 100644 --- a/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc @@ -1,8 +1,8 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2024-04-19 13:02:56 UTC +--- remoting/host/basic_desktop_environment.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/basic_desktop_environment.cc @@ -195,7 +195,7 @@ std::unique_ptr<DesktopCapturer> BasicDesktopEnvironme scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) capture_task_runner = ui_task_runner_; -#elif BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_WAYLAND) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_WAYLAND) diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc index 76c2498d7077..0ec853691f3d 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_context.cc.orig 2024-11-14 07:57:23 UTC +--- remoting/host/chromoting_host_context.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/chromoting_host_context.cc -@@ -293,7 +293,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC +@@ -292,7 +292,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC // on a UI thread. scoped_refptr<AutoThreadTaskRunner> input_task_runner = AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, diff --git a/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc index 98793b85de1a..e397dc3954fe 100644 --- a/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc +++ b/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc @@ -1,6 +1,6 @@ ---- remoting/host/desktop_capturer_proxy.cc.orig 2024-04-19 13:02:56 UTC +--- remoting/host/desktop_capturer_proxy.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/desktop_capturer_proxy.cc -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ #include "remoting/host/chromeos/frame_sink_desktop_capturer.h" #endif @@ -9,16 +9,16 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "remoting/host/linux/wayland_desktop_capturer.h" -@@ -91,7 +91,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( +@@ -90,7 +90,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) capturer_ = std::make_unique<FrameSinkDesktopCapturer>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static base::nix::SessionType session_type = base::nix::SessionType::kUnset; if (session_type == base::nix::SessionType::kUnset) { std::unique_ptr<base::Environment> env = base::Environment::Create(); -@@ -298,7 +298,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC +@@ -297,7 +297,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC bool DesktopCapturerProxy::SupportsFrameCallbacks() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc index 556c96a8d502..99a9be9bde18 100644 --- a/www/chromium/files/patch-remoting_host_host__details.cc +++ b/www/chromium/files/patch-remoting_host_host__details.cc @@ -1,11 +1,29 @@ ---- remoting/host/host_details.cc.orig 2022-02-28 16:54:41 UTC +--- remoting/host/host_details.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/host_details.cc -@@ -23,7 +23,7 @@ std::string GetHostOperatingSystemName() { +@@ -7,7 +7,7 @@ + #include "base/system/sys_info.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/linux_util.h" + #endif + +@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName() { return "Mac"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) + #elif BUILDFLAG(IS_CHROMEOS) return "ChromeOS"; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return "Linux"; #elif BUILDFLAG(IS_ANDROID) return "Android"; +@@ -34,7 +34,7 @@ std::string GetHostOperatingSystemName() { + // Get the host Operating System Version, removing the need to check for OS + // definitions and keeps the format used consistent. + std::string GetHostOperatingSystemVersion() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return base::GetLinuxDistro(); + #else + return base::SysInfo::OperatingSystemVersion(); diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index 0d6c65fceef4..af9e57b5d2da 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_main.cc.orig 2025-02-19 07:43:18 UTC +--- remoting/host/host_main.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/host_main.cc -@@ -50,7 +50,7 @@ int FileChooserMain(); +@@ -55,7 +55,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); int UrlForwarderConfiguratorMain(); #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ int XSessionChooserMain(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -63,7 +63,7 @@ const char kUsageMessage[] = +@@ -68,7 +68,7 @@ const char kUsageMessage[] = "\n" "Options:\n" @@ -18,7 +18,7 @@ " --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on " "Linux.\n" #endif // BUILDFLAG(IS_LINUX) -@@ -156,7 +156,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -161,7 +161,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeUrlForwarderConfigurator) { main_routine = &UrlForwarderConfiguratorMain; #endif // BUILDFLAG(IS_WIN) @@ -27,7 +27,7 @@ } else if (process_type == kProcessTypeXSessionChooser) { main_routine = &XSessionChooserMain; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -224,7 +224,7 @@ int HostMain(int argc, char** argv) { +@@ -229,7 +229,7 @@ int HostMain(int argc, char** argv) { // Note that we enable crash reporting only if the user has opted in to having // the crash reports uploaded. if (IsUsageStatsAllowed()) { diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc index a8cb7e6cc0a8..ace6470265a5 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2025-01-15 09:18:26 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/it2me/it2me_host.cc -@@ -58,7 +58,7 @@ +@@ -61,7 +61,7 @@ #include "remoting/host/chromeos/features.h" #endif @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -191,7 +191,7 @@ void It2MeHost::Connect( +@@ -224,7 +224,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -325,7 +325,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -376,7 +376,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/chromium/files/patch-remoting_host_legacy__interaction__strategy.cc b/www/chromium/files/patch-remoting_host_legacy__interaction__strategy.cc new file mode 100644 index 000000000000..0517ed7aaf53 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_legacy__interaction__strategy.cc @@ -0,0 +1,20 @@ +--- remoting/host/legacy_interaction_strategy.cc.orig 2025-03-05 08:14:56 UTC ++++ remoting/host/legacy_interaction_strategy.cc +@@ -43,7 +43,7 @@ + #include "remoting/host/chromeos/mouse_cursor_monitor_aura.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/linux/wayland_utils.h" + #endif + +@@ -88,7 +88,7 @@ std::unique_ptr<DesktopCapturer> LegacyInteractionStra + scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; + #if BUILDFLAG(IS_CHROMEOS) + capture_task_runner = ui_task_runner_; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (IsRunningWayland()) { + // Each capturer instance should get its own thread so the capturers don't + // compete with each other in multistream mode. diff --git a/www/chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc b/www/chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc index 7df8f30e6638..302b63fc6732 100644 --- a/www/chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc +++ b/www/chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc @@ -1,8 +1,8 @@ ---- remoting/host/mouse_cursor_monitor_proxy.cc.orig 2023-03-09 06:31:50 UTC +--- remoting/host/mouse_cursor_monitor_proxy.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/mouse_cursor_monitor_proxy.cc @@ -73,7 +73,7 @@ void MouseCursorMonitorProxy::Core::CreateMouseCursorM - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) mouse_cursor_monitor_ = std::make_unique<MouseCursorMonitorAura>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-remoting_host_policy__watcher.cc b/www/chromium/files/patch-remoting_host_policy__watcher.cc index cdc4630f633f..f0073c0c6936 100644 --- a/www/chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,6 +1,6 @@ ---- remoting/host/policy_watcher.cc.orig 2024-08-26 12:06:38 UTC +--- remoting/host/policy_watcher.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/policy_watcher.cc -@@ -178,7 +178,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() +@@ -177,7 +177,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif diff --git a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc index 2a32ddfb8642..67b85021c485 100644 --- a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/setup/start_host_main.cc.orig 2024-10-22 08:31:56 UTC +--- remoting/host/setup/start_host_main.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/host/setup/start_host_main.cc -@@ -38,7 +38,7 @@ +@@ -43,7 +43,7 @@ #include <unistd.h> #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -369,7 +369,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& +@@ -374,7 +374,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -394,7 +394,7 @@ int StartHostMain(int argc, char** argv) { +@@ -399,7 +399,7 @@ int StartHostMain(int argc, char** argv) { mojo::core::Init(); diff --git a/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc index f6b4349131bf..66e2af2f59cc 100644 --- a/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc +++ b/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc @@ -1,11 +1,11 @@ ---- remoting/protocol/webrtc_video_stream.cc.orig 2024-05-21 18:07:39 UTC +--- remoting/protocol/webrtc_video_stream.cc.orig 2025-03-05 08:14:56 UTC +++ remoting/protocol/webrtc_video_stream.cc @@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(const SessionOpti : session_options_(session_options) { // TODO(joedow): Dig into the threading model on other platforms to see if they // can also be updated to run on a dedicated thread. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) core_task_runner_ = base::ThreadPool::CreateSingleThreadTaskRunner( {base::TaskPriority::HIGHEST}, base::SingleThreadTaskRunnerThreadMode::DEDICATED); diff --git a/www/chromium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc b/www/chromium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc new file mode 100644 index 000000000000..a944a9226dbe --- /dev/null +++ b/www/chromium/files/patch-remoting_signaling_ftl__host__device__id__provider.cc @@ -0,0 +1,11 @@ +--- remoting/signaling/ftl_host_device_id_provider.cc.orig 2025-03-05 08:14:56 UTC ++++ remoting/signaling/ftl_host_device_id_provider.cc +@@ -16,7 +16,7 @@ constexpr char kDeviceIdPrefix[] = "crd-win-host-"; + constexpr char kDeviceIdPrefix[] = "crd-mac-host-"; + #elif BUILDFLAG(IS_CHROMEOS) + constexpr char kDeviceIdPrefix[] = "crd-cros-host-"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kDeviceIdPrefix[] = "crd-linux-host-"; + #else + constexpr char kDeviceIdPrefix[] = "crd-unknown-host-"; diff --git a/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc index 8ec351166a19..46e9d66c26e0 100644 --- a/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc +++ b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc @@ -1,14 +1,14 @@ ---- sandbox/linux/services/init_process_reaper.cc.orig 2022-02-07 13:39:41 UTC +--- sandbox/linux/services/init_process_reaper.cc.orig 2025-03-05 08:14:56 UTC +++ sandbox/linux/services/init_process_reaper.cc -@@ -2,6 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. +@@ -7,6 +7,7 @@ + #pragma allow_unsafe_libc_calls + #endif +#if 0 #include "sandbox/linux/services/init_process_reaper.h" #include <signal.h> -@@ -100,3 +101,4 @@ bool CreateInitProcessReaper(base::OnceClosure post_fo +@@ -105,3 +106,4 @@ bool CreateInitProcessReaper(base::OnceClosure post_fo } } // namespace sandbox. diff --git a/www/chromium/files/patch-services_device_public_cpp_device__features.cc b/www/chromium/files/patch-services_device_public_cpp_device__features.cc new file mode 100644 index 000000000000..d91e05f8bcef --- /dev/null +++ b/www/chromium/files/patch-services_device_public_cpp_device__features.cc @@ -0,0 +1,11 @@ +--- services/device/public/cpp/device_features.cc.orig 2025-03-05 08:14:56 UTC ++++ services/device/public/cpp/device_features.cc +@@ -114,7 +114,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { + + // Controls whether Chrome will try to automatically detach kernel drivers when + // a USB interface is busy. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kAutomaticUsbDetach, + "AutomaticUsbDetach", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-services_device_public_cpp_device__features.h b/www/chromium/files/patch-services_device_public_cpp_device__features.h new file mode 100644 index 000000000000..dd7b63ff9519 --- /dev/null +++ b/www/chromium/files/patch-services_device_public_cpp_device__features.h @@ -0,0 +1,11 @@ +--- services/device/public/cpp/device_features.h.orig 2025-03-05 08:14:56 UTC ++++ services/device/public/cpp/device_features.h +@@ -51,7 +51,7 @@ extern const DEVICE_FEATURES_EXPORT + + DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled(); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DEVICE_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAutomaticUsbDetach); + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index ffa2ada2ec45..fef990fccb85 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,14 +1,15 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2025-02-19 07:43:18 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2025-03-05 08:14:56 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -135,7 +135,11 @@ class TimeZoneMonitorLinuxImpl +@@ -131,9 +131,12 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. - const char* const kFilesToWatch[] = { + const auto kFilesToWatch = std::to_array<const char*>({ +#if BUILDFLAG(IS_BSD) -+ "/etc/localtime", + "/etc/localtime", +#else - "/etc/localtime", "/etc/timezone", "/etc/TZ", + "/etc/timezone", + "/etc/TZ", +#endif - }; + }); for (size_t index = 0; index < std::size(kFilesToWatch); ++index) { file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>()); diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index b80962c189f6..73d54126ff52 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- services/device/usb/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ services/device/usb/BUILD.gn -@@ -89,7 +89,7 @@ static_library("usb") { +@@ -90,7 +90,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -9,7 +9,7 @@ # These sources and deps are required for libusb. # TODO(crbug.com/40136337) Remove these sources. sources += [ -@@ -112,6 +112,13 @@ static_library("usb") { +@@ -113,6 +113,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -23,7 +23,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -133,7 +140,7 @@ static_library("usb") { +@@ -134,7 +141,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index d8b11e1382c2..c091fd861fa9 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,4 +1,4 @@ ---- services/network/network_context.cc.orig 2025-02-19 07:43:18 UTC +--- services/network/network_context.cc.orig 2025-03-05 08:14:56 UTC +++ services/network/network_context.cc @@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2494,7 +2494,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2508,7 +2508,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-services_network_network__context.h b/www/chromium/files/patch-services_network_network__context.h index 408d733ff47a..5e2124d97d68 100644 --- a/www/chromium/files/patch-services_network_network__context.h +++ b/www/chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2025-02-19 07:43:18 UTC +--- services/network/network_context.h.orig 2025-03-05 08:14:56 UTC +++ services/network/network_context.h -@@ -702,7 +702,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -704,7 +704,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 7cb5c687b72b..70939805b2ae 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2025-02-19 07:43:18 UTC +--- services/network/network_service.cc.orig 2025-03-05 08:14:56 UTC +++ services/network/network_service.cc -@@ -97,11 +97,11 @@ +@@ -98,11 +98,11 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -14,7 +14,7 @@ #include "services/network/network_change_notifier_passive_factory.h" #endif -@@ -971,7 +971,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -981,7 +981,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -23,7 +23,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1053,7 +1053,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1063,7 +1063,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index 2b9fe9cbe666..32bfead95706 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,4 +1,4 @@ ---- services/network/network_service.h.orig 2025-02-19 07:43:18 UTC +--- services/network/network_service.h.orig 2025-03-05 08:14:56 UTC +++ services/network/network_service.h @@ -237,7 +237,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService const std::vector<ContentSettingPatternSource>& settings) override; @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -501,7 +501,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -509,7 +509,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn index e12f60a1198a..d7f12c623c13 100644 --- a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- services/network/public/cpp/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ services/network/public/cpp/BUILD.gn -@@ -505,7 +505,7 @@ component("cpp_base") { +@@ -507,7 +507,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn index 39905484d679..08b5beecb693 100644 --- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- services/network/public/mojom/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ services/network/public/mojom/BUILD.gn -@@ -542,11 +542,11 @@ mojom("url_loader_base") { +@@ -550,11 +550,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1561,7 +1561,7 @@ mojom("mojom") { +@@ -1594,7 +1594,7 @@ mojom("mojom") { } } diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 6e06f87f08d7..8a1758021cae 100644 --- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2024-01-30 07:53:34 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-03-05 08:14:56 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; - #endif -@@ -219,7 +219,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( + os_dump->mappings_count = internal_os_dump.mappings_count; +@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -234,7 +234,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -280,7 +280,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -330,7 +330,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -391,7 +391,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index 8b9d2a942f5c..6f0894c533ea 100644 --- a/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2025-03-05 08:14:56 UTC +++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc -@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path +@@ -58,6 +58,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path } } @@ -8,7 +8,7 @@ auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path +@@ -79,6 +80,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path sandbox::syscall_broker::COMMAND_OPEN}), permissions, options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index ccea3ebf9834..f1eecda7f683 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,6 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2024-06-17 12:56:06 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2025-03-05 08:14:56 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -19,7 +19,7 @@ +@@ -24,7 +24,7 @@ #include <windows.h> #elif BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -105,7 +105,7 @@ static void* malloc_nothrow(size_t size, int debug_sen +@@ -110,7 +110,7 @@ static void* malloc_nothrow(size_t size, int debug_sen // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc index 8abddb1ca509..7e7dd2bfef35 100644 --- a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc +++ b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc @@ -1,11 +1,11 @@ ---- skia/ext/skcolorspace_trfn.cc.orig 2024-08-26 12:06:38 UTC +--- skia/ext/skcolorspace_trfn.cc.orig 2025-03-05 08:14:56 UTC +++ skia/ext/skcolorspace_trfn.cc -@@ -7,6 +7,8 @@ - #pragma allow_unsafe_buffers - #endif +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +#include <cmath> + #include "skia/ext/skcolorspace_trfn.h" - #include <cmath> + #include <array> diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 16c204c04383..637fbd6c52b5 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2025-02-19 07:43:18 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2025-03-05 08:14:56 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -58,7 +58,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -45,7 +45,7 @@ extensions.platformSurfacelessMESA = true; #endif -@@ -2185,7 +2185,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2186,7 +2186,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h b/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h deleted file mode 100644 index dd49ce76f202..000000000000 --- a/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/public/platform/web_vector.h.orig 2025-02-19 07:43:18 UTC -+++ third_party/blink/public/platform/web_vector.h -@@ -86,7 +86,7 @@ class WebVector { - // The vector can be populated using reserve() and emplace_back(). - WebVector() = default; - --#if defined(ARCH_CPU_64_BITS) -+#if defined(ARCH_CPU_64_BITS) || defined(__OpenBSD__) - // Create a vector with |size| default-constructed elements. We define - // a constructor with size_t otherwise we'd have a duplicate define. - explicit WebVector(size_t size) : data_(size) {} diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 4fd279cacac4..ad4e39a0c78b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2024-11-14 07:57:23 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index ec933462b3b4..671d2bf6c0d5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-11-14 07:57:23 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6474,7 +6474,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6470,7 +6470,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6883,7 +6883,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6879,7 +6879,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 71733a9b0845..e62709ecbee3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,9 +1,9 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2024-01-30 07:53:34 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc @@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( - const WebVector<const void*>& addresses) { + const std::vector<const void*>& addresses) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(alph): Move symbolization to the client. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc index 58223ab80507..f3135a831cac 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc -@@ -463,7 +463,7 @@ bool MixedContentChecker::ShouldBlockFetch( +@@ -484,7 +484,7 @@ bool MixedContentChecker::ShouldBlockFetch( switch (context_type) { case mojom::blink::MixedContentContextType::kOptionallyBlockable: diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc index 98578271faec..7a3cd34bc42f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc -@@ -565,7 +565,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const +@@ -566,7 +566,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const } if (trial_name == "TranslationAPI") { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 43c602ae9825..1423e17000d4 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -147,7 +147,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // Disable snapback on desktop Linux to better integrate with the desktop @@ -9,7 +9,7 @@ return false; #else return true; -@@ -420,7 +420,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT +@@ -424,7 +424,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) const { diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 3090bbd4dba3..0fa3ded9cffd 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6306,7 +6306,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6340,7 +6340,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index 98ef22fa5884..893b88bc3a40 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -811,7 +811,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -815,7 +815,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index d8467b1d0359..f3b64432b2de 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2034,7 +2034,7 @@ static_library("test_support") { +@@ -2026,7 +2026,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index d47607602d5b..a7975523f42f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-08-26 12:06:38 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -282,7 +282,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -284,7 +284,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 47749702d20f..a018c964c60b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -431,7 +431,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -421,7 +421,7 @@ void VideoFrameSubmitter::OnBeginFrame( auto& details = timing_details.find(frame_token)->value; auto& feedback = details.presentation_feedback; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 9dfc5b67d20f..1c5f8581fe09 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-02-19 07:43:18 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-03-05 08:14:56 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -406,7 +406,7 @@ +@@ -427,7 +427,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1559,7 +1559,7 @@ +@@ -1599,7 +1599,7 @@ name: "DocumentIsolationPolicy", status: "experimental", origin_trial_feature_name: "DocumentIsolationPolicy", @@ -18,7 +18,7 @@ base_feature: "none", }, { -@@ -1852,7 +1852,7 @@ +@@ -1895,7 +1895,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -27,16 +27,16 @@ origin_trial_allows_third_party: true, }, { -@@ -3275,7 +3275,7 @@ +@@ -3285,7 +3285,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", -- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], - status: {"Android": "", "default": "experimental"}, +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "android"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "android", "openbsd", "freebsd"], + status: "experimental", public: true, base_feature_status: "enabled", -@@ -3401,7 +3401,7 @@ +@@ -3422,7 +3422,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -45,7 +45,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4433,7 +4433,7 @@ +@@ -4482,7 +4482,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -54,7 +54,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4617,7 +4617,7 @@ +@@ -4669,7 +4669,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -63,3 +63,12 @@ status: "experimental", base_feature: "none", }, +@@ -4938,7 +4938,7 @@ + { + name: "WebIdentityDigitalCredentials", + origin_trial_feature_name: "WebIdentityDigitalCredentials", +- origin_trial_os: ["android", "win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["android", "win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + implied_by: ["WebIdentityDigitalCredentialsCreation"], + public: true, diff --git a/www/chromium/files/patch-third__party_ipcz_src_standalone_base_logging.cc b/www/chromium/files/patch-third__party_ipcz_src_standalone_base_logging.cc index e78ffde6fb39..b28bf070e23c 100644 --- a/www/chromium/files/patch-third__party_ipcz_src_standalone_base_logging.cc +++ b/www/chromium/files/patch-third__party_ipcz_src_standalone_base_logging.cc @@ -1,6 +1,6 @@ ---- third_party/ipcz/src/standalone/base/logging.cc.orig 2022-05-19 14:06:27 UTC +--- third_party/ipcz/src/standalone/base/logging.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/ipcz/src/standalone/base/logging.cc -@@ -50,6 +50,9 @@ LogMessage::LogMessage(const char* file, int line, Lev +@@ -55,6 +55,9 @@ LogMessage::LogMessage(const char* file, int line, Lev #elif BUILDFLAG(IS_ANDROID) stream_ << getpid() << ":" << gettid() << ":"; const char* trimmed_file = strrchr(file, '/') + 1; diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index c4440c8109c9..0f661e02c48d 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2025-02-19 07:43:18 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2025-03-05 08:14:56 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include <unistd.h> #endif @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -940,9 +940,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -976,9 +976,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { int res = getpeereid(fd, &peer_uid_, nullptr); PERFETTO_CHECK(res == 0); // There is no pid when obtaining peer credentials for QNX diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index ef8fa4fd6b39..bf7e563d38bd 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- third_party/sqlite/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ third_party/sqlite/BUILD.gn -@@ -153,7 +153,7 @@ config("sqlite_warnings") { +@@ -155,7 +155,7 @@ config("sqlite_warnings") { ] } } diff --git a/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h index a619d683d95b..0c32c818e4d9 100644 --- a/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-11-14 07:57:23 UTC +--- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2025-03-05 08:14:56 UTC +++ third_party/vulkan-loader/src/loader/vk_loader_platform.h -@@ -342,7 +342,15 @@ static inline char *loader_platform_executable_path(ch +@@ -353,7 +353,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/chromium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h b/www/chromium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h index 708c0dd9002e..a4f92af117c8 100644 --- a/www/chromium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h +++ b/www/chromium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2024-07-30 11:12:21 UTC +--- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2025-03-05 08:14:56 UTC +++ third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h -@@ -2740,7 +2740,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ +@@ -2971,7 +2971,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ return memalign(alignment, size); } diff --git a/www/chromium/files/patch-tools_grit_grit_node_base.py b/www/chromium/files/patch-tools_grit_grit_node_base.py index 94bb1b10e40b..4f1e956873cb 100644 --- a/www/chromium/files/patch-tools_grit_grit_node_base.py +++ b/www/chromium/files/patch-tools_grit_grit_node_base.py @@ -1,6 +1,6 @@ ---- tools/grit/grit/node/base.py.orig 2024-02-23 21:04:38 UTC +--- tools/grit/grit/node/base.py.orig 2025-03-05 08:14:56 UTC +++ tools/grit/grit/node/base.py -@@ -498,7 +498,8 @@ class Node: +@@ -499,7 +499,8 @@ class Node: value = defs elif name == 'is_linux': diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index 624465d43008..151c091244a1 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,6 +1,6 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -41,7 +41,7 @@ group("telemetry_chrome_test") { +@@ -61,7 +61,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } @@ -9,7 +9,7 @@ data_deps += [ "//third_party/breakpad:dump_syms" ] # CrOS currently has issues with the locally compiled version of -@@ -192,7 +192,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -212,7 +212,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. diff --git a/www/chromium/files/patch-ui_accessibility_accessibility__features.cc b/www/chromium/files/patch-ui_accessibility_accessibility__features.cc new file mode 100644 index 000000000000..d4c2f4a5873a --- /dev/null +++ b/www/chromium/files/patch-ui_accessibility_accessibility__features.cc @@ -0,0 +1,11 @@ +--- ui/accessibility/accessibility_features.cc.orig 2025-03-05 08:14:56 UTC ++++ ui/accessibility/accessibility_features.cc +@@ -401,7 +401,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled + } + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kWasmTtsComponentUpdaterEnabled, + "WasmTtsComponentUpdaterEnabled", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-ui_accessibility_accessibility__features.h b/www/chromium/files/patch-ui_accessibility_accessibility__features.h new file mode 100644 index 000000000000..b239a208a16d --- /dev/null +++ b/www/chromium/files/patch-ui_accessibility_accessibility__features.h @@ -0,0 +1,11 @@ +--- ui/accessibility/accessibility_features.h.orig 2025-03-05 08:14:56 UTC ++++ ui/accessibility/accessibility_features.h +@@ -277,7 +277,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc + AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled(); + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enable the component updater to download the wasm tts engine component. + AX_BASE_EXPORT BASE_DECLARE_FEATURE(kWasmTtsComponentUpdaterEnabled); + AX_BASE_EXPORT bool IsWasmTtsComponentUpdaterEnabled(); diff --git a/www/chromium/files/patch-ui_base_accelerators_command.cc b/www/chromium/files/patch-ui_base_accelerators_command.cc new file mode 100644 index 000000000000..81e60679f5b5 --- /dev/null +++ b/www/chromium/files/patch-ui_base_accelerators_command.cc @@ -0,0 +1,11 @@ +--- ui/base/accelerators/command.cc.orig 2025-03-05 08:14:56 UTC ++++ ui/base/accelerators/command.cc +@@ -49,7 +49,7 @@ std::string Command::CommandPlatform() { + return ui::kKeybindingPlatformMac; + #elif BUILDFLAG(IS_CHROMEOS) + return ui::kKeybindingPlatformChromeOs; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return ui::kKeybindingPlatformLinux; + #elif BUILDFLAG(IS_FUCHSIA) + // TODO(crbug.com/40220501): Change this once we decide what string should be diff --git a/www/chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc b/www/chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc index a3d4e4af4c6a..b6c26f76af77 100644 --- a/www/chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc +++ b/www/chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc @@ -1,4 +1,4 @@ ---- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig 2025-02-19 07:43:18 UTC +--- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig 2025-03-05 08:14:56 UTC +++ ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc @@ -12,7 +12,7 @@ #include "ui/base/accelerators/accelerator.h" @@ -17,7 +17,7 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS) BASE_FEATURE(kGlobalShortcutsPortal, "GlobalShortcutsPortal", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); @@ -38,7 +38,7 @@ GlobalAcceleratorListener* GlobalAcceleratorListener:: return instance->get(); } diff --git a/www/chromium/files/patch-ui_base_ime_text__input__client.h b/www/chromium/files/patch-ui_base_ime_text__input__client.h index 200f53dc7d1e..b6a2cf4fb2e0 100644 --- a/www/chromium/files/patch-ui_base_ime_text__input__client.h +++ b/www/chromium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2025-02-19 07:43:18 UTC +--- ui/base/ime/text_input_client.h.orig 2025-03-05 08:14:56 UTC +++ ui/base/ime/text_input_client.h -@@ -335,7 +335,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { +@@ -337,7 +337,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index 9e9650eddd03..0a9e4249ae59 100644 --- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,6 +1,6 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2025-01-15 09:18:26 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2025-03-05 08:14:56 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -112,7 +112,7 @@ const char* GetPlatformName() { +@@ -117,7 +117,7 @@ const char* GetPlatformName() { return "windows"; #elif BUILDFLAG(IS_APPLE) return "macOS"; diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 1d8b820e4815..e288e6be67f9 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_features.cc.orig 2025-02-19 07:43:18 UTC +--- ui/base/ui_base_features.cc.orig 2025-03-05 08:14:56 UTC +++ ui/base/ui_base_features.cc @@ -133,7 +133,7 @@ BASE_FEATURE(kWaylandUiScale, base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // If this feature is enabled, users not specify --ozone-platform-hint switch // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220. COMPONENT_EXPORT(UI_BASE_FEATURES) -@@ -209,7 +209,7 @@ BASE_FEATURE(kUiCompositorScrollWithLayers, +@@ -215,7 +215,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, // native apps on Windows. BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc index 91e0fbfd4886..248a810b418f 100644 --- a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,6 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2025-02-19 07:43:18 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2025-03-05 08:14:56 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -36,7 +36,7 @@ +@@ -41,7 +41,7 @@ #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -81,7 +81,11 @@ std::string CursorPathFromLibXcursor() { +@@ -86,7 +86,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -210,7 +214,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -215,7 +219,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -400,7 +404,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -405,7 +409,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index d0296a6b8b6b..983aaaa57c15 100644 --- a/www/chromium/files/patch-ui_color_color__id.h +++ b/www/chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2025-02-19 07:43:18 UTC +--- ui/color/color_id.h.orig 2025-03-05 08:14:56 UTC +++ ui/color/color_id.h -@@ -619,7 +619,7 @@ +@@ -620,7 +620,7 @@ \ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index e40e2d62ba97..0fcb74f4d96b 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2025-02-19 07:43:18 UTC +--- ui/compositor/compositor.cc.orig 2025-03-05 08:14:56 UTC +++ ui/compositor/compositor.cc -@@ -910,7 +910,7 @@ void Compositor::OnResume() { +@@ -929,7 +929,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 25b10dfd55e4..59c4f71843b9 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2025-01-15 09:18:26 UTC +--- ui/compositor/compositor.h.orig 2025-03-05 08:14:56 UTC +++ ui/compositor/compositor.h -@@ -456,7 +456,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 71b3f530e83e..a2f6a3c7f910 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2025-01-15 09:18:26 UTC +--- ui/gfx/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/BUILD.gn -@@ -653,7 +653,7 @@ source_set("memory_buffer_sources") { +@@ -656,7 +656,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index 9481b44bdab6..08cb6b3730a6 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2024-02-23 21:04:38 UTC +--- ui/gfx/canvas_skia.cc.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/canvas_skia.cc -@@ -213,7 +213,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -218,7 +218,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc b/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc index 7e46ea25b400..f0e4a6f9c62c 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params_linux.cc.orig 2025-01-15 09:18:26 UTC +--- ui/gfx/font_render_params_linux.cc.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/font_render_params_linux.cc @@ -24,7 +24,7 @@ #include "ui/gfx/linux/fontconfig_util.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -211,7 +211,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP +@@ -222,7 +222,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP // Start with the delegate's settings, but let Fontconfig have the final say. FontRenderParams params; diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc index c0487e95f7f6..d31376263546 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -1,7 +1,7 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2024-11-14 07:57:23 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/gpu_memory_buffer.cc -@@ -63,7 +63,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c - handle.region = region.Duplicate(); +@@ -108,7 +108,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c + handle.id = id; handle.offset = offset; handle.stride = stride; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index ac6d3f7bbc75..b48fe25aaa9e 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,6 +1,6 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2025-01-15 09:18:26 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/gpu_memory_buffer.h -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ #include "ui/gfx/generic_shared_memory_id.h" #include "ui/gfx/geometry/rect.h" @@ -9,8 +9,8 @@ #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_APPLE) #include "ui/gfx/mac/io_surface.h" -@@ -76,7 +76,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { - base::UnsafeSharedMemoryRegion region; +@@ -205,7 +205,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { + uint32_t offset = 0; uint32_t stride = 0; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc deleted file mode 100644 index f8151c2dd6ee..000000000000 --- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2023-01-11 09:17:16 UTC -+++ ui/gfx/mojom/buffer_types_mojom_traits.cc -@@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra - return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( - std::move(handle.region)); - case gfx::NATIVE_PIXMAP: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) - return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( - std::move(handle.native_pixmap_handle)); - #else -@@ -115,7 +115,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat - out->type = gfx::SHARED_MEMORY_BUFFER; - out->region = std::move(platform_handle->get_shared_memory_handle()); - return true; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) - case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: - kNativePixmapHandle: - out->type = gfx::NATIVE_PIXMAP; diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index 0182f2ea879b..02121020a941 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,8 +1,17 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2023-01-11 09:17:16 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc -@@ -8,11 +8,11 @@ +@@ -14,7 +14,7 @@ + #include "ui/gfx/mac/io_surface.h" + #endif // BUILDFLAG(IS_APPLE) - namespace mojo { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) + #include "ui/gfx/native_pixmap_handle.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) + +@@ -80,11 +80,11 @@ bool StructTraits<gfx::mojom::AHardwareBufferHandleDat + } + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) @@ -14,7 +23,7 @@ return mojo::PlatformHandle(std::move(plane.fd)); #elif BUILDFLAG(IS_FUCHSIA) return mojo::PlatformHandle(std::move(plane.vmo)); -@@ -28,7 +28,7 @@ bool StructTraits< +@@ -100,7 +100,7 @@ bool StructTraits< out->size = data.size(); mojo::PlatformHandle handle = data.TakeBufferHandle(); @@ -23,7 +32,7 @@ if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); -@@ -54,7 +54,7 @@ bool StructTraits< +@@ -126,7 +126,7 @@ bool StructTraits< gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out) { @@ -32,3 +41,21 @@ out->modifier = data.modifier(); out->supports_zero_copy_webgpu_import = data.supports_zero_copy_webgpu_import(); +@@ -190,7 +190,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag + NOTREACHED(); + #endif // BUILDFLAG(IS_APPLE) + case gfx::NATIVE_PIXMAP: +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) + return Tag::kNativePixmapHandle; + #else + NOTREACHED(); +@@ -259,7 +259,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa + } + return true; + #endif // BUILDFLAG(IS_APPLE) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) + case Tag::kNativePixmapHandle: + handle->type = gfx::NATIVE_PIXMAP; + return data.ReadNativePixmapHandle(&handle->native_pixmap_handle); diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index d52fd6337cd3..0b28e911943c 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,24 +1,24 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2024-03-22 08:19:40 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2025-03-05 08:14:56 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h -@@ -16,7 +16,7 @@ - #include "mojo/public/cpp/system/platform_handle.h" +@@ -18,7 +18,7 @@ + #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" - #endif - -@@ -26,7 +26,7 @@ + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) - namespace mojo { +@@ -46,7 +46,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED + }; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -54,13 +54,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -74,13 +74,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } @@ -34,3 +34,12 @@ static bool supports_zero_copy_webgpu_import( const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.supports_zero_copy_webgpu_import; +@@ -159,7 +159,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED + static PlatformHandle mach_port(gfx::GpuMemoryBufferHandle& handle); + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) + static gfx::NativePixmapHandle& native_pixmap_handle( + gfx::GpuMemoryBufferHandle& handle) { + return handle.native_pixmap_handle; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index c02d7df964b7..aae72fec4c93 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- ui/gl/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ ui/gl/BUILD.gn -@@ -168,7 +168,6 @@ component("gl") { +@@ -169,7 +169,6 @@ component("gl") { public_deps = [ ":gl_enums", "//base", @@ -8,7 +8,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -316,7 +315,6 @@ component("gl") { +@@ -323,7 +322,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -16,7 +16,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -541,7 +539,6 @@ test("gl_unittests") { +@@ -548,7 +546,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_gl_gl__switches.cc b/www/chromium/files/patch-ui_gl_gl__switches.cc index b027b2a948d2..3555e18ee9cc 100644 --- a/www/chromium/files/patch-ui_gl_gl__switches.cc +++ b/www/chromium/files/patch-ui_gl_gl__switches.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_switches.cc.orig 2025-02-19 07:43:18 UTC +--- ui/gl/gl_switches.cc.orig 2025-03-05 08:14:56 UTC +++ ui/gl/gl_switches.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "base/android/build_info.h" #endif @@ -9,7 +9,7 @@ #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -305,7 +305,7 @@ bool IsDefaultANGLEVulkan() { +@@ -314,7 +314,7 @@ bool IsDefaultANGLEVulkan() { return false; } #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ angle::SystemInfo system_info; { GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan"); -@@ -353,7 +353,7 @@ bool IsDefaultANGLEVulkan() { +@@ -367,7 +367,7 @@ bool IsDefaultANGLEVulkan() { } #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index a6764928e84f..2cf28f0232ac 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2025-02-19 07:43:18 UTC +--- ui/native_theme/native_theme_base.cc.orig 2025-03-05 08:14:56 UTC +++ ui/native_theme/native_theme_base.cc -@@ -238,7 +238,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -239,7 +239,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, absl::get<ButtonExtraParams>(extra), color_scheme, accent_color_opaque); break; diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__features.cc b/www/chromium/files/patch-ui_native__theme_native__theme__features.cc index 29f719c2a584..a5d8a6a204f8 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__features.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__features.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_features.cc.orig 2025-01-15 09:18:26 UTC +--- ui/native_theme/native_theme_features.cc.orig 2025-03-05 08:14:56 UTC +++ ui/native_theme/native_theme_features.cc -@@ -56,7 +56,7 @@ namespace ui { +@@ -73,7 +73,7 @@ namespace ui { bool IsFluentOverlayScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar); #else return false; -@@ -65,7 +65,7 @@ bool IsFluentOverlayScrollbarEnabled() { +@@ -82,7 +82,7 @@ bool IsFluentOverlayScrollbarEnabled() { bool IsFluentScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc deleted file mode 100644 index 3d4040814862..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -325,7 +325,7 @@ void SkColorToWlArray(const SkColor4f& color, wl_array - } - - base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/40287874): `milliseconds` comes from Weston that - // uses timestamp from libinput, which is different from TimeTicks. - // Use EventTimeForNow(), for now. -@@ -367,7 +367,7 @@ bool MaybeHandlePlatformEventForDrag(const ui::Platfor - } - - void RecordConnectionMetrics(wl_display* display) { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - CHECK(display); - - // These values are logged to metrics so must not be changed. diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc deleted file mode 100644 index 464ae89fafe2..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc -@@ -281,7 +281,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s - } - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void WaylandInputEmulate::ForceUseScreenCoordinatesOnce() { - force_use_screen_coordinates_once_ = true; - } diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h b/www/chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h deleted file mode 100644 index 7e85663dd503..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2024-03-22 08:19:40 UTC -+++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.h -@@ -68,7 +68,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D - uint32_t request_id); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void ForceUseScreenCoordinatesOnce(); - #endif - diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc deleted file mode 100644 index 5209a29100db..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/host/wayland_connection.cc -@@ -492,7 +492,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c - // isn't present on any non-exo Wayland compositors. - bool should_use_overlay_delegation = - IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1(); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Overlay delegation also requires a single-pixel-buffer protocol, which - // allows creation of non-backed solid color buffers. Even though only video - // overlays can be supported on Linux, these color buffers are still needed diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc deleted file mode 100644 index 388d7cf81c69..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc -@@ -53,7 +53,7 @@ namespace { - // Only enable the preedit string for sequence mode (i.e. when using dead keys - // or the Compose key) on Linux ozone/wayland (see b/220370007). - constexpr CharacterComposer::PreeditStringMode kPreeditStringMode = --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - CharacterComposer::PreeditStringMode::kAlwaysEnabled; - #else - CharacterComposer::PreeditStringMode::kHexModeOnly; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc deleted file mode 100644 index a583cb2c984e..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_popup.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/host/wayland_popup.cc -@@ -31,7 +31,7 @@ WaylandPopup::WaylandPopup(PlatformWindowDelegate* del - WaylandWindow* parent) - : WaylandWindow(delegate, connection) { - set_parent_window(parent); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/330384470): Whether the popup appear depends on whether - // anchor point is outside of the parent xdg_surface. On Mutter the popup will - // not show when outside. diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h deleted file mode 100644 index b169f399c9b5..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -183,7 +183,7 @@ class WaylandToplevelWindow : public WaylandWindow, - // The display ID to switch to in case the state is `kFullscreen`. - int64_t fullscreen_display_id_ = display::kInvalidDisplayId; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Contains the current state of the tiled edges. - WindowTiledEdges tiled_state_; - #endif diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc deleted file mode 100644 index 1c44bd9be989..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc +++ /dev/null @@ -1,44 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -313,7 +313,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused - // Whenever the window gets the pointer focus back, the cursor shape must be - // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not - // restored by the Wayland compositor. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (focused && async_cursor_) { - async_cursor_->AddCursorLoadedCallback(base::BindOnce( - &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_)); -@@ -586,7 +586,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { - void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { - DCHECK(platform_cursor); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); - - if (async_cursor_ == async_cursor) { -@@ -758,7 +758,7 @@ std::string WaylandWindow::WindowStates::ToString() co - } else { - base::TrimString(states, " ", &states); - } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - states += "; tiled_edges: "; - std::string tiled = ""; - if (tiled_edges.left) { -@@ -1228,12 +1228,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi - cursor->bitmaps(), hotspot_in_dips, - std::ceil(cursor->cursor_image_scale_factor())); - } --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - cursor_ = cursor; - #endif - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void WaylandWindow::OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, - scoped_refptr<BitmapCursor> bitmap_cursor) { - if (HasPointerFocus() && async_cursor_ == cursor && bitmap_cursor) { diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h deleted file mode 100644 index 2b285abf0f85..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ /dev/null @@ -1,38 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -40,7 +40,7 @@ - #include "ui/platform_window/platform_window_init_properties.h" - #include "ui/platform_window/wm/wm_drag_handler.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" - #endif - -@@ -259,7 +259,7 @@ class WaylandWindow : public PlatformWindow, - bool is_activated = false; - bool is_minimized = false; - bool is_suspended = false; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - WindowTiledEdges tiled_edges; - #endif - -@@ -533,7 +533,7 @@ class WaylandWindow : public PlatformWindow, - - void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, - scoped_refptr<BitmapCursor> bitmap_cursor); - #endif -@@ -603,7 +603,7 @@ class WaylandWindow : public PlatformWindow, - // the subsurface arrangement are played back by WaylandFrameManager. - base::LinkedList<WaylandSubsurface> subsurface_stack_committed_; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // The current asynchronously loaded cursor (Linux specific). - scoped_refptr<WaylandAsyncCursor> async_cursor_; - #else diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc index 2c481758f96c..39c64c18b8b0 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-10-22 08:31:56 UTC +--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2025-03-05 08:14:56 UTC +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -256,6 +256,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -261,6 +261,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( // so if it exceeds 16 bits, it may be broken. static constexpr size_t kSizeLimit = 60000; if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { @@ -11,7 +11,7 @@ base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); if (!memfd.get()) { PLOG(ERROR) << "Failed to create memfd"; -@@ -268,6 +272,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -273,6 +277,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( zcr_extended_text_input_v1_set_large_surrounding_text( extended_obj_.get(), memfd.get(), text.length(), selection_range.start(), selection_range.end()); diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc deleted file mode 100644 index 5a2c18217295..000000000000 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2025-02-19 07:43:18 UTC -+++ ui/ozone/platform/wayland/ozone_platform_wayland.cc -@@ -66,13 +66,13 @@ - #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" - #else - #include "ui/ozone/common/bitmap_cursor_factory.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" - #endif - -@@ -292,7 +292,7 @@ class OzonePlatformWayland : public OzonePlatform, - - buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( - connection_->buffer_manager_host()); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); - #else - cursor_factory_ = std::make_unique<BitmapCursorFactory>(); -@@ -302,7 +302,7 @@ class OzonePlatformWayland : public OzonePlatform, - - supported_buffer_formats_ = - connection_->buffer_manager_host()->GetSupportedBufferFormats(); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - linux_ui_delegate_ = - std::make_unique<LinuxUiDelegateWayland>(connection_.get()); - #endif -@@ -543,7 +543,7 @@ class OzonePlatformWayland : public OzonePlatform, - DrmRenderNodePathFinder path_finder_; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::unique_ptr<LinuxUiDelegateWayland> linux_ui_delegate_; - #endif - }; diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc index 423492dcddb3..d2daaae04de4 100644 --- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc +++ b/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2024-03-22 08:19:40 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2025-03-05 08:14:56 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.cc @@ -22,7 +22,7 @@ #include "ui/ozone/platform/x11/x11_window.h" @@ -18,7 +18,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) { display_scale_factor_observer_.Observe(linux_ui); } -@@ -260,7 +260,7 @@ void X11ScreenOzone::OnEvent(const x11::Event& xev) { +@@ -267,7 +267,7 @@ void X11ScreenOzone::OnEvent(const x11::Event& xev) { x11_display_manager_->OnEvent(xev); } diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc index 310c4bf766b2..bc19589ab203 100644 --- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2025-02-19 07:43:18 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2025-03-05 08:14:56 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1501,7 +1501,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1502,7 +1502,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 2f2f333b5bcc..ba32658a839b 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2025-02-19 07:43:18 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2025-03-05 08:14:56 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -86,7 +86,7 @@ +@@ -85,7 +85,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" -@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) { +@@ -182,7 +182,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -789,7 +789,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event return handled; } @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -974,7 +974,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -2066,7 +2066,7 @@ bool Textfield::ShouldDoLearning() { +@@ -2065,7 +2065,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2584,7 +2584,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2583,7 +2583,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -54,7 +54,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift) { return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; -@@ -2592,7 +2592,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2591,7 +2591,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index 4db1c5d90ee6..a6f570237453 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2025-02-19 07:43:18 UTC +--- ui/views/focus/focus_manager.cc.orig 2025-03-05 08:14:56 UTC +++ ui/views/focus/focus_manager.cc -@@ -603,7 +603,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -604,7 +604,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi return false; } @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -618,7 +618,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -619,7 +619,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi const bool accelerator_processed = focus_manager->ProcessAccelerator(accelerator); diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index f722c0c247e9..e4e1e07d73fc 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2025-02-19 07:43:18 UTC +--- ui/views/widget/widget.cc.orig 2025-03-05 08:14:56 UTC +++ ui/views/widget/widget.cc -@@ -60,7 +60,7 @@ +@@ -63,7 +63,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2372,7 +2372,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2444,7 +2444,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const return parent_->GetNativeTheme(); } diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 3d9c205bc011..d16c131b3ef9 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/window/dialog_delegate.cc.orig 2024-10-22 08:31:56 UTC +--- ui/views/window/dialog_delegate.cc.orig 2025-03-05 08:14:56 UTC +++ ui/views/window/dialog_delegate.cc @@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - BUILDFLAG(ENABLE_DESKTOP_AURA) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) // The new style doesn't support unparented dialogs on Linux desktop. return parent != nullptr; + #else diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 2b090c01cccb..6a51e76d21ef 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2025-02-19 07:43:18 UTC +--- v8/BUILD.gn.orig 2025-03-05 08:14:56 UTC +++ v8/BUILD.gn -@@ -945,6 +945,8 @@ external_v8_defines = [ +@@ -960,6 +960,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -1024,6 +1026,12 @@ if (target_os == "android") { +@@ -1039,6 +1041,12 @@ if (target_os == "android") { } else if (target_os == "chromeos") { enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -22,7 +22,7 @@ } disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines -@@ -2599,6 +2607,12 @@ template("run_mksnapshot") { +@@ -2465,6 +2473,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } if (v8_enable_turboshaft_csa) { -@@ -6683,7 +6697,7 @@ v8_component("v8_libbase") { +@@ -6546,7 +6560,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6694,6 +6708,18 @@ v8_component("v8_libbase") { +@@ -6557,6 +6571,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 3a0d32fa3d5b..31698c119dbf 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2025-02-19 07:43:18 UTC +--- v8/src/api/api.cc.orig 2025-03-05 08:14:56 UTC +++ v8/src/api/api.cc @@ -153,7 +153,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6640,7 +6640,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6614,7 +6614,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc deleted file mode 100644 index 42ff15c7dedc..000000000000 --- a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2025-02-19 07:43:18 UTC -+++ v8/src/builtins/x64/builtins-x64.cc -@@ -1836,7 +1836,7 @@ static void Generate_InterpreterEnterBytecode(MacroAss - times_system_pointer_size, 0)); - - // Jump to the interpreter entry, and call kJavaScriptCallCodeStartRegister. -- __ jmp(rbx); -+ __ jmp(rbx, /*notrack=*/true); - } - - void Builtins::Generate_InterpreterEnterAtNextBytecode(MacroAssembler* masm) { diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 8c214d9849dd..e7c55f4138ef 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2025-02-19 07:43:18 UTC +--- v8/src/execution/isolate.cc.orig 2025-03-05 08:14:56 UTC +++ v8/src/execution/isolate.cc -@@ -171,6 +171,10 @@ +@@ -172,6 +172,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -5045,6 +5049,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -5048,6 +5052,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/chromium/files/patch-v8_src_flags_flags.cc b/www/chromium/files/patch-v8_src_flags_flags.cc index 200ac3809320..16ee51dd6b20 100644 --- a/www/chromium/files/patch-v8_src_flags_flags.cc +++ b/www/chromium/files/patch-v8_src_flags_flags.cc @@ -1,4 +1,4 @@ ---- v8/src/flags/flags.cc.orig 2025-02-19 07:43:18 UTC +--- v8/src/flags/flags.cc.orig 2025-03-05 08:14:56 UTC +++ v8/src/flags/flags.cc @@ -16,6 +16,10 @@ #include <set> @@ -11,7 +11,7 @@ #include "src/base/hashing.h" #include "src/base/lazy-instance.h" #include "src/base/platform/platform.h" -@@ -816,6 +820,10 @@ void FlagList::FreezeFlags() { +@@ -823,6 +827,10 @@ void FlagList::FreezeFlags() { // Note that for string flags we only protect the pointer itself, but not the // string storage. TODO(12887): Fix this. base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); diff --git a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc index 1a3b89c19505..8ea9f08c3823 100644 --- a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc +++ b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- v8/src/sandbox/sandbox.cc.orig 2025-02-19 07:43:18 UTC +--- v8/src/sandbox/sandbox.cc.orig 2025-03-05 08:14:56 UTC +++ v8/src/sandbox/sandbox.cc -@@ -60,7 +60,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -59,7 +59,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 7f700c6df485..2ec07b30c6ad 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -131,7 +131,6 @@ bin/chrome %%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper_manifest.json %%DATADIR%%/resources/inspector_overlay/inspector_overlay_resources.grd %%DATADIR%%/resources/inspector_overlay/main.js -%%DATADIR%%/resources/tts_engine/background.js %%DATADIR%%/snapshot_blob.bin %%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%NOT_AARCH64%%%%DATADIR%%/vk_swiftshader_icd.json |