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

www/ungoogled-chromium: update to 135.0.7049.84

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/030778d5-19cc-11f0-8cb5-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2025-04-15 17:05:01 +02:00
parent af01bb5586
commit c0c563cbe2
435 changed files with 2890 additions and 2311 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/ungoogled-chromium/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 134.0.6998.165
PORTREVISION= 2
PORTVERSION= 135.0.7049.84
PULSEMV= 16
PULSEV= ${PULSEMV}.1
UGVERSION= ${DISTVERSION}-1

14
www/ungoogled-chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1742735381
SHA256 (chromium-134.0.6998.165.tar.xz) = 6c2f2a4fca77f6428171215ffd688e68a09849b75fae43aed980a5f77eeb097d
SIZE (chromium-134.0.6998.165.tar.xz) = 7049324636
TIMESTAMP = 1744706185
SHA256 (chromium-135.0.7049.84.tar.xz) = 43fafda47b177c4aa89ab2849bfb8e9bf035be5281f9bb0e0cae41eabd53832e
SIZE (chromium-135.0.7049.84.tar.xz) = 7025887252
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
SHA256 (chromium-134.0.6998.165-testdata.tar.xz) = c130bacbf3443bf42ff49b717cd1727f6d0c4833bb672bf461cd92dc89b3d086
SIZE (chromium-134.0.6998.165-testdata.tar.xz) = 653712584
SHA256 (ungoogled-software-ungoogled-chromium-134.0.6998.165-134.0.6998.165-1_GH0.tar.gz) = b583f62da9e79722fb5be6044e00ab0bc79adc06c308d994b0c818b912205994
SIZE (ungoogled-software-ungoogled-chromium-134.0.6998.165-134.0.6998.165-1_GH0.tar.gz) = 687546
SHA256 (chromium-135.0.7049.84-testdata.tar.xz) = 9cd340ccdd821752506697cfda536afa82dcee6dcfb9914e6754d8a3decc7379
SIZE (chromium-135.0.7049.84-testdata.tar.xz) = 646330872
SHA256 (ungoogled-software-ungoogled-chromium-135.0.7049.84-135.0.7049.84-1_GH0.tar.gz) = 13d7c11a678ae1a729996d2f2906c079cca8e015ba28f2f62ff6ba26c89e165a
SIZE (ungoogled-software-ungoogled-chromium-135.0.7049.84-135.0.7049.84-1_GH0.tar.gz) = 630940

25
www/ungoogled-chromium/files/patch-BUILD.gn
View file

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2025-03-09 21:38:10 UTC
--- BUILD.gn.orig 2025-04-15 08:30:07 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",
@@ -446,7 +445,7 @@ group("gn_all") {
@@ -448,7 +447,7 @@ group("gn_all") {
}
}
@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -628,6 +627,15 @@ group("gn_all") {
@@ -630,6 +629,15 @@ group("gn_all") {
}
}
@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
@@ -676,7 +684,7 @@ group("gn_all") {
@@ -678,7 +686,7 @@ group("gn_all") {
}
}
@ -51,7 +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
@@ -1117,7 +1125,7 @@ if (use_blink && !is_cronet_build) {
@@ -713,7 +721,7 @@ group("gn_all") {
]
}
- if (is_mac || is_win || is_android || is_linux || is_chromeos) {
+ if (!is_bsd && (is_mac || is_win || is_android || is_linux || is_chromeos)) {
deps += [
"//third_party/crashpad/crashpad:crashpad_tests",
"//third_party/crashpad/crashpad/handler:crashpad_handler",
@@ -1118,7 +1126,7 @@ if (use_blink && !is_cronet_build) {
]
if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android &&
@ -60,7 +69,7 @@
deps += [
":chrome_wpt_tests",
":headless_shell_wpt",
@@ -1267,7 +1275,7 @@ if (use_blink && !is_cronet_build) {
@@ -1265,7 +1273,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -69,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.
@@ -1281,7 +1289,7 @@ if (use_blink && !is_cronet_build) {
@@ -1279,7 +1287,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms" ]
}
@ -78,7 +87,7 @@
# Using the default toolchain for this tool, as it's run during tests not
# during the build. This places a symlink in the root_build_dir for scrips
# to use.
@@ -1752,7 +1760,7 @@ group("chromium_builder_perf") {
@@ -1749,7 +1757,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

12
www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc
View file

@ -1,11 +1,11 @@
--- apps/ui/views/app_window_frame_view.cc.orig 2024-08-26 14:40:28 UTC
--- apps/ui/views/app_window_frame_view.cc.orig 2025-04-15 08:30:07 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
@@ -146,7 +146,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const {
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/40118868): Revisit 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)
// Get the difference between the widget's client area bounds and window
// bounds, and grow |window_bounds| by that amount.
gfx::Insets native_frame_insets =

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

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2025-03-09 21:38:10 UTC
--- base/BUILD.gn.orig 2025-04-15 08:30:07 UTC
+++ base/BUILD.gn
@@ -1088,11 +1088,26 @@ component("base") {
@@ -1094,11 +1094,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" ]
@@ -1112,7 +1127,7 @@ component("base") {
@@ -1118,7 +1133,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -37,7 +37,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2122,6 +2137,22 @@ component("base") {
@@ -2142,6 +2157,22 @@ component("base") {
]
}
@ -60,7 +60,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2267,6 +2298,33 @@ component("base") {
@@ -2300,6 +2331,33 @@ component("base") {
}
}
@ -94,7 +94,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2617,7 +2675,7 @@ buildflag_header("protected_memory_buildflags") {
@@ -2649,7 +2707,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" ]
@@ -3096,7 +3154,7 @@ if (is_apple) {
@@ -3122,7 +3180,7 @@ if (is_apple) {
}
}
@ -112,7 +112,7 @@
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
@@ -3781,7 +3839,7 @@ test("base_unittests") {
@@ -3808,7 +3866,7 @@ test("base_unittests") {
]
}
@ -121,7 +121,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3809,7 +3867,7 @@ test("base_unittests") {
@@ -3836,7 +3894,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",
@@ -3820,7 +3878,7 @@ test("base_unittests") {
@@ -3847,7 +3905,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -139,7 +139,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -4008,7 +4066,7 @@ test("base_unittests") {
@@ -4037,7 +4095,7 @@ test("base_unittests") {
deps += [ ":base_profiler_test_support_library" ]
}

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-03-09 21:38:10 UTC
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-04-15 08:30:07 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -865,7 +865,7 @@ if (is_clang_or_gcc) {
@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
configs -= [ partition_alloc_enable_arc_config ]
}
}

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-11-16 12:20:41 UTC
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-04-15 08:30:07 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
@@ -302,8 +302,12 @@ bool TryRecommitSystemPagesInternal(
@@ -309,8 +309,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

10
www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc
View file

@ -1,6 +1,6 @@
--- base/debug/stack_trace.cc.orig 2025-03-09 21:38:10 UTC
--- base/debug/stack_trace.cc.orig 2025-04-15 08:30:07 UTC
+++ base/debug/stack_trace.cc
@@ -267,7 +267,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
@@ -268,7 +268,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;
@@ -320,7 +320,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream
@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream
}
return;
}
@ -19,7 +19,7 @@
}
std::string StackTrace::ToString() const {
@@ -329,7 +331,7 @@ std::string StackTrace::ToString() const {
@@ -330,7 +332,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();
@@ -353,7 +355,7 @@ bool StackTrace::ShouldSuppressOutput() {
@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() {
}
std::ostream& operator<<(std::ostream& os, const StackTrace& s) {

54
www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc
View file

@ -1,30 +1,29 @@
--- base/files/file_util_posix.cc.orig 2025-03-09 21:38:10 UTC
--- base/files/file_util_posix.cc.orig 2025-04-15 08:30:07 UTC
+++ base/files/file_util_posix.cc
@@ -902,36 +902,33 @@ bool CreateNewTempDirectory(const FilePath::StringType
@@ -902,6 +902,8 @@ bool CreateNewTempDirectory(const FilePath::StringType
bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
+ const FilePath kFileSystemRoot("/");
std::vector<FilePath> subpaths;
// Collect a list of all parent directories.
+
// Avoid checking subdirs if directory already exists.
if (DirectoryExists(full_path)) {
return true;
@@ -910,8 +912,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
// Collect a list of all missing directories.
std::vector<FilePath> missing_subpaths({full_path});
FilePath last_path = full_path;
- subpaths.push_back(full_path);
- for (FilePath path = full_path.DirName(); path.value() != last_path.value();
- path = path.DirName()) {
+ if (full_path != kFileSystemRoot)
+ subpaths.push_back(full_path);
+ for (FilePath path = full_path.DirName(); (path.value() != last_path.value() &&
+ (path != kFileSystemRoot)); path = path.DirName()) {
subpaths.push_back(path);
last_path = path;
}
if (DirectoryExists(path)) {
break;
}
@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
// Iterate through the parents and create the missing ones.
for (const FilePath& subpath : base::Reversed(subpaths)) {
- if (DirectoryExists(subpath)) {
- continue;
- }
// Iterate through the missing directories and create.
for (const FilePath& subpath : base::Reversed(missing_subpaths)) {
- if (mkdir(subpath.value().c_str(), 0700) == 0) {
- continue;
- }
@ -35,21 +34,16 @@
- int saved_errno = errno;
- if (!DirectoryExists(subpath)) {
- if (error) {
- *error = File::OSErrorToFileError(saved_errno);
+ if (!PathExists(subpath)) {
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
+ int saved_errno = errno;
+ if (error)
+ *error = File::OSErrorToFileError(saved_errno);
+ return false;
}
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
+ int saved_errno = errno;
+ if (error)
*error = File::OSErrorToFileError(saved_errno);
- }
- errno = saved_errno;
- return false;
+ } else if (!DirectoryExists(subpath)) {
+ if (error)
+ *error = File::OSErrorToFileError(ENOTDIR);
+ return false;
return false;
}
+ errno = 0;
}
return true;
}

26
www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2025-03-09 21:38:10 UTC
--- base/files/file_util_unittest.cc.orig 2025-04-15 08:30:07 UTC
+++ base/files/file_util_unittest.cc
@@ -3911,7 +3911,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3920,7 +3920,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@ -9,7 +9,27 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4648,7 +4648,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4505,6 +4505,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu
#endif // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_OPENBSD)
+TEST_F(FileUtilTest, CreateDirectoryInUnveiledPath) {
+ FilePath dir = PathService::CheckedGet(DIR_GEN_TEST_DATA_ROOT);
+ dir = dir.Append(FILE_PATH_LITERAL("base"));
+ dir = dir.Append(FILE_PATH_LITERAL("test"));
+ dir = dir.Append(FILE_PATH_LITERAL("unveil"));
+ unveil(dir.value().c_str(), "rwc");
+ EXPECT_TRUE(CreateDirectory(dir));
+ dir = dir.Append(FILE_PATH_LITERAL("test"));
+ EXPECT_FALSE(CreateDirectory(dir));
+}
+#endif
+
#if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
defined(ARCH_CPU_32_BITS)
// TODO(crbug.com/327582285): Re-enable these tests. They may be failing due to
@@ -4671,7 +4684,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

4
www/ungoogled-chromium/files/patch-base_linux__util.cc
View file

@ -1,6 +1,6 @@
--- base/linux_util.cc.orig 2025-03-09 21:38:10 UTC
--- base/linux_util.cc.orig 2025-04-15 08:30:07 UTC
+++ base/linux_util.cc
@@ -164,10 +164,14 @@ void SetLinuxDistro(const std::string& distro) {
@@ -163,10 +163,14 @@ void SetLinuxDistro(const std::string& distro) {
}
bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {

6
www/ungoogled-chromium/files/patch-base_logging__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/logging_unittest.cc.orig 2025-02-20 09:59:21 UTC
--- base/logging_unittest.cc.orig 2025-04-15 08:30:07 UTC
+++ base/logging_unittest.cc
@@ -41,7 +41,7 @@
@@ -40,7 +40,7 @@
#include "base/posix/eintr_wrapper.h"
#endif // BUILDFLAG(IS_POSIX)
@ -9,7 +9,7 @@
#include <ucontext.h>
#endif
@@ -589,14 +589,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
@@ -588,14 +588,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
// need the arch-specific boilerplate below, which is inspired by breakpad.
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
uintptr_t crash_addr = 0;

4
www/ungoogled-chromium/files/patch-base_message__loop_message__pump__glib.cc
View file

@ -1,4 +1,4 @@
--- base/message_loop/message_pump_glib.cc.orig 2025-02-20 09:59:21 UTC
--- base/message_loop/message_pump_glib.cc.orig 2025-04-15 08:30:07 UTC
+++ base/message_loop/message_pump_glib.cc
@@ -8,6 +8,11 @@
#include <glib.h>
@ -20,7 +20,7 @@
+ return pthread_main_np();
+#else
auto pid = getpid();
auto tid = PlatformThread::CurrentId();
auto tid = PlatformThread::CurrentId().raw();
return pid > 0 && tid > 0 && pid == tid;
+#endif
}

4
www/ungoogled-chromium/files/patch-base_process_internal__linux.h
View file

@ -1,4 +1,4 @@
--- base/process/internal_linux.h.orig 2025-03-09 21:38:10 UTC
--- base/process/internal_linux.h.orig 2025-04-15 08:30:07 UTC
+++ base/process/internal_linux.h
@@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
// arguments to the lambda.
@ -10,7 +10,7 @@
// Iterate through the different threads tracked in /proc/<pid>/task.
FilePath fd_path = GetProcPidDir(process).Append("task");
@@ -166,6 +169,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
@@ -167,6 +170,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
FilePath task_path = fd_path.Append(tid_str);
lambda(tid, task_path);
}

4
www/ungoogled-chromium/files/patch-base_process_launch__posix.cc
View file

@ -1,6 +1,6 @@
--- base/process/launch_posix.cc.orig 2024-10-27 06:40:35 UTC
--- base/process/launch_posix.cc.orig 2025-04-15 08:30:07 UTC
+++ base/process/launch_posix.cc
@@ -67,6 +67,9 @@
@@ -62,6 +62,9 @@
#error "macOS should use launch_mac.cc"
#endif

8
www/ungoogled-chromium/files/patch-base_process_process__metrics__unittest.cc
View file

@ -1,9 +1,9 @@
--- base/process/process_metrics_unittest.cc.orig 2025-03-09 21:38:10 UTC
--- base/process/process_metrics_unittest.cc.orig 2025-04-15 08:30:07 UTC
+++ base/process/process_metrics_unittest.cc
@@ -63,7 +63,8 @@
@@ -61,7 +61,8 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \
+ BUILDFLAG(IS_BSD)

4
www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
View file

@ -1,4 +1,4 @@
--- base/profiler/sampling_profiler_thread_token.cc.orig 2024-04-23 07:42:17 UTC
--- base/profiler/sampling_profiler_thread_token.cc.orig 2025-04-15 08:30:07 UTC
+++ base/profiler/sampling_profiler_thread_token.cc
@@ -6,7 +6,7 @@
@ -11,7 +11,7 @@
#include "base/profiler/stack_base_address_posix.h"
@@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent
PlatformThreadId id = PlatformThread::CurrentId();
#if BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
return {id, pthread_self()};
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)

6
www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
View file

@ -1,8 +1,8 @@
--- base/profiler/sampling_profiler_thread_token.h.orig 2024-04-23 07:42:17 UTC
--- base/profiler/sampling_profiler_thread_token.h.orig 2025-04-15 08:30:07 UTC
+++ base/profiler/sampling_profiler_thread_token.h
@@ -13,7 +13,7 @@
#if BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
#include <pthread.h>
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@ -11,7 +11,7 @@
@@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken {
PlatformThreadId id;
#if BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
pthread_t pthread_id;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)

6
www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc
View file

@ -1,4 +1,4 @@
--- base/profiler/stack_base_address_posix.cc.orig 2025-02-20 09:59:21 UTC
--- base/profiler/stack_base_address_posix.cc.orig 2025-04-15 08:30:07 UTC
+++ base/profiler/stack_base_address_posix.cc
@@ -17,6 +17,10 @@
#include "base/files/scoped_file.h"
@ -52,8 +52,8 @@
// trying to work around the problem.
return std::nullopt;
#else
- const bool is_main_thread = id == GetCurrentProcId();
+ const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId());
- const bool is_main_thread = id.raw() == GetCurrentProcId();
+ const bool is_main_thread = id.raw() == (checked_cast<uint64_t>(GetCurrentProcId()));
if (is_main_thread) {
#if BUILDFLAG(IS_ANDROID)
// The implementation of pthread_getattr_np() in Bionic reads proc/self/maps

4
www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2025-02-20 09:59:21 UTC
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2025-04-15 08:30:07 UTC
+++ base/profiler/stack_sampling_profiler_unittest.cc
@@ -46,7 +46,7 @@
@@ -47,7 +47,7 @@
#include <intrin.h>
#include <malloc.h>

6
www/ungoogled-chromium/files/patch-base_profiler_thread__delegate__posix.cc
View file

@ -1,6 +1,6 @@
--- base/profiler/thread_delegate_posix.cc.orig 2024-06-22 08:49:42 UTC
--- base/profiler/thread_delegate_posix.cc.orig 2025-04-15 08:30:07 UTC
+++ base/profiler/thread_delegate_posix.cc
@@ -19,7 +19,7 @@
@@ -15,7 +15,7 @@
#include "base/process/process_handle.h"
#include "build/build_config.h"
@ -9,7 +9,7 @@
#include "base/profiler/stack_base_address_posix.h"
#endif
@@ -28,7 +28,7 @@ namespace base {
@@ -24,7 +24,7 @@ namespace base {
std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
SamplingProfilerThreadToken thread_token) {
std::optional<uintptr_t> base_address;

4
www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc
View file

@ -1,6 +1,6 @@
--- base/test/launcher/test_launcher.cc.orig 2025-03-09 21:38:10 UTC
--- base/test/launcher/test_launcher.cc.orig 2025-04-15 08:30:07 UTC
+++ base/test/launcher/test_launcher.cc
@@ -74,6 +74,7 @@
@@ -73,6 +73,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_POSIX)

12
www/ungoogled-chromium/files/patch-base_threading_platform__thread.h
View file

@ -1,11 +1,11 @@
--- base/threading/platform_thread.h.orig 2025-02-20 09:59:21 UTC
--- base/threading/platform_thread.h.orig 2025-04-15 08:30:07 UTC
+++ base/threading/platform_thread.h
@@ -48,6 +48,8 @@ typedef DWORD PlatformThreadId;
typedef zx_koid_t PlatformThreadId;
@@ -55,6 +55,8 @@ class BASE_EXPORT PlatformThreadId {
using UnderlyingType = zx_koid_t;
#elif BUILDFLAG(IS_APPLE)
typedef mach_port_t PlatformThreadId;
using UnderlyingType = uint64_t;
+#elif BUILDFLAG(IS_BSD)
+typedef uint64_t PlatformThreadId;
+ using UnderlyingType = uint64_t;
#elif BUILDFLAG(IS_POSIX)
typedef pid_t PlatformThreadId;
using UnderlyingType = pid_t;
#endif

18
www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc
View file

@ -1,4 +1,4 @@
--- base/threading/platform_thread_posix.cc.orig 2025-02-20 09:59:21 UTC
--- base/threading/platform_thread_posix.cc.orig 2025-04-15 08:30:07 UTC
+++ base/threading/platform_thread_posix.cc
@@ -79,11 +79,11 @@ void* ThreadFunc(void* params) {
base::DisallowSingleton();
@ -14,16 +14,16 @@
#if BUILDFLAG(IS_APPLE)
PlatformThread::SetCurrentThreadRealtimePeriodValue(
delegate->GetRealtimePeriod());
@@ -270,6 +270,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
return reinterpret_cast<int32_t>(pthread_self());
@@ -272,6 +272,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
return PlatformThreadId(reinterpret_cast<int32_t>(pthread_self()));
#elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
return pthread_self();
return PlatformThreadId(pthread_self());
+#elif BUILDFLAG(IS_BSD)
+ return reinterpret_cast<uint64_t>(pthread_self());
+ return PlatformThreadId(reinterpret_cast<uint64_t>(pthread_self()));
#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
return reinterpret_cast<int64_t>(pthread_self());
return PlatformThreadId(reinterpret_cast<int64_t>(pthread_self()));
#endif
@@ -363,7 +365,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
@@ -365,7 +367,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
// static
bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@ -32,7 +32,7 @@
return false;
#else
if (from >= to) {
@@ -384,6 +386,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
@@ -386,6 +388,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
NOTIMPLEMENTED();
@ -42,7 +42,7 @@
#else
if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) {
return;
@@ -407,7 +412,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
@@ -409,7 +414,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
// static
ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {

15
www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc
View file

@ -1,4 +1,4 @@
--- base/threading/platform_thread_unittest.cc.orig 2025-03-09 21:38:10 UTC
--- base/threading/platform_thread_unittest.cc.orig 2025-04-15 08:30:07 UTC
+++ base/threading/platform_thread_unittest.cc
@@ -36,7 +36,7 @@
#include "base/time/time.h"
@ -18,6 +18,15 @@
// 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;
@@ -435,7 +435,7 @@ TEST(PlatformThreadTest, SetCurrentThreadTypeTest) {
#if BUILDFLAG(IS_APPLE)
TestPriorityResultingFromThreadType(ThreadType::kResourceEfficient,
ThreadPriorityForTest::kUtility);
-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
TestPriorityResultingFromThreadType(
ThreadType::kResourceEfficient,
ThreadPriorityForTest::kResourceEfficient);
@@ -624,12 +624,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)
@ -29,9 +38,9 @@
bool IsTidCacheCorrect() {
+#if BUILDFLAG(IS_BSD)
+ return PlatformThread::CurrentId() == reinterpret_cast<int64_t>(pthread_self());
+ return PlatformThread::CurrentId().raw() == reinterpret_cast<int64_t>(pthread_self());
+#else
return PlatformThread::CurrentId() == syscall(__NR_gettid);
return PlatformThread::CurrentId().raw() == syscall(__NR_gettid);
+#endif
}

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

@ -1,6 +1,6 @@
--- build/config/clang/BUILD.gn.orig 2025-01-25 09:34:31 UTC
--- build/config/clang/BUILD.gn.orig 2025-04-15 08:30:07 UTC
+++ build/config/clang/BUILD.gn
@@ -213,7 +213,12 @@ template("clang_lib") {
@@ -251,7 +251,12 @@ template("clang_lib") {
# Adds a dependency on the Clang runtime library clang_rt.builtins.
clang_lib("compiler_builtins") {

36
www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
View file

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2025-03-09 21:38:10 UTC
--- build/config/compiler/BUILD.gn.orig 2025-04-15 08:30:07 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 += [
@@ -1234,7 +1241,7 @@ config("compiler_cpu_abi") {
@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -56,7 +56,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
@@ -1249,7 +1256,7 @@ config("compiler_cpu_abi") {
@@ -1238,7 +1245,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" ]
}
@@ -1583,7 +1590,7 @@ config("compiler_deterministic") {
@@ -1572,7 +1579,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",
@@ -1641,7 +1648,7 @@ config("compiler_deterministic") {
@@ -1630,7 +1637,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -83,17 +83,23 @@
current_os != "zos") {
update_args = [
"--print-revision",
@@ -1962,9 +1969,6 @@ config("default_warnings") {
cflags += [
# TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
"-Wno-cast-function-type",
@@ -1960,23 +1967,12 @@ config("default_warnings") {
]
}
- cflags += [
- # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
- "-Wno-cast-function-type",
-
- # TODO(crbug.com/40284799): Fix and re-enable.
- "-Wno-thread-safety-reference-return",
]
-
- # TODO(crbug.com/376641662): Fix and re-enable.
- "-Wno-nontrivial-memcall",
- ]
-
cflags_cc += [
@@ -1972,7 +1976,7 @@ config("default_warnings") {
# TODO(crbug.com/328490295): Fix and re-enable for C flags.
"-Wenum-compare-conditional",
]
@ -102,7 +108,7 @@
cflags_cc += [
# TODO(crbug.com/41486292): Fix and re-enable.
"-Wno-c++11-narrowing-const-reference",
@@ -2741,7 +2745,7 @@ config("afdo_optimize_size") {
@@ -2742,7 +2738,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@ -111,7 +117,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2768,7 +2772,7 @@ config("afdo") {
@@ -2769,7 +2765,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -120,7 +126,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2945,7 +2949,7 @@ config("symbols") {
@@ -2946,7 +2942,7 @@ config("symbols") {
cflags += [ "-gomit-unreferenced-methods" ]
}

10
www/ungoogled-chromium/files/patch-build_config_ozone.gni
View file

@ -1,9 +1,9 @@
--- build/config/ozone.gni.orig 2023-10-13 13:20:35 UTC
--- build/config/ozone.gni.orig 2025-04-15 08:30:07 UTC
+++ build/config/ozone.gni
@@ -84,7 +84,15 @@ declare_args() {
} else if (is_chromeos_lacros) {
ozone_platform = "wayland"
ozone_platform_wayland = true
@@ -81,7 +81,15 @@ declare_args() {
ozone_platform = "x11"
ozone_platform_drm = true
ozone_platform_x11 = true
- } else if (is_linux) {
+ } else if (is_linux && !is_bsd) {
+ ozone_platform = "x11"

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

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2025-02-20 09:59:21 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2025-04-15 08:30:07 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -888,22 +895,12 @@ template("gcc_toolchain") {
@@ -896,22 +903,12 @@ template("gcc_toolchain") {
# actually just be doing a native compile.
template("clang_toolchain") {
gcc_toolchain(target_name) {

4
www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni
View file

@ -1,6 +1,6 @@
--- build/toolchain/toolchain.gni.orig 2025-03-09 21:38:10 UTC
--- build/toolchain/toolchain.gni.orig 2025-04-15 08:30:07 UTC
+++ build/toolchain/toolchain.gni
@@ -75,7 +75,7 @@ if (host_os == "mac") {
@@ -72,7 +72,7 @@ if (host_os == "mac") {
host_shlib_extension = ".dylib"
} else if (host_os == "win") {
host_shlib_extension = ".dll"

30
www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -146,7 +146,7 @@
@@ -147,7 +147,7 @@
#include "components/webui/about/credit_utils.h"
#endif
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -187,17 +187,17 @@
@@ -188,17 +188,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
@@ -315,7 +315,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -316,7 +316,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -39,7 +39,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -398,7 +398,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -399,7 +399,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
return false;
}
@ -48,7 +48,7 @@
// 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) ||
@@ -410,7 +410,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
@@ -411,7 +411,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
}
#endif // BUILDFLAG(IS_LINUX)
@ -57,7 +57,7 @@
void SIGTERMProfilingShutdown(int signal) {
content::Profiling::Stop();
struct sigaction sigact;
@@ -492,7 +492,7 @@ std::optional<int> AcquireProcessSingleton(
@@ -493,7 +493,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.
@@ -570,7 +570,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -571,7 +571,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.
@@ -666,7 +666,7 @@ void RecordMainStartupMetrics(const StartupTimestamps&
@@ -667,7 +667,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(
@@ -825,7 +825,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
@@ -826,7 +826,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();
@@ -973,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
@@ -983,7 +983,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
const bool is_canary_dev = IsCanaryDev();
const bool emit_crashes =
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -102,7 +102,7 @@
is_canary_dev;
#else
false;
@@ -1120,7 +1120,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1131,7 +1131,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
return 0; // Got a --credits switch; exit with a success error code.
}
@ -111,7 +111,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1145,7 +1145,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1156,7 +1156,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
ash::RegisterPathProvider();
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -120,7 +120,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1433,7 +1433,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1444,7 +1444,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)) {
@@ -1521,13 +1521,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1532,13 +1532,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
#else
#if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \

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

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/BUILD.gn.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/BUILD.gn
@@ -6709,6 +6709,13 @@ static_library("browser") {
@@ -6788,6 +6788,13 @@ static_library("browser") {
[ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
}

142
www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2025-03-14 15:54:34 UTC
--- chrome/browser/about_flags.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/about_flags.cc
@@ -257,7 +257,7 @@
@@ -259,7 +259,7 @@
#include "extensions/common/extension_features.h"
#endif
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -343,7 +343,7 @@
@@ -345,7 +345,7 @@
#include "device/vr/public/cpp/switches.h"
#endif
@ -18,7 +18,7 @@
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -353,7 +353,7 @@
@@ -355,7 +355,7 @@
#include "chrome/browser/win/mica_titlebar.h"
#endif
@ -27,7 +27,7 @@
#include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -364,7 +364,7 @@
@@ -366,7 +366,7 @@
#include "components/user_education/common/user_education_features.h" // nogncheck
#endif
@ -36,7 +36,7 @@
#include "chrome/browser/ui/ui_features.h"
#include "ui/base/ui_base_features.h"
#endif
@@ -519,7 +519,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -521,7 +521,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -45,7 +45,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -820,6 +820,26 @@ const FeatureEntry::FeatureVariation
@@ -822,6 +822,26 @@ const FeatureEntry::FeatureVariation
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
nullptr}};
@ -72,7 +72,7 @@
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
{"UIClipboardMaximumAge", "60"}};
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
@@ -1224,7 +1244,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
@@ -1185,7 +1205,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"},
};
@@ -1262,7 +1282,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
@@ -1223,7 +1243,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -90,16 +90,7 @@
// A limited number of combinations of the rich autocompletion params.
const FeatureEntry::FeatureParam
@@ -1802,7 +1822,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = {
{"stale_threshold_duration", "10s"},
{"declutter_timer_interval", "10s"},
@@ -3594,7 +3614,7 @@ const FeatureEntry::FeatureVariation
@@ -3583,7 +3603,7 @@ const FeatureEntry::FeatureVariation
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -108,7 +99,7 @@
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
{{"link_capturing_state", "on_by_default"}};
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
@@ -4108,7 +4128,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
@@ -4089,7 +4109,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
};
@ -117,7 +108,7 @@
const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
{"TranslationAPIAcceptLanguagesCheck", "false"},
{"TranslationAPILimitLanguagePackCount", "false"}};
@@ -4178,7 +4198,7 @@ const FeatureEntry::FeatureVariation
@@ -4155,7 +4175,7 @@ const FeatureEntry::FeatureVariation
1, nullptr},
};
@ -126,7 +117,7 @@
const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
{"BackoffTime", "0h"},
{"BackoffMultiplierBase", "0.0"},
@@ -4971,7 +4991,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5006,7 +5026,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_WIN)
@ -135,7 +126,16 @@
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -5514,7 +5534,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5295,7 +5315,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableIsolatedWebAppDevModeName,
flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"enable-iwa-key-distribution-component",
flag_descriptions::kEnableIwaKeyDistributionComponentName,
flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
@@ -5554,7 +5574,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -144,7 +144,7 @@
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5550,9 +5570,19 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5590,6 +5610,16 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWaylandLinuxDrmSyncobjName,
flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux,
FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)},
@ -160,12 +160,8 @@
+#endif
#endif // BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -6448,7 +6478,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(ENABLE_VR)
@@ -6470,7 +6500,7 @@ const FeatureEntry kFeatureEntries[] = {
"MlUrlScoring")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -174,7 +170,7 @@
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6646,7 +6676,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6683,7 +6713,7 @@ const FeatureEntry kFeatureEntries[] = {
"OrganicRepeatableQueries")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -183,7 +179,7 @@
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
@@ -7185,7 +7215,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7180,7 +7210,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -192,7 +188,7 @@
{"cups-ipp-printing-backend",
flag_descriptions::kCupsIppPrintingBackendName,
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
@@ -7453,7 +7483,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7445,7 +7475,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
@ -201,7 +197,7 @@
{"wasm-tts-component-updater-enabled",
flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
@@ -8117,7 +8147,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8101,7 +8131,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
#endif // !BUILDFLAG(IS_CHROMEOS)
@ -210,7 +206,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -8795,7 +8825,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8782,7 +8812,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -219,16 +215,16 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
@@ -8822,7 +8852,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8807,7 +8837,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9289,7 +9319,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9274,7 +9304,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -237,7 +233,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -9975,7 +10005,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9912,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@ -246,16 +242,7 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10001,7 +10031,7 @@ const FeatureEntry kFeatureEntries[] = {
"RenderDocument")},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"enable-search-aggregator-policy",
flag_descriptions::kEnableSearchAggregatorPolicyName,
flag_descriptions::kEnableSearchAggregatorPolicyDescription,
@@ -10108,7 +10138,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10036,7 +10066,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
#endif
@ -264,7 +251,7 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10143,7 +10173,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10071,7 +10101,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -273,7 +260,7 @@
{"enable-user-navigation-capturing-pwa",
flag_descriptions::kPwaNavigationCapturingName,
flag_descriptions::kPwaNavigationCapturingDescription,
@@ -10944,7 +10974,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10832,7 +10862,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCanvasHibernationDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
@ -282,16 +269,7 @@
{"sync-enable-bookmarks-in-transport-mode",
flag_descriptions::kSyncEnableBookmarksInTransportModeName,
flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
@@ -11035,7 +11065,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"tab-organization", flag_descriptions::kTabOrganizationName,
flag_descriptions::kTabOrganizationDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kTabOrganization)},
@@ -11083,7 +11113,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10948,7 +10978,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
#endif // BUILDFLAG(IS_ANDROID)
@ -300,16 +278,16 @@
{"supervised-profile-safe-search",
flag_descriptions::kSupervisedProfileSafeSearchName,
flag_descriptions::kSupervisedProfileSafeSearchDescription,
@@ -11327,7 +11357,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11195,7 +11225,7 @@ const FeatureEntry kFeatureEntries[] = {
segmentation_platform::features::kSegmentationSurveyPage)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"autofill-enable-buy-now-pay-later-for-affirm",
flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName,
flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription,
@@ -11456,7 +11486,7 @@ const FeatureEntry kFeatureEntries[] = {
{"autofill-enable-buy-now-pay-later",
flag_descriptions::kAutofillEnableBuyNowPayLaterName,
flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
@@ -11315,7 +11345,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
@ -318,7 +296,7 @@
{"translation-api", flag_descriptions::kTranslationAPIName,
flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
@@ -11493,7 +11523,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11352,7 +11382,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
password_manager::features::kPasswordFormClientsideClassifier)},
@ -327,12 +305,30 @@
{"contextual-cueing", flag_descriptions::kContextualCueingName,
flag_descriptions::kContextualCueingDescription,
kOsLinux | kOsMac | kOsWin,
@@ -11787,7 +11817,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(switches::kEnableSnackbarInSettings)},
@@ -11671,7 +11701,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
#endif // !BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
@@ -11721,7 +11751,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"autofill-enable-amount-extraction-desktop",
flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
@@ -11741,7 +11771,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"autofill-enable-amount-extraction-allowlist-desktop",
flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
flag_descriptions::

4
www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/after_startup_task_utils.cc.orig 2024-07-31 14:19:23 UTC
--- chrome/browser/after_startup_task_utils.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/after_startup_task_utils.cc
@@ -117,7 +117,7 @@ void SetBrowserStartupIsComplete() {
@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() {
TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
GetStartupCompleteFlag().Set();
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \

8
www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc → www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/background/background_mode_manager.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/background/background_mode_manager.cc
@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
--- chrome/browser/background/extensions/background_mode_manager.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/background/extensions/background_mode_manager.cc
@@ -893,7 +893,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
}
return family->CreateExact(size).AsImageSkia();
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

4
www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc → www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
View file

@ -1,5 +1,5 @@
--- chrome/browser/background/background_mode_optimizer.cc.orig 2024-03-22 14:16:19 UTC
+++ chrome/browser/background/background_mode_optimizer.cc
--- chrome/browser/background/extensions/background_mode_optimizer.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/background/extensions/background_mode_optimizer.cc
@@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod
return nullptr;
}

10
www/ungoogled-chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc → www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/glic/launcher/glic_status_icon.cc.orig 2025-03-09 21:38:10 UTC
+++ chrome/browser/glic/launcher/glic_status_icon.cc
@@ -84,7 +84,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/background/glic/glic_status_icon.cc
@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
if (!status_icon_) {
return;
}
@ -9,7 +9,7 @@
// 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
@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control
GlicStatusIcon::~GlicStatusIcon() {
context_menu_ = nullptr;
if (status_icon_) {
@ -18,7 +18,7 @@
status_icon_->RemoveObserver(this);
#endif
std::unique_ptr<StatusIcon> removed_icon =
@@ -196,7 +196,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C
@@ -201,7 +201,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));

14
www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_features.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/browser_features.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/browser_features.cc
@@ -82,7 +82,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode,
@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode,
"ContentUsesBrowserThemeColorMode",
base::FEATURE_DISABLED_BY_DEFAULT);
@ -9,16 +9,16 @@
// Enables usage of os_crypt_async::SecretPortalKeyProvider. Once
// `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
// disabled without losing data.
@@ -104,7 +104,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider,
// the browser exits.
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -237,7 +237,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
"SandboxExternalProtocolBlockedWarning",
base::FEATURE_ENABLED_BY_DEFAULT);

31
www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/browser_process_impl.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/browser_process_impl.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -261,7 +261,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@ -9,7 +9,16 @@
#include "chrome/browser/browser_features.h"
#include "components/os_crypt/async/browser/fallback_linux_key_provider.h"
#include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h"
@@ -1149,7 +1149,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
@@ -273,7 +273,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// How often to check if the persistent instance of Chrome needs to restart
// to install an update.
static const int kUpdateCheckIntervalHours = 6;
@@ -1147,7 +1147,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
GoogleUpdateSettings::GetCollectStatsConsent());
registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
@ -18,21 +27,21 @@
os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
#endif
}
@@ -1416,7 +1416,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
local_state())));
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) {
providers.emplace_back(
/*precedence=*/10u,
@@ -1683,7 +1683,7 @@ void BrowserProcessImpl::Unpin() {
base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
"basic") {
@@ -1681,7 +1681,7 @@ void BrowserProcessImpl::Unpin() {
}
// Mac is currently not supported.
// TODO(crbug.com/40118868): Revisit 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)
bool BrowserProcessImpl::IsRunningInBackground() const {
// Check if browser is in the background.

12
www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h
View file

@ -1,11 +1,11 @@
--- chrome/browser/browser_process_impl.h.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/browser_process_impl.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/browser_process_impl.h
@@ -410,7 +410,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -405,7 +405,7 @@ class BrowserProcessImpl : public BrowserProcess,
// 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)
std::unique_ptr<BatteryMetrics> battery_metrics_;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::RepeatingTimer autoupdate_timer_;
// Gets called by autoupdate timer to see if browser needs restart and can be

10
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/chrome_browser_field_trials.cc.orig 2024-11-16 12:20:41 UTC
--- chrome/browser/chrome_browser_field_trials.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_field_trials.cc
@@ -49,7 +49,7 @@
#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
@@ -37,7 +37,7 @@
#include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h"
#endif
-#if BUILDFLAG(IS_LINUX)
@ -9,8 +9,8 @@
#include "base/nix/xdg_util.h"
#include "ui/base/ui_base_features.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -135,7 +135,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials
#endif
@@ -117,7 +117,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials
#endif // BUILDFLAG(IS_ANDROID)
}
-#if BUILDFLAG(IS_LINUX)

61
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,24 +1,15 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -126,7 +126,7 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
@@ -77,7 +77,7 @@
#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
@@ -135,7 +135,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"
@@ -810,7 +810,7 @@ void PopulateChromeFrameBinders(
@@ -477,7 +477,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,47 +18,3 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -899,7 +899,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -910,7 +910,7 @@ void PopulateChromeWebUIFrameBinders(
policy::DlpInternalsUI>(map);
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
@@ -997,14 +997,14 @@ void PopulateChromeWebUIFrameBinders(
page_image_service::mojom::PageImageServiceHandler, HistoryUI,
HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory,
WhatsNewUI>(map);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
RegisterWebUIControllerInterfaceBinder<
browser_command::mojom::CommandHandlerFactory,
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
WhatsNewUI,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
NewTabPageUI>(map);
@@ -1538,7 +1538,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
DiscardsUI>(map);

64
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc Normal file
View file

@ -0,0 +1,64 @@
--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_interface_binders_webui.cc
@@ -46,7 +46,7 @@
#include "content/public/browser/web_ui_controller_interface_binder.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
@@ -55,7 +55,7 @@
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
#include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
@@ -440,7 +440,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders(
policy::DlpInternalsUI>(map);
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders(
page_image_service::mojom::PageImageServiceHandler, HistoryUI,
HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory,
WhatsNewUI>(map);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
RegisterWebUIControllerInterfaceBinder<
browser_command::mojom::CommandHandlerFactory,
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
WhatsNewUI,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
NewTabPageUI>(map);
@@ -1084,7 +1084,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
DiscardsUI>(map);

131
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,59 +1,56 @@
--- chrome/browser/chrome_browser_main.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -250,15 +250,15 @@
// 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/browser/first_run/upgrade_util_linux.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/crash/core/app/crashpad.h"
@@ -149,7 +149,7 @@
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "sql/database.h"
#endif
@@ -175,11 +175,11 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/first_run/upgrade_util_linux.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
@@ -190,7 +190,7 @@
#include "ui/gfx/switches.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/first_run/upgrade_util.h"
#endif
@@ -268,7 +268,7 @@
#include "chrome/browser/chrome_process_singleton.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/nix/xdg_util.h"
#endif
@@ -290,14 +290,14 @@
// 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_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
#include "ui/base/pointer/touch_ui_controller.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
@@ -365,14 +365,14 @@
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "sql/database.h"
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
#endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON)
@@ -291,7 +291,7 @@
namespace {
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
@@ -537,7 +537,7 @@ void ProcessSingletonNotificationCallbackImpl(
@@ -442,7 +442,7 @@ void ProcessSingletonNotificationCallbackImpl(
}
#endif
@ -62,57 +59,57 @@
// Set the global activation token sent as a command line switch by another
// browser process. This also removes the switch after use to prevent any side
// effects of leaving it in the command line after this point.
@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1017,7 +1017,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1169,7 +1169,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// 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_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -1062,7 +1062,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
#endif // BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1365,7 +1365,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1258,7 +1258,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Delete the media history database if it still exists.
// TODO(crbug.com/40177301): Remove this.
base::ThreadPool::PostTask(
@@ -1414,7 +1414,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1306,7 +1306,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1523,7 +1523,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1415,7 +1415,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
@@ -2069,7 +2069,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -1955,7 +1955,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (headless::IsHeadlessMode() ||
command_line.HasSwitch(switches::kHeadless)) {
return false;

14
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-04-23 07:42:17 UTC
--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
@@ -28,7 +28,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
}
void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() {
-#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
// Lacros's `PostMainMessageLoopRun` must be called at the very end of
// `PostMainMessageLoopRun` in
// `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`.
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
#endif
}

10
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_linux.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/chrome_browser_main_linux.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -25,7 +25,7 @@
@@ -24,7 +24,7 @@
#include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
#include "ui/base/l10n/l10n_util.h"
@ -9,7 +9,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -70,7 +70,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
@@ -65,7 +65,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
#endif // BUILDFLAG(IS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS)
@ -19,7 +19,7 @@
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
@@ -91,7 +93,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
}
@ -28,7 +28,7 @@
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
@@ -134,7 +136,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
@@ -129,7 +131,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {

12
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/chrome_browser_main_posix.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/chrome_browser_main_posix.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
@@ -84,7 +84,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
@@ -81,7 +81,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
// ExitHandler takes care of deleting itself.
new ExitHandler();
} else {
// 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)
switch (signal) {
case SIGINT:
case SIGHUP:

36
www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -507,7 +507,7 @@
@@ -503,7 +503,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,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#elif BUILDFLAG(IS_ANDROID)
@@ -619,11 +619,11 @@
@@ -617,11 +617,11 @@
#include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
#endif // !BUILDFLAG(IS_ANDROID)
@ -23,7 +23,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -634,7 +634,7 @@
@@ -632,7 +632,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"
@@ -643,7 +643,7 @@
@@ -641,7 +641,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)
@@ -652,7 +652,7 @@
@@ -650,7 +650,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"
@@ -1540,7 +1540,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1547,7 +1547,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)
@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1755,7 +1755,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)
@@ -1777,7 +1777,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1784,7 +1784,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
@@ -1794,7 +1794,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1801,7 +1801,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>());
@@ -1813,7 +1813,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1820,7 +1820,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -95,7 +95,7 @@
main_parts->AddParts(
std::make_unique<
enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2695,7 +2695,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
@@ -2703,7 +2703,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();
@@ -3042,7 +3044,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -3054,7 +3056,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
}
}
@ -114,7 +114,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4887,7 +4889,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4896,7 +4898,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -123,7 +123,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5402,7 +5404,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5404,7 +5406,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -132,7 +132,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5419,7 +5421,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5421,7 +5423,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -141,7 +141,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5450,7 +5452,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5462,7 +5464,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -150,7 +150,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7304,7 +7306,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7400,7 +7402,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -550,7 +550,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::Con
bool IsPluginAllowedToUseDevChannelAPIs(
content::BrowserContext* browser_context,
const GURL& url) override;

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

@ -0,0 +1,20 @@
--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err)
namespace component_updater {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
BASE_FEATURE(kIwaKeyDistributionComponent,
"IwaKeyDistributionComponent",
#if BUILDFLAG(IS_CHROMEOS)
@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup
// the main IWA feature.
#if BUILDFLAG(IS_WIN)
return base::FeatureList::IsEnabled(features::kIsolatedWebApps);
-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return base::FeatureList::IsEnabled(kIwaKeyDistributionComponent);
#else
return false;

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

@ -0,0 +1,11 @@
--- chrome/browser/component_updater/iwa_key_distribution_component_installer.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/component_updater/iwa_key_distribution_component_installer.h
@@ -27,7 +27,7 @@ class IwaKeyDistributionInfoProvider;
namespace component_updater {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
BASE_DECLARE_FEATURE(kIwaKeyDistributionComponent);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

4
www/ungoogled-chromium/files/patch-chrome_browser_component__updater_registration.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/component_updater/registration.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/component_updater/registration.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/component_updater/registration.cc
@@ -99,7 +99,7 @@
#endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
@ -18,7 +18,7 @@
#include "chrome/browser/component_updater/wasm_tts_engine_component_installer.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -253,12 +253,12 @@ void RegisterComponentsForUpdate() {
@@ -256,12 +256,12 @@ void RegisterComponentsForUpdate() {
RegisterCookieReadinessListComponent(cus);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

19
www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc
@@ -8,7 +8,7 @@
#include "base/functional/callback.h"
@ -8,13 +8,22 @@
+#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
#include "components/crx_file/id_util.h"
@@ -70,7 +70,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()) {
if (features::IsWasmTtsComponentUpdaterEnabled() &&
!features::IsWasmTtsEngineAutoInstallDisabled()) {
EmbeddedA11yExtensionLoader::GetInstance()->Init();
EmbeddedA11yExtensionLoader::GetInstance()->InstallExtensionWithIdAndPath(
@@ -121,7 +121,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer
installer->Register(cus, base::OnceClosure());
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::string WasmTtsEngineComponentInstallerPolicy::GetId() {
return crx_file::id_util::GenerateIdFromHash((kWasmTtsEnginePublicKeySHA256));
}

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

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

4
www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -41,7 +41,7 @@
#include "third_party/widevine/cdm/buildflags.h"
@ -27,7 +27,7 @@
// 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.
@@ -394,7 +394,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
@@ -392,7 +392,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
return;
}

4
www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/defaults.cc.orig 2023-10-13 13:20:35 UTC
--- chrome/browser/defaults.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/defaults.cc
@@ -44,7 +44,7 @@ const bool kShowHelpMenuItemIcon = true;
@@ -31,7 +31,7 @@ const bool kAlwaysCreateTabbedBrowserOnSessionRestore
const bool kShowHelpMenuItemIcon = false;
#endif

10
www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2025-01-25 09:34:31 UTC
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
@@ -26,7 +26,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
#if BUILDFLAG(IS_CHROMEOS)
return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
local_state);
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
#else
NOTREACHED();

4
www/ungoogled-chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/diagnostics/diagnostics_writer.h
@@ -14,6 +14,8 @@ namespace diagnostics {
@@ -16,6 +16,8 @@ namespace diagnostics {
// Console base class used internally.
class SimpleConsole;

15
www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1829,7 +1829,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1862,7 +1862,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();
}
@@ -1936,7 +1936,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1969,7 +1969,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,3 +18,12 @@
// 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()) {
@@ -2051,7 +2051,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)) && \
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \
BUILDFLAG(SAFE_BROWSING_AVAILABLE)
std::optional<enterprise_connectors::AnalysisSettings> settings =
safe_browsing::ShouldUploadBinaryForDeepScanning(download_item);

10
www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/download/download_file_picker.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/download/download_file_picker.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/download/download_file_picker.cc
@@ -18,7 +18,7 @@
#include "content/public/browser/web_contents.h"
#include "ui/shell_dialogs/selected_file_info.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "ui/aura/window.h"
@ -13,8 +13,8 @@
// dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
// and windows.Here we make owning_window host to browser current active
// window if it is null. https://crbug.com/1301898
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (!owning_window || !owning_window->GetHost()) {
owning_window = BrowserList::GetInstance()
->GetLastActive()

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

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/download/download_item_model.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -757,7 +757,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -820,7 +820,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1143,7 +1143,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

22
www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/download/download_prefs.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
@ -8,8 +8,8 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
@@ -58,6 +59,10 @@
#include "chrome/browser/flags/android/chrome_feature_list.h"
@@ -61,6 +62,10 @@
#include "components/safe_browsing/content/common/file_type_policies.h"
#endif
+#if BUILDFLAG(IS_BSD)
@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -68,7 +73,7 @@ namespace {
@@ -74,7 +79,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@ -28,8 +28,8 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -174,7 +179,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -292,7 +297,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -455,7 +460,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -480,7 +485,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -481,7 +486,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -518,7 +523,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -543,7 +548,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -600,7 +605,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -625,7 +630,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.

4
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-10-01 07:26:23 UTC
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
const char* verification_key = kKeyWindowsVerification;
#elif BUILDFLAG(IS_MAC)
const char* verification_key = kKeyMacVerification;

8
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/enterprise/connectors/common.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/enterprise/connectors/common.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/common.cc
@@ -22,7 +22,7 @@
#include "components/policy/core/common/policy_loader_lacros.h"
@@ -16,7 +16,7 @@
#include "components/user_manager/user.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#include "components/prefs/pref_service.h"
#endif
@@ -199,7 +199,7 @@ std::string GetProfileEmail(Profile* profile) {
@@ -191,7 +191,7 @@ std::string GetProfileEmail(Profile* profile) {
std::string email =
GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));

6
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -491,7 +491,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
@@ -469,7 +469,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope(
bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

8
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-08-26 14:40:28 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -23,7 +23,7 @@
@@ -22,7 +22,7 @@
#include "components/policy/core/common/management/management_service.h"
#include "content/public/browser/browser_context.h"
@ -9,7 +9,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h"
@@ -54,7 +54,7 @@ bool IsProfileManaged(Profile* profile) {
@@ -53,7 +53,7 @@ bool IsProfileManaged(Profile* profile) {
return management_service && management_service->IsManaged();
}
@ -18,7 +18,7 @@
policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
policy::CloudPolicyManager* user_policy_manager =
profile->GetCloudPolicyManager();
@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
DependsOn(policy::ManagementServiceFactory::GetInstance());

6
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -24,7 +24,7 @@
@@ -23,7 +23,7 @@
#include "chrome/browser/enterprise/connectors/connectors_service.h"
#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
@ -9,7 +9,7 @@
#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"
@@ -64,7 +64,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
@@ -63,7 +63,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)

12
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -58,7 +58,7 @@
@@ -55,7 +55,7 @@
#include "base/strings/utf_string_conversions.h"
#endif
@ -9,8 +9,8 @@
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#include "components/device_signals/core/browser/signals_aggregator.h"
@@ -181,7 +181,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
/*include_profile_user_name=*/false);
@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
/*include_profile_user_name=*/false);
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@ -18,12 +18,12 @@
void AddCrowdstrikeSignalsToEvent(
base::Value::Dict& event,
@@ -262,7 +262,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
@@ -235,7 +235,7 @@ std::string RealtimeReportingClient::GetBrowserClientI
return client_id;
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void RealtimeReportingClient::MaybeCollectDeviceSignalsAndReportEvent(
base::Value::Dict event,
::chrome::cros::reporting::proto::Event event,
policy::CloudPolicyClient* client,

12
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-01-25 09:34:31 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
@@ -18,7 +18,7 @@
@@ -19,7 +19,7 @@
#include "components/keyed_service/core/keyed_service.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
@ -9,16 +9,16 @@
#include "components/device_signals/core/browser/signals_types.h"
#endif
@@ -112,7 +112,7 @@ class RealtimeReportingClient : public RealtimeReporti
@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti
const std::string& dm_token) override;
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
void MaybeCollectDeviceSignalsAndReportEvent(
// DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...).
void MaybeCollectDeviceSignalsAndReportEventDeprecated(
base::Value::Dict event,
policy::CloudPolicyClient* client,
@@ -151,7 +151,7 @@ class RealtimeReportingClient : public RealtimeReporti
@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti
base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
};

4
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc
@@ -92,7 +92,7 @@ void ManagedProfileRequiredPage::CommandReceived(const
@@ -94,7 +94,7 @@ void ManagedProfileRequiredPage::CommandReceived(const
switch (cmd) {
case security_interstitials::CMD_DONT_PROCEED:

4
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/enterprise/util/managed_browser_utils.cc
@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile
.GetProfileAttributesWithPath(profile->GetPath());
if (entry) {
entry->SetUserAcceptedAccountManagement(accepted);

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1393,6 +1393,10 @@ source_set("extensions") {
@@ -1435,6 +1435,10 @@ source_set("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
apps::LaunchContainer launch_container =
GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
Profile* profile = Profile::FromBrowserContext(context);

8
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -189,7 +189,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) || \
@ -9,7 +9,7 @@
(*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
settings_api::PrefType::kBoolean;
(*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] =
@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -209,7 +209,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
settings_api::PrefType::kBoolean;
@ -18,7 +18,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::kBoolean;
#endif
@@ -220,7 +220,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -221,7 +221,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
(*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-03-14 15:54:34 UTC
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -909,7 +909,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
@@ -931,7 +931,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
// created as minimized.
// TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
// TODO(crbug.com/40254339): Find a fix for wayland as well.

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -906,7 +906,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
@@ -904,7 +904,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
#if BUILDFLAG(IS_CHROMEOS)
RequestExtensionApproval(contents);
return;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-01-25 09:34:31 UTC
--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -790,7 +790,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -795,7 +795,7 @@ void ExternalProviderImpl::CreateExternalProviders(
#endif // BUILDFLAG(IS_CHROMEOS)
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -823,7 +823,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

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

@ -0,0 +1,20 @@
--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
@@ -38,7 +38,7 @@
#include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
#endif
@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content
fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>());
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>());
#endif // BUILDFLAG(IS_LINUX)

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

@ -0,0 +1,20 @@
--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc
@@ -45,7 +45,7 @@
#include "services/network/public/cpp/shared_url_loader_factory.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
#endif
@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil
fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data));
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>());
#endif // BUILDFLAG(IS_LINUX)

4
www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -351,7 +351,7 @@ const struct {
@@ -357,7 +357,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif

12
www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
View file

@ -1,11 +1,11 @@
--- chrome/browser/first_run/first_run_dialog.h.orig 2024-06-22 08:49:42 UTC
--- chrome/browser/first_run/first_run_dialog.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/first_run/first_run_dialog.h
@@ -12,7 +12,7 @@
@@ -9,7 +9,7 @@
#include "build/build_config.h"
// Hide this function on platforms where the dialog does not exist.
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
namespace first_run {

4
www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/first_run/first_run_internal.h.orig 2022-12-02 17:56:32 UTC
--- chrome/browser/first_run/first_run_internal.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/first_run/first_run_internal.h
@@ -54,7 +54,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
@@ -53,7 +53,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
bool force_first_run,
bool no_first_run);

78
www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
View file

@ -1,24 +1,24 @@
--- chrome/browser/flag_descriptions.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/flag_descriptions.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -521,7 +521,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB
"Autofill suggestions on the allowlisted merchant websites.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kAutofillEnableAmountExtractionDesktopName[] =
"Enable checkout amount extraction on Chrome desktop";
const char kAutofillEnableAmountExtractionDesktopDescription[] =
@@ -530,7 +530,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr
#endif
const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
"Enable loading and querying the checkout amount extraction allowlist on "
"Chrome Desktop";
@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr
// BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kAutofillEnableBuyNowPayLaterForAffirmName[] =
"Enable buy now pay later on Autofill for Affirm";
const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] =
@@ -961,7 +961,7 @@ const char kDevicePostureDescription[] =
const char kAutofillEnableBuyNowPayLaterName[] =
"Enable buy now pay later on Autofill";
const char kAutofillEnableBuyNowPayLaterDescription[] =
@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] =
"Enables Device Posture API (foldable devices)";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -27,7 +27,7 @@
const char kDocumentPictureInPictureAnimateResizeName[] =
"Document Picture-in-Picture Animate Resize";
const char kDocumentPictureInPictureAnimateResizeDescription[] =
@@ -1049,7 +1049,7 @@ const char kCompressionDictionaryTransportRequireKnown
@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown
"when the connection is using a well known root cert or when the server is "
"a localhost.";
@ -36,16 +36,16 @@
const char kContextualCueingName[] = "Contextual cueing";
const char kContextualCueingDescription[] =
"Enables the contextual cueing system to support showing actions";
@@ -2228,7 +2228,7 @@ const char kContextualPageActionsShareModelDescription
"Enables share model data collection.";
@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] =
const char kEnableIsolatedWebAppDevModeDescription[] =
"Enables the installation of unverified Isolated Web Apps";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kEnableSearchAggregatorPolicyName[] =
"Enable EnterpriseSearchAggregatorSettings policy";
const char kEnableSearchAggregatorPolicyDescription[] =
@@ -3524,7 +3524,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kEnableIwaKeyDistributionComponentName[] =
"Enable the Iwa Key Distribution component";
const char kEnableIwaKeyDistributionComponentDescription[] =
@@ -3498,7 +3498,7 @@ const char kDefaultSiteInstanceGroupsDescription[] =
"SiteInstance.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -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 "
@@ -3762,7 +3762,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
@@ -3733,7 +3733,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
"Force the Translate Triggering on English pages experiment to be enabled "
"with the selected language model active.";
@ -63,7 +63,7 @@
const char kTranslationAPIName[] = "Experimental translation API";
const char kTranslationAPIDescription[] =
"Enables the on-device language translation API. "
@@ -5408,7 +5408,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes
@@ -5356,7 +5356,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes
"Enables a mitigation during web app install on CrOS for syncing "
"user_display_mode: kStandalone to non-CrOS devices.";
@ -72,7 +72,7 @@
const char kWasmTtsComponentUpdaterEnabledName[] =
"Enable Wasm TTS Extension Component";
const char kWasmTtsComponentUpdaterEnabledDescription[] =
@@ -7445,7 +7445,7 @@ const char kTetheringExperimentalFunctionalityDescript
@@ -7354,7 +7354,7 @@ const char kTetheringExperimentalFunctionalityDescript
#endif // BUILDFLAG(IS_CHROMEOS)
@ -81,7 +81,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7675,7 +7675,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
@@ -7584,7 +7584,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
// Linux -----------------------------------------------------------------------
@ -90,7 +90,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7721,6 +7721,18 @@ const char kWaylandUiScalingDescription[] =
@@ -7630,6 +7630,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.";
@ -109,7 +109,7 @@
#endif // BUILDFLAG(IS_LINUX)
// Random platform combinations -----------------------------------------------
@@ -7733,7 +7745,7 @@ const char kZeroCopyVideoCaptureDescription[] =
@@ -7642,7 +7654,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -118,7 +118,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7766,7 +7778,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
@@ -7675,7 +7687,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
"Enables a refreshed design for the Task Manager on Desktop platforms.";
#endif // BUILDFLAG(IS_ANDROID)
@ -127,25 +127,25 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7798,7 +7810,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7707,7 +7719,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7948,7 +7960,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(ENABLE_PRINTING)
const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
const char kCupsIppPrintingBackendDescription[] =
@@ -7852,7 +7864,7 @@ const char kElementCaptureDescription[] =
"media track into a track capturing just a specific DOM element.";
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -8004,7 +8016,7 @@ const char kComposeUpfrontInputModesDescription[] =
@@ -7908,7 +7920,7 @@ const char kComposeUpfrontInputModesDescription[] =
"Enables upfront input modes in the Compose dialog";
#endif // BUILDFLAG(ENABLE_COMPOSE)
@ -154,7 +154,7 @@
const char kThirdPartyProfileManagementName[] =
"Third party profile management";
const char kThirdPartyProfileManagementDescription[] =
@@ -8137,7 +8149,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] =
@@ -8052,7 +8064,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] =
"Enable the OS settings for overlay scrollbars on ChromeOS.";
#endif // BUILDFLAG(IS_CHROMEOS)

76
www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
View file

@ -1,31 +1,33 @@
--- chrome/browser/flag_descriptions.h.orig 2025-03-14 15:54:34 UTC
--- chrome/browser/flag_descriptions.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/flag_descriptions.h
@@ -332,13 +332,13 @@ extern const char
@@ -356,7 +356,7 @@ extern const char
kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
extern const char kAutofillEnableAmountExtractionDesktopName[];
extern const char kAutofillEnableAmountExtractionDesktopDescription[];
#endif
@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt
// BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kAutofillEnableBuyNowPayLaterForAffirmName[];
extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[];
extern const char kAutofillEnableBuyNowPayLaterName[];
extern const char kAutofillEnableBuyNowPayLaterDescription[];
@@ -561,7 +561,7 @@ extern const char kCanvasOopRasterizationDescription[]
extern const char kCapturedSurfaceControlName[];
extern const char kCapturedSurfaceControlDescription[];
@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[];
extern const char kCrossTabRegionCaptureDescription[];
#endif // !BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
extern const char kContextualCueingName[];
extern const char kContextualCueingDescription[];
#endif // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -736,7 +736,7 @@ extern const char kDevicePostureName[];
@@ -753,7 +753,7 @@ extern const char kDevicePostureName[];
extern const char kDevicePostureDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -34,16 +36,16 @@
extern const char kDocumentPictureInPictureAnimateResizeName[];
extern const char kDocumentPictureInPictureAnimateResizeDescription[];
@@ -1248,7 +1248,7 @@ extern const char kContextualPageActionsShareModelName
extern const char kContextualPageActionsShareModelDescription[];
@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes
extern const char kEnableIsolatedWebAppDevModeName[];
extern const char kEnableIsolatedWebAppDevModeDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kEnableSearchAggregatorPolicyName[];
extern const char kEnableSearchAggregatorPolicyDescription[];
#endif
@@ -2030,7 +2030,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const char kEnableIwaKeyDistributionComponentName[];
extern const char kEnableIwaKeyDistributionComponentDescription[];
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -2020,7 +2020,7 @@ extern const char kDefaultSiteInstanceGroupsName[];
extern const char kDefaultSiteInstanceGroupsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -52,7 +54,7 @@
extern const char kPwaNavigationCapturingName[];
extern const char kPwaNavigationCapturingDescription[];
#endif
@@ -2193,7 +2193,7 @@ extern const char kTouchTextEditingRedesignDescription
@@ -2180,7 +2180,7 @@ extern const char kTouchTextEditingRedesignDescription
extern const char kTranslateForceTriggerOnEnglishName[];
extern const char kTranslateForceTriggerOnEnglishDescription[];
@ -61,7 +63,7 @@
extern const char kTranslationAPIName[];
extern const char kTranslationAPIDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -3160,7 +3160,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio
@@ -3147,7 +3147,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio
extern const char kUserDisplayModeSyncStandaloneMitigationName[];
extern const char kUserDisplayModeSyncStandaloneMitigationDescription[];
@ -70,7 +72,7 @@
extern const char kWasmTtsComponentUpdaterEnabledName[];
extern const char kWasmTtsComponentUpdaterEnabledDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -4362,7 +4362,7 @@ extern const char kTetheringExperimentalFunctionalityD
@@ -4328,7 +4328,7 @@ extern const char kTetheringExperimentalFunctionalityD
#endif // #if BUILDFLAG(IS_CHROMEOS)
@ -79,7 +81,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4497,7 +4497,7 @@ extern const char kEnableArmHwdrmDescription[];
@@ -4463,7 +4463,7 @@ extern const char kEnableArmHwdrmDescription[];
// Linux ---------------------------------------------------------------------
@ -88,7 +90,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4525,6 +4525,9 @@ extern const char kWaylandTextInputV3Description[];
@@ -4491,6 +4491,9 @@ extern const char kWaylandTextInputV3Description[];
extern const char kWaylandUiScalingName[];
extern const char kWaylandUiScalingDescription[];
@ -98,16 +100,16 @@
#endif // BUILDFLAG(IS_LINUX)
// Random platform combinations -----------------------------------------------
@@ -4544,7 +4547,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4510,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4560,7 +4563,7 @@ extern const char kScreenlockReauthCardDescription[];
#if BUILDFLAG(ENABLE_PRINTING)
extern const char kCupsIppPrintingBackendName[];
extern const char kCupsIppPrintingBackendDescription[];
@@ -4523,7 +4526,7 @@ extern const char kScreenlockReauthCardDescription[];
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -116,7 +118,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4574,7 +4577,7 @@ extern const char kTaskManagerDesktopRefreshName[];
@@ -4537,7 +4540,7 @@ extern const char kTaskManagerDesktopRefreshName[];
extern const char kTaskManagerDesktopRefreshDescription[];
#endif // BUILDFLAG(IS_ANDROID)
@ -125,16 +127,16 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4671,7 +4674,7 @@ extern const char kElementCaptureDescription[];
@@ -4632,7 +4635,7 @@ extern const char kElementCaptureName[];
extern const char kElementCaptureDescription[];
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
#endif
@@ -4713,7 +4716,7 @@ extern const char kComposeUpfrontInputModesName[];
@@ -4674,7 +4677,7 @@ extern const char kComposeUpfrontInputModesName[];
extern const char kComposeUpfrontInputModesDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
@ -143,7 +145,7 @@
extern const char kThirdPartyProfileManagementName[];
extern const char kThirdPartyProfileManagementDescription[];
@@ -4794,7 +4797,7 @@ extern const char kEnablePolicyPromotionBannerName[];
@@ -4759,7 +4762,7 @@ extern const char kEnablePolicyPromotionBannerName[];
extern const char kEnablePolicyPromotionBannerDescription[];
#endif // !BUILDFLAG(IS_ANDROID)

6
www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/gcm/gcm_profile_service_factory.cc
@@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle
@@ -110,7 +110,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle
// static
GCMProfileService* GCMProfileServiceFactory::GetForProfile(
content::BrowserContext* profile) {
@ -9,7 +9,7 @@
// On desktop, incognito profiles are checked with IsIncognitoProfile().
// It's possible for non-incognito profiles to also be off-the-record.
bool is_profile_supported =
@@ -132,7 +132,7 @@ std::unique_ptr<KeyedService>
@@ -153,7 +153,7 @@ std::unique_ptr<KeyedService>
GCMProfileServiceFactory::BuildServiceInstanceForBrowserContext(
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);

4
www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/global_features.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/global_features.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/global_features.cc
@@ -21,7 +21,7 @@
#include "chrome/browser/glic/launcher/glic_background_mode_manager.h" // nogncheck
#include "chrome/browser/glic/glic_profile_manager.h" // nogncheck
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

8
www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/headless/headless_mode_util.cc.orig 2024-11-16 12:20:41 UTC
--- chrome/browser/headless/headless_mode_util.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -10,7 +10,7 @@
// New headless mode is available on Linux, Windows and Mac platforms.
@ -9,16 +9,16 @@
#include "base/base_switches.h"
#include "base/files/file_path.h"
@@ -19,7 +19,7 @@
#include "chrome/common/chrome_switches.h"
@@ -20,7 +20,7 @@
#include "content/public/common/content_switches.h"
#include "ui/base/ui_base_switches.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
@@ -94,7 +94,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
@@ -95,7 +95,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
}
}

22
www/ungoogled-chromium/files/patch-chrome_browser_media_audio__service__util.cc
View file

@ -1,20 +1,20 @@
--- chrome/browser/media/audio_service_util.cc.orig 2024-06-22 08:49:42 UTC
--- chrome/browser/media/audio_service_util.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/media/audio_service_util.cc
@@ -21,7 +21,7 @@
@@ -20,7 +20,7 @@
namespace {
-#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)
const base::Value* GetPolicy(const char* policy_name) {
const policy::PolicyMap& policies =
@@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
g_browser_process->browser_policy_connector()
@@ -39,7 +39,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
} // namespace
bool IsAudioServiceSandboxEnabled() {
// TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being
// built with OS_CHROMEOS instead of OS_LINUX.
-#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)
return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled,
features::kAudioServiceSandbox);
#else

4
www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/browser/media/router/discovery/BUILD.gn.orig 2024-06-22 08:49:42 UTC
--- chrome/browser/media/router/discovery/BUILD.gn.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/media/router/discovery/BUILD.gn
@@ -82,7 +82,7 @@ static_library("discovery") {
@@ -79,7 +79,7 @@ static_library("discovery") {
]
configs += [ "//build/config/compiler:wexit_time_destructors" ]

20
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
#include "ash/shell.h"
#include "ui/aura/window.h"
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/functional/callback.h"
#include "content/public/browser/desktop_capture.h"
#endif
@ -13,8 +13,8 @@
DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
} // namespace
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
namespace {
base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
@ -22,8 +22,8 @@
return stream_devices_set;
}
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
blink::mojom::StreamDevicesSetPtr EnumerateScreens(
blink::mojom::MediaStreamType stream_type) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -31,8 +31,8 @@
root_windows_for_testing_.Get() = std::move(root_windows);
}
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
g_desktop_capturer_for_testing.Get() = std::move(capturer);

18
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
View file

@ -1,20 +1,20 @@
--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.h
@@ -20,7 +20,7 @@ namespace aura {
@@ -18,7 +18,7 @@
namespace aura {
class Window;
}
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
namespace webrtc {
class DesktopCapturer;
}
@@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -39,7 +39,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu
#if BUILDFLAG(IS_CHROMEOS)
static void SetRootWindowsForTesting(
std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows);
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
static void SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer);
#endif

12
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -108,7 +108,7 @@ std::string GetLogUploadProduct() {
@@ -105,7 +105,7 @@ std::string GetLogUploadProduct() {
const char product[] = "Chrome";
#elif BUILDFLAG(IS_MAC)
const char product[] = "Chrome_Mac";
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#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)
#if !defined(ADDRESS_SANITIZER)
const char product[] = "Chrome_Linux";
#else

6
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
@@ -25,10 +25,10 @@
#include "components/webrtc_logging/browser/text_log_list.h"
@ -13,7 +13,7 @@
using webrtc_event_logging::WebRtcEventLogManager;
@@ -288,7 +288,7 @@ void WebRtcLoggingController::StartEventLogging(
@@ -304,7 +304,7 @@ void WebRtcLoggingController::StartEventLogging(
web_app_id, callback);
}
@ -22,7 +22,7 @@
void WebRtcLoggingController::GetLogsDirectory(
LogsDirectoryCallback callback,
LogsDirectoryErrorCallback error_callback) {
@@ -334,7 +334,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
@@ -350,7 +350,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
FROM_HERE,
base::BindOnce(std::move(callback), file_system.id(), registered_name));
}

25
www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
View file

@ -1,24 +1,33 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-02-20 09:59:21 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -117,7 +117,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -86,7 +86,7 @@
#include "chrome/browser/flags/android/chrome_session_state.h"
#endif // BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#if defined(__GLIBC__)
#include <gnu/libc-version.h>
#endif // defined(__GLIBC__)
@@ -111,7 +111,7 @@
#include "chrome/installer/util/taskbar_util.h"
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -126,7 +126,7 @@
@@ -120,7 +120,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -896,7 +896,7 @@ void RecordStartupMetrics() {
@@ -872,7 +872,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -27,7 +36,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -1211,11 +1211,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1183,11 +1183,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
std::make_unique<web_app::SamplingMetricsProvider>();
#endif // !BUILDFLAG(IS_ANDROID)

77
www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -201,11 +201,11 @@
@@ -196,11 +196,11 @@
#include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
#endif
@ -10,38 +10,47 @@
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h"
#endif
@@ -219,7 +219,7 @@
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -542,7 +542,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -233,7 +233,7 @@ const int kMaxHistogramGatheringWaitDuration = 60000;
// Needs to be kept in sync with the writer in
// third_party/crashpad/crashpad/handler/handler_main.cc.
const char kCrashpadHistogramAllocatorName[] = "CrashpadMetrics";
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::LazyInstance<ChromeMetricsServiceCrashReporter>::Leaky g_crash_reporter =
LAZY_INSTANCE_INITIALIZER;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
@@ -537,7 +537,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
#if !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -733,7 +733,7 @@ void ChromeMetricsServiceClient::Initialize() {
#if !BUILDFLAG(IS_CHROMEOS)
@@ -619,7 +619,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri
void ChromeMetricsServiceClient::OnEnvironmentUpdate(std::string* environment) {
// TODO(https://bugs.ch40m1um.qjz9zk/p/crashpad/issues/detail?id=135): call this
// on Mac when the Crashpad API supports it.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Register the environment with the crash reporter. Note that there is a
// window from startup to this point during which crash reports will not have
// an environment set.
@@ -724,7 +724,7 @@ void ChromeMetricsServiceClient::Initialize() {
std::make_unique<metrics::dwa::DwaService>(this, local_state);
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
base::SequencedTaskRunner::GetCurrentDefault());
#endif
@@ -791,7 +791,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -50,16 +59,16 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -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) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<GoogleUpdateMetricsProviderMac>());
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -992,7 +992,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -68,16 +77,16 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -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) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
@@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
}
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
@@ -1528,7 +1528,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
@@ -1509,7 +1509,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
recorder =
base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>(
cros_system_profile_provider_.get());

10
www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/metrics/perf/cpu_identity.cc
@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() {
@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() {
result.release =
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
base::SysInfo::KernelVersion();
-#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)
base::SysInfo::OperatingSystemVersion();
#else
#error "Unsupported configuration"

30
www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_
@@ -134,7 +134,7 @@ SystemNetworkContextManager* g_system_network_context_
// received a failed launch for a sandboxed network service.
bool g_previously_failed_to_launch_sandboxed_service = false;
@ -9,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;
@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load
@@ -142,7 +142,7 @@ bool g_network_service_will_allow_gssapi_library_load
const char* kGssapiDesiredPref =
#if BUILDFLAG(IS_CHROMEOS)
prefs::kKerberosEnabled;
@ -18,7 +18,7 @@
prefs::kReceivedHttpAuthNegotiateHeader;
#endif
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -188,7 +188,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -27,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)
@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -203,7 +203,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
#endif // BUILDFLAG(IS_ANDROID)
@ -36,7 +36,7 @@
auth_dynamic_params->allow_gssapi_library_load =
local_state->GetBoolean(kGssapiDesiredPref);
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -213,7 +213,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
void OnNewHttpAuthDynamicParams(
network::mojom::HttpAuthDynamicParamsPtr& params) {
@ -45,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
@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -255,11 +255,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
@ -59,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 ||
@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -275,7 +275,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
@ -68,7 +68,7 @@
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
@@ -520,7 +520,7 @@ void SystemNetworkContextManager::DeleteInstance() {
@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() {
g_system_network_context_manager = nullptr;
}
@ -77,7 +77,7 @@
SystemNetworkContextManager::GssapiLibraryLoadObserver::
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
: owner_(owner) {}
@@ -578,7 +578,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -86,7 +86,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -592,7 +592,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -591,7 +591,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
auth_pref_callback);
#endif // BUILDFLAG(IS_ANDROID)
@ -95,7 +95,7 @@
pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -657,7 +657,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
std::string());
@ -104,7 +104,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -682,11 +682,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@ -118,7 +118,7 @@
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
@@ -739,7 +739,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@ -127,7 +127,7 @@
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -958,7 +958,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}

17
www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2025-01-25 09:34:31 UTC
--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/notifications/notification_display_service_impl.cc
@@ -32,7 +32,7 @@
@@ -31,7 +31,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
#include "chrome/browser/sharing/sharing_notification_handler.h"
#endif
@@ -57,7 +57,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer
@@ -60,7 +60,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer
// static
void NotificationDisplayServiceImpl::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
@ -18,7 +18,7 @@
registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true);
#endif
}
@@ -73,7 +73,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
@@ -76,7 +76,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
std::make_unique<PersistentNotificationHandler>());
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -27,3 +27,12 @@
AddNotificationHandler(
NotificationHandler::Type::SEND_TAB_TO_SELF,
std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
@@ -84,7 +84,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
#endif
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)) && \
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \
BUILDFLAG(SAFE_BROWSING_AVAILABLE)
AddNotificationHandler(
NotificationHandler::Type::TAILORED_SECURITY,

4
www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2024-10-01 07:26:23 UTC
--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
@@ -56,7 +56,7 @@ bool SystemNotificationsEnabled(Profile* profile) {
@@ -55,7 +55,7 @@ bool SystemNotificationsEnabled(Profile* profile) {
#elif BUILDFLAG(IS_WIN)
return NotificationPlatformBridgeWin::SystemNotificationEnabled();
#else

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

@ -1,6 +1,6 @@
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-03-09 21:38:10 UTC
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-04-15 08:30:07 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -636,7 +636,7 @@ void ChromePasswordManagerClient::
@@ -642,7 +642,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;
}
@@ -914,7 +914,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
@@ -920,7 +920,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
}
void ChromePasswordManagerClient::NotifyKeychainError() {

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