mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

www/ungoogled-chromium: update to 115.0.5790.98

Browse Source 
Approved by:	rene (mentor, implicit)
Security:	https://vuxml.freebsd.org/freebsd/2f22927f-26ea-11ee-8290-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2023-07-21 15:53:01 +02:00
parent 45d81915dc
commit 792ca53687
341 changed files with 3070 additions and 1697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/ungoogled-chromium/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 114.0.5735.198
PORTVERSION= 115.0.5790.98
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
@ -135,6 +135,7 @@ GN_ARGS+= build_with_tflite_lib=false \
enable_reading_list=false \
enable_remoting=false \
enable_reporting=false \
enable_rust=false \
enable_service_discovery=false \
exclude_unwind_tables=true \
google_api_key="" \
@ -231,8 +232,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif
.if ${COMPILER_VERSION} < 150
LLVM_DEFAULT= 15
.if ${COMPILER_VERSION} < 160
LLVM_DEFAULT= 16
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \

14
www/ungoogled-chromium/distinfo
View File

@ -1,9 +1,9 @@
TIMESTAMP = 1687967513
SHA256 (chromium-114.0.5735.198.tar.xz) = a9f3440feeab51f56b199797b83b458ca545bf67e114c62b21470fadd5a41dea
SIZE (chromium-114.0.5735.198.tar.xz) = 1570630092
SHA256 (ungoogled-chromium-114.0.5735.198-1.tar.gz) = 3b22dcd4caebea5f1c72ea4437e67784d6b740a4624b15002078a6daf05235a1
SIZE (ungoogled-chromium-114.0.5735.198-1.tar.gz) = 664537
SHA256 (chromium-114.0.5735.198-testdata.tar.xz) = 2c244b76c21c298e07719107e421b56715f020eb2c14aea1bafa90bd84c06887
SIZE (chromium-114.0.5735.198-testdata.tar.xz) = 263496592
TIMESTAMP = 1689933072
SHA256 (chromium-115.0.5790.98.tar.xz) = ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
SIZE (chromium-115.0.5790.98.tar.xz) = 1594903988
SHA256 (ungoogled-chromium-115.0.5790.98-1.tar.gz) = e6647876747b083a491710393af0f8058284e465d06b41225eb708b30fb08072
SIZE (ungoogled-chromium-115.0.5790.98-1.tar.gz) = 665549
SHA256 (chromium-115.0.5790.98-testdata.tar.xz) = ed42d767a1056182d68cea5e5565f33904e328c51d943dfe14cde791f2e286ae
SIZE (chromium-115.0.5790.98-testdata.tar.xz) = 264829224
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

12
www/ungoogled-chromium/files/patch-BUILD.gn
View File

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-06-05 19:39:05 UTC
--- BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -658,7 +666,7 @@ group("gn_all") {
@@ -657,7 +665,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1088,7 +1096,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1086,7 +1094,7 @@ if (!is_ios && !is_cronet_build) {
]
}
@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1195,7 +1203,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1664,7 +1672,7 @@ group("chromium_builder_perf") {
@@ -1663,7 +1671,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

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

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2023-06-05 19:39:05 UTC
--- base/BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ base/BUILD.gn
@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1100,11 +1100,23 @@ component("base") {
@@ -1099,11 +1099,23 @@ 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.
@ -34,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1132,7 +1144,7 @@ component("base") {
@@ -1131,7 +1143,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@ -43,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1173,7 +1185,7 @@ component("base") {
@@ -1172,7 +1184,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -52,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2127,6 +2139,43 @@ component("base") {
@@ -2130,6 +2142,43 @@ component("base") {
}
}
@ -96,7 +96,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2236,7 +2285,7 @@ component("base") {
@@ -2238,7 +2287,7 @@ component("base") {
}
if (dep_libevent) {
@ -105,7 +105,7 @@
}
if (use_libevent) {
@@ -3559,7 +3608,7 @@ test("base_unittests") {
@@ -3552,7 +3601,7 @@ test("base_unittests") {
]
}
@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3608,7 +3657,7 @@ test("base_unittests") {
@@ -3601,7 +3650,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3619,7 +3668,7 @@ test("base_unittests") {
@@ -3612,7 +3661,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3843,7 +3892,7 @@ test("base_unittests") {
@@ -3837,7 +3886,7 @@ test("base_unittests") {
}
}

4
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

4
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal(
@@ -394,8 +394,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

4
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-08 11:38:38 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
}
#endif

14
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
View File

@ -1,11 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {
- enable_pkeys = is_linux && target_cpu == "x64"
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
@@ -291,7 +291,7 @@ declare_args() {
# pkeys support is explicitly disabled in all Cronet builds, as some test dependencies that
# use partition_allocator are compiled in AOSP against a version of glibc that does not
# include pkeys syscall numbers.
- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
}
assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
"Pkeys are only supported on x64 linux")

8
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-05-05 12:12:41 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
@ -9,7 +9,7 @@
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false;
@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@ -18,7 +18,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -277,7 +277,7 @@ constexpr bool kUseLazyCommit = false;
@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \

11
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
View File

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-05-05 12:12:41 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -92,7 +92,7 @@ PartitionPageShift() {
return 18; // 256 KiB
@ -9,12 +9,13 @@
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -293,7 +293,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// When pointer compression is enabled, we cannot use large pools (at most
@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
+ BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
#else
constexpr size_t kPoolMaxSize = 16 * kGiB;

8
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
View File

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -46,7 +46,7 @@
#include "wow64apiset.h"
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() {
@@ -286,7 +286,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -853,7 +853,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -880,7 +880,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

6
www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc
View File

@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig 2023-04-08 11:38:38 UTC
--- base/debug/stack_trace_posix.cc.orig 2023-07-21 09:49:17 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
@ -18,7 +18,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper {
@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@ -28,7 +28,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper {
@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;

8
www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc
View File

@ -1,6 +1,6 @@
--- base/files/file_path_watcher_unittest.cc.orig 2023-06-05 19:39:05 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2023-07-21 09:49:17 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());
@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
@@ -1275,7 +1275,7 @@ enum Permission {
@@ -1281,7 +1281,7 @@ enum Permission {
Execute
};
@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)

4
www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h
View File

@ -1,4 +1,4 @@
--- base/memory/platform_shared_memory_region.h.orig 2022-10-01 07:40:07 UTC
--- base/memory/platform_shared_memory_region.h.orig 2023-07-21 09:49:17 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -16,7 +16,7 @@
@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size

32
www/ungoogled-chromium/files/patch-base_process_process__metrics.h
View File

@ -1,6 +1,6 @@
--- base/process/process_metrics.h.orig 2023-03-10 11:01:21 UTC
--- base/process/process_metrics.h.orig 2023-07-21 09:49:17 UTC
+++ base/process/process_metrics.h
@@ -37,7 +37,7 @@
@@ -38,7 +38,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -9,16 +9,16 @@
#include <string>
#include <utility>
#include <vector>
@@ -50,7 +50,7 @@ namespace base {
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
@@ -53,7 +53,7 @@ struct IoCounters;
class ProcessMetricsAppleInternal;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@ -27,7 +27,7 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -226,7 +226,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
@@ -263,9 +263,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics {
// Used to store the previous times and CPU usage counts so we can
// compute the CPU usage between calls.
TimeTicks last_cpu_time_;
@ -64,7 +64,7 @@
#if BUILDFLAG(IS_WIN)
TimeTicks last_cpu_time_for_precise_cpu_usage_;
@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -73,7 +73,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@ -82,7 +82,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -91,7 +91,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -100,7 +100,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -109,7 +109,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics {
@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

6
www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc
View File

@ -1,6 +1,6 @@
--- base/process/process_metrics_posix.cc.orig 2023-06-05 19:39:05 UTC
--- base/process/process_metrics_posix.cc.orig 2023-07-21 09:49:17 UTC
+++ base/process/process_metrics_posix.cc
@@ -20,6 +20,8 @@
@@ -21,6 +21,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() {
@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() {
return stats.size_in_use;
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();

4
www/ungoogled-chromium/files/patch-base_system_sys__info.cc
View File

@ -1,6 +1,6 @@
--- base/system/sys_info.cc.orig 2023-06-05 19:39:05 UTC
--- base/system/sys_info.cc.orig 2023-07-21 09:49:17 UTC
+++ base/system/sys_info.cc
@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() {
@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() {
#endif
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {

8
www/ungoogled-chromium/files/patch-base_system_sys__info.h
View File

@ -1,15 +1,15 @@
--- base/system/sys_info.h.orig 2023-06-05 19:39:05 UTC
--- base/system/sys_info.h.orig 2023-07-21 09:49:17 UTC
+++ base/system/sys_info.h
@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo {
@@ -258,6 +258,8 @@ class BASE_EXPORT SysInfo {
static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
#endif
+ static uint64_t MaxSharedMemorySize();
+
private:
friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo {
@@ -270,7 +272,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

4
www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc
View File

@ -1,4 +1,4 @@
--- base/threading/platform_thread_unittest.cc.orig 2023-05-05 12:12:41 UTC
--- base/threading/platform_thread_unittest.cc.orig 2023-07-21 09:49:17 UTC
+++ base/threading/platform_thread_unittest.cc
@@ -32,7 +32,7 @@
#include "base/time/time.h"
@ -18,7 +18,7 @@
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level.
constexpr bool kCanIncreasePriority = false;
@@ -704,12 +704,16 @@ INSTANTIATE_TEST_SUITE_P(
@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)

30
www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
View File

@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig 2023-06-05 19:39:05 UTC
--- build/config/compiler/BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ build/config/compiler/BUILD.gn
@@ -237,13 +237,16 @@ config("default_include_dirs") {
@@ -249,13 +249,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@ -18,7 +18,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -467,6 +470,10 @@ config("compiler") {
@@ -497,6 +500,10 @@ config("compiler") {
}
}
@ -29,7 +29,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -542,7 +549,7 @@ config("compiler") {
@@ -572,7 +579,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -727,7 +734,7 @@ config("compiler") {
@@ -757,7 +764,7 @@ config("compiler") {
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
@ -47,7 +47,7 @@
# TODO(https://crbug.com/972449): turn on for ChromeOS when that
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
@@ -825,7 +832,7 @@ config("compiler") {
@@ -860,7 +867,7 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
@ -56,7 +56,7 @@
cflags_cc += [ "-gsimple-template-names" ]
}
@@ -1005,7 +1012,7 @@ config("compiler_cpu_abi") {
@@ -1095,7 +1102,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -1020,7 +1027,7 @@ config("compiler_cpu_abi") {
@@ -1110,7 +1117,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -74,7 +74,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1355,7 +1362,7 @@ config("compiler_deterministic") {
@@ -1445,7 +1452,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.
@ -83,7 +83,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1407,7 +1414,7 @@ config("compiler_deterministic") {
@@ -1497,7 +1504,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -92,7 +92,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1645,7 +1652,7 @@ config("default_warnings") {
@@ -1735,7 +1742,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -101,7 +101,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1836,7 +1843,7 @@ config("no_chromium_code") {
@@ -1926,7 +1933,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -110,7 +110,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2346,7 +2353,7 @@ config("afdo_optimize_size") {
@@ -2436,7 +2443,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") {
@ -119,7 +119,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2365,7 +2372,7 @@ config("afdo") {
@@ -2455,7 +2462,7 @@ config("afdo") {
}
inputs = [ _clang_sample_profile ]
}
@ -128,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2523,7 +2530,8 @@ config("symbols") {
@@ -2613,7 +2620,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

19
www/ungoogled-chromium/files/patch-build_config_compiler_pgo_BUILD.gn Normal file
View File

@ -0,0 +1,19 @@
--- build/config/compiler/pgo/BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ build/config/compiler/pgo/BUILD.gn
@@ -121,13 +121,14 @@ config("pgo_optimization_flags") {
# Enable basic block layout based on the extended TSP problem. This aims to
# improve icache utilization and reduce the binary size.
- if (use_thin_lto) {
+ # __clang_major__ >= 15
+ if (use_thin_lto && !is_bsd) {
if (is_win) {
ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ]
} else {
ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ]
}
- } else {
+ } else if (!is_bsd) {
cflags += [
"-mllvm",
"-enable-ext-tsp-block-placement=1",

11
www/ungoogled-chromium/files/patch-build_config_rust.gni
View File

@ -1,11 +0,0 @@
--- build/config/rust.gni.orig 2023-06-05 19:39:05 UTC
+++ build/config/rust.gni
@@ -170,7 +170,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {
- if (host_os != "linux") {
+ if (host_os != "linux" && host_os != "openbsd" && host_os != "freebsd") {
assert(false,
"Attempt to use Android Rust toolchain on an unsupported platform")
}

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

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2023-06-05 19:39:05 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2023-07-21 09:49:17 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,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).
#
@@ -859,22 +866,12 @@ template("gcc_toolchain") {
@@ -869,22 +876,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {

4
www/ungoogled-chromium/files/patch-chrome_app_app__management__strings.grdp
View File

@ -1,6 +1,6 @@
--- chrome/app/app_management_strings.grdp.orig 2023-06-05 19:39:05 UTC
--- chrome/app/app_management_strings.grdp.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/app_management_strings.grdp
@@ -176,7 +176,7 @@
@@ -188,7 +188,7 @@
You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
</if>

12
www/ungoogled-chromium/files/patch-chrome_app_chrome__command__ids.h
View File

@ -1,11 +1,17 @@
--- chrome/app/chrome_command_ids.h.orig 2023-03-10 11:01:21 UTC
--- chrome/app/chrome_command_ids.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/chrome_command_ids.h
@@ -70,7 +70,7 @@
@@ -70,12 +70,12 @@
#define IDC_TOGGLE_MULTITASK_MENU 34050
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#define IDC_USE_SYSTEM_TITLE_BAR 34051
#endif
// TODO(crbug.com/1052397): 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)
#define IDC_USE_SYSTEM_TITLE_BAR 34051
#define IDC_RESTORE_WINDOW 34052
#endif

26
www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
View File

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -137,7 +137,7 @@
@@ -138,7 +138,7 @@
#include "components/about_ui/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
@@ -182,16 +182,16 @@
@@ -183,16 +183,16 @@
#include "v8/include/v8.h"
#endif
@ -29,7 +29,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -327,7 +327,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -328,7 +328,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -38,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -412,7 +412,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -413,7 +413,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -47,7 +47,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) ||
@@ -526,7 +526,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -527,7 +527,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -56,7 +56,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.
@@ -615,7 +615,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -616,7 +616,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -65,16 +65,16 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -956,7 +956,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -958,7 +958,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1094,7 +1094,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1096,7 +1096,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -83,7 +83,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1124,7 +1124,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1126,7 +1126,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1498,7 +1498,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1500,7 +1500,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -101,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1600,7 +1600,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1602,7 +1602,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.

20
www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd
View File

@ -1,4 +1,4 @@
--- chrome/app/chromium_strings.grd.orig 2023-05-05 12:12:41 UTC
--- chrome/app/chromium_strings.grd.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/chromium_strings.grd
@@ -296,7 +296,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
@ -18,3 +18,21 @@
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
Chromium may not function correctly because it is no longer supported on this Linux distribution
</message>
@@ -812,7 +812,7 @@ Permissions you've already given to websites and apps
</message>
</if>
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
Not used in Chromium. Placeholder to keep resource maps in sync.
</message>
@@ -1170,7 +1170,7 @@ Permissions you've already given to websites and apps
</message>
</if>
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false">
Not used in Chromium. Placeholder to keep resource maps in sync.
</message>

34
www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd
View File

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-06-05 19:39:05 UTC
--- chrome/app/generated_resources.grd.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
@@ -3258,7 +3258,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3304,7 +3304,7 @@ You can send it to Google to check if it's unsafe. Sca
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@ -18,7 +18,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
@@ -5007,7 +5007,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -5036,7 +5036,7 @@ You can send it to Google to check if it's unsafe. Sca
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@ -27,7 +27,7 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
Read information about your browser, OS, device, installed software and files
</message>
@@ -5689,7 +5689,7 @@ Keep your key file in a safe place. You will need it t
@@ -5691,7 +5691,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
</if>
@ -36,7 +36,7 @@
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
@@ -5735,7 +5735,7 @@ Keep your key file in a safe place. You will need it t
@@ -5737,7 +5737,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
</message>
</if>
@ -45,7 +45,16 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
@@ -9841,7 +9841,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -9560,7 +9560,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
@@ -9891,7 +9891,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -54,7 +63,16 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
@@ -11182,7 +11182,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -10856,7 +10856,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>
<!-- Device Trust Consent dialog -->
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share device signals?
</message>
@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -63,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -13324,7 +13324,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -13426,7 +13426,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

20
www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd
View File

@ -1,4 +1,4 @@
--- chrome/app/google_chrome_strings.grd.orig 2022-12-02 17:56:32 UTC
--- chrome/app/google_chrome_strings.grd.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
@ -18,3 +18,21 @@
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
Google Chrome may not function correctly because it is no longer supported on this Linux distribution
</message>
@@ -844,7 +844,7 @@ Permissions you've already given to websites and apps
</if>
</if>
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<if expr="use_titlecase">
<message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
Relaunch to Update - Your tabs will reopen
@@ -1249,7 +1249,7 @@ Permissions you've already given to websites and apps
</message>
</if>
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog.">
Relaunch to finish Chrome update
</message>

6
www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
View File

@ -1,4 +1,4 @@
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-06-05 19:39:05 UTC
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-07-21 09:49:17 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
<includes>
@ -9,7 +9,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
@@ -67,7 +67,7 @@
@@ -61,7 +61,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@ -18,7 +18,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
@@ -81,7 +81,7 @@
@@ -75,7 +75,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->

44
www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/about_flags.cc.orig 2023-06-16 11:04:37 UTC
--- chrome/browser/about_flags.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/about_flags.cc
@@ -223,7 +223,7 @@
#include "ui/ui_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -316,7 +316,7 @@
@@ -317,7 +317,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -422,7 +422,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -423,7 +423,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -27,16 +27,16 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1449,7 +1449,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
@@ -1479,7 +1479,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
std::size(kChromeRefresh2023Level1), nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const FeatureEntry::FeatureParam
kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = {
{"DocumentProviderMaxLowQualitySuggestions", "1"},
@@ -4759,13 +4759,13 @@ const FeatureEntry kFeatureEntries[] = {
const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
{"ShortcutBoostSearchScore", "1414"},
{"ShortcutBoostUrlScore", "1414"}};
@@ -4983,13 +4983,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -52,8 +52,8 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5042,7 +5042,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
@@ -5274,7 +5274,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@ -61,16 +61,16 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5692,7 +5692,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5920,7 +5920,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -6476,7 +6476,7 @@ const FeatureEntry kFeatureEntries[] = {
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6683,7 +6683,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@ -79,7 +79,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -7349,7 +7349,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7575,7 +7575,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -88,7 +88,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -8124,7 +8124,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8354,7 +8354,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -97,7 +97,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -8369,7 +8369,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8609,7 +8609,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -106,7 +106,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8430,7 +8430,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8670,7 +8670,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -115,7 +115,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9007,7 +9007,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9252,7 +9252,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -124,7 +124,7 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
@@ -9705,7 +9705,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9951,7 +9951,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
@ -133,7 +133,7 @@
{"webui-system-font", flag_descriptions::kWebUiSystemFontName,
flag_descriptions::kWebUiSystemFontDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
@@ -9906,7 +9906,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10143,7 +10143,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \

8
www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/browser_process_impl.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -216,7 +216,7 @@
@@ -218,7 +218,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1200,7 +1200,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1433,7 +1433,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1449,7 +1449,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

4
www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h
View File

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.h.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/browser_process_impl.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/browser_process_impl.h
@@ -362,7 +362,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -374,7 +374,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

14
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -117,13 +117,13 @@
@@ -119,13 +119,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -197,7 +197,7 @@
@@ -199,7 +199,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
@@ -881,7 +881,7 @@ void PopulateChromeFrameBinders(
@@ -886,7 +886,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -889,7 +889,7 @@ void PopulateChromeFrameBinders(
@@ -894,7 +894,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -958,14 +958,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -963,14 +963,14 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1420,7 +1420,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1428,7 +1428,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

27
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2023-06-16 11:04:37 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -241,11 +241,11 @@
@@ -244,11 +244,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -14,7 +14,7 @@
#include "components/crash/core/app/crashpad.h"
#endif
@@ -280,7 +280,7 @@
@@ -283,14 +283,14 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -23,7 +23,15 @@
#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"
@@ -993,7 +993,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
#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
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -1006,7 +1006,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -32,7 +40,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1062,7 +1062,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -41,3 +49,12 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1296,7 +1296,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}

42
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 2023-06-05 19:39:05 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -423,7 +423,7 @@
@@ -426,7 +426,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"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -511,12 +511,12 @@
@@ -515,12 +515,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -24,14 +24,14 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -525,14 +525,14 @@
@@ -529,14 +529,14 @@
#include "components/crash/content/browser/crash_handler_host_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/enterprise/chrome_browser_main_extra_parts_enterprise.h"
#include "chrome/browser/enterprise/profile_token_management/profile_token_navigation_throttle.h"
#include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
#include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
#endif
@ -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_ASH)
@@ -561,11 +561,11 @@
@@ -565,11 +565,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -55,16 +55,16 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1584,7 +1584,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true);
registry->RegisterBooleanPref(
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false);
@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true);
registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed,
true);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1697,7 +1697,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1672,7 +1672,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -73,7 +73,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1711,7 +1711,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -82,7 +82,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1732,7 +1732,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -91,7 +91,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1776,7 +1776,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1751,7 +1751,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -100,7 +100,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2602,6 +2602,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2575,6 +2575,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#if(0)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -109,7 +109,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2996,7 +2998,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2972,7 +2974,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -118,7 +118,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4550,7 +4552,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4444,7 +4446,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -127,7 +127,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5064,7 +5066,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4960,7 +4962,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -136,7 +136,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5074,7 +5076,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4970,7 +4972,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -145,7 +145,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5105,7 +5107,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5001,7 +5003,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -154,7 +154,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -6786,7 +6788,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -6692,7 +6694,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {

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 2023-06-05 19:39:05 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -460,7 +460,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -459,7 +459,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

8
www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc
View File

@ -1,8 +1,8 @@
--- chrome/browser/defaults.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/defaults.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/defaults.cc
@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true;
const bool kSyncAutoStarts = false;
#endif
@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false;
const bool kDownloadPageHasShowInFolder = true;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

4
www/ungoogled-chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
View File

@ -1,6 +1,6 @@
--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
@@ -34,7 +34,7 @@ This file specifies browser resources for developer-fa
@@ -35,7 +35,7 @@ This file specifies browser resources for developer-fa
<include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" />

12
www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc
View File

@ -1,18 +1,18 @@
--- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/download/bubble/download_bubble_update_service.cc
@@ -87,7 +87,11 @@ ItemSortKey GetSortKey(const Item& item) {
@@ -91,7 +91,11 @@ ItemSortKey GetSortKey(const Item& item) {
// Helper to get an iterator to the last element in the cache. The cache
// must not be empty.
template <typename Item>
+#if defined(__clang__) && (__clang_major__ >= 16)
SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+#else
+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
+#endif
CHECK(!cache.empty());
auto it = cache.end();
return std::prev(it);
@@ -789,9 +793,17 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheI
@@ -967,9 +971,17 @@ bool DownloadBubbleUpdateService::CacheManager::Remove
}
template <typename Id, typename Item>
@ -21,7 +21,7 @@
+#else
+typename SortedItems<Item>::iterator
+#endif
DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
+#if defined(__clang__) && (__clang_major__ >= 16)
SortedItems<Item>::iterator iter,
+#else

13
www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h
View File

@ -1,13 +0,0 @@
--- chrome/browser/download/bubble/download_bubble_update_service.h.orig 2023-05-05 12:12:41 UTC
+++ chrome/browser/download/bubble/download_bubble_update_service.h
@@ -208,8 +208,8 @@ class DownloadBubbleUpdateService
// Removes item if we already have the iterator to it. Returns next iterator.
template <typename Id, typename Item>
- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
- SortedItems<Item>::iterator iter,
+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
+ typename SortedItems<Item>::iterator iter,
SortedItems<Item>& cache,
IterMap<Id, Item>& iter_map);

6
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 2023-05-05 12:12:41 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1545,7 +1545,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1547,7 +1547,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
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();
}
@@ -1611,7 +1611,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1613,7 +1613,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) || \

4
www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc
View File

@ -1,9 +1,9 @@
--- chrome/browser/download/download_prefs.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/download/download_prefs.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
#include "base/check.h"
#include "base/cxx17_backports.h"
+#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"

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

@ -0,0 +1,20 @@
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -50,7 +50,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/ui_base_types.h"
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck
#endif
@@ -553,7 +553,7 @@ void ContentAnalysisDelegate::PageRequestCallback(
bool ContentAnalysisDelegate::UploadData() {
upload_start_time_ = base::TimeTicks::Now();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// If this is a local content analysis, check if the local agent is ready.
// If not, abort early. This is to prevent doing a lot of work, like reading
// files into memory or calcuating SHA256 hashes and prevent a flash of the

82
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc Normal file
View File

@ -0,0 +1,82 @@
--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/enterprise/connectors/connectors_manager.cc
@@ -16,7 +16,7 @@
#include "components/prefs/pref_service.h"
#include "url/gurl.h"
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
@@ -25,7 +25,7 @@
namespace enterprise_connectors {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
namespace {
static constexpr enterprise_connectors::AnalysisConnector
@@ -51,7 +51,7 @@ ConnectorsManager::ConnectorsManager(
DCHECK(browser_crash_event_router_) << "Crash event router is null";
DCHECK(extension_install_event_router_) << "Extension event router is null";
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Start observing tab strip models for all browsers.
BrowserList* browser_list = BrowserList::GetInstance();
for (Browser* browser : *browser_list) {
@@ -62,14 +62,14 @@ ConnectorsManager::ConnectorsManager(
if (observe_prefs) {
StartObservingPrefs(pref_service);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
MaybeCloseLocalContentAnalysisAgentConnection();
#endif
}
extension_install_event_router_->StartObserving();
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ConnectorsManager::~ConnectorsManager() {
BrowserList* browser_list = BrowserList::GetInstance();
browser_list->RemoveObserver(this);
@@ -99,7 +99,7 @@ bool ConnectorsManager::IsConnectorEnabled(AnalysisCon
base::FeatureList::IsEnabled(kLocalContentAnalysisEnabled);
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool ConnectorsManager::IsConnectorEnabledForLocalAgent(
AnalysisConnector connector) const {
if (!IsConnectorEnabled(connector)) {
@@ -178,7 +178,7 @@ absl::optional<AnalysisSettings> ConnectorsManager::Ge
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void ConnectorsManager::OnBrowserAdded(Browser* browser) {
browser->tab_strip_model()->AddObserver(this);
}
@@ -241,7 +241,7 @@ void ConnectorsManager::CacheAnalysisConnectorPolicy(
service_settings, *service_provider_config_);
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void ConnectorsManager::MaybeCloseLocalContentAnalysisAgentConnection() {
for (auto connector : kLocalAnalysisConnectors) {
if (IsConnectorEnabledForLocalAgent(connector)) {
@@ -257,7 +257,7 @@ void ConnectorsManager::MaybeCloseLocalContentAnalysis
void ConnectorsManager::OnPrefChanged(AnalysisConnector connector) {
CacheAnalysisConnectorPolicy(connector);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
MaybeCloseLocalContentAnalysisAgentConnection();
#endif
}

56
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h Normal file
View File

@ -0,0 +1,56 @@
--- chrome/browser/enterprise/connectors/connectors_manager.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/enterprise/connectors/connectors_manager.h
@@ -16,7 +16,7 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/gurl.h"
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser_list_observer.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -31,7 +31,7 @@ class BrowserCrashEventRouter;
// Manages access to Connector policies for a given profile. This class is
// responsible for caching the Connector policies, validate them against
// approved service providers and provide a simple interface to them.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
class ConnectorsManager : public BrowserListObserver,
public TabStripModelObserver {
#else
@@ -51,7 +51,7 @@ class ConnectorsManager {
PrefService* pref_service,
const ServiceProviderConfig* config,
bool observe_prefs = true);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
~ConnectorsManager() override;
#else
~ConnectorsManager();
@@ -81,7 +81,7 @@ class ConnectorsManager {
bool IsConnectorEnabled(AnalysisConnector connector) const;
bool IsConnectorEnabled(ReportingConnector connector) const;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Check if the corresponding connector is enabled for any local agent.
bool IsConnectorEnabledForLocalAgent(AnalysisConnector connector) const;
#endif
@@ -109,7 +109,7 @@ class ConnectorsManager {
const;
private:
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// BrowserListObserver overrides:
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;
@@ -132,7 +132,7 @@ class ConnectorsManager {
void CacheAnalysisConnectorPolicy(AnalysisConnector connector) const;
void CacheReportingConnectorPolicy(ReportingConnector connector);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Close connection with local agent if all the relevant connectors are turned
// off for it.
void MaybeCloseLocalContentAnalysisAgentConnection();

6
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-03-10 11:01:21 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/profiles/profile.h"
@ -7,7 +7,7 @@
-#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/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h"
#include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -41,7 +41,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi
@ -20,7 +20,7 @@
return false;
@@ -77,7 +77,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
DeviceTrustConnectorService* service = nullptr;
auto* service = new DeviceTrustConnectorService(profile->GetPrefs());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)

4
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -21,7 +21,7 @@
#include "components/policy/core/common/management/management_service.h"
@ -9,7 +9,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -75,7 +75,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
@@ -78,7 +78,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
DependsOn(policy::ManagementServiceFactory::GetInstance());

18
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
View File

@ -1,18 +1,18 @@
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
@@ -14,7 +14,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter(
if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
return;
}
@@ -11,7 +11,7 @@ namespace enterprise_connectors {
BrowserCrashEventRouter::BrowserCrashEventRouter(
content::BrowserContext* context) {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
Profile* profile = Profile::FromBrowserContext(context);
@@ -27,7 +27,7 @@ BrowserCrashEventRouter::~BrowserCrashEventRouter() {
if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
return;
}
@@ -21,7 +21,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter(
}
BrowserCrashEventRouter::~BrowserCrashEventRouter() {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1342,6 +1342,10 @@ static_library("extensions") {
@@ -1344,6 +1344,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

6
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -544,7 +544,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
@@ -534,7 +534,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
@ -8,4 +8,4 @@
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
PasswordsPrivateEventRouter* router =
PasswordsPrivateEventRouterFactory::GetForProfile(profile_);
if (router)
if (router) {

14
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View File

@ -1,15 +1,15 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
// TODO(crbug.com/1052397): 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)
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;

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 2023-05-05 12:12:41 UTC
--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -829,7 +829,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -857,7 +857,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

6
www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
View File

@ -1,7 +1,7 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -312,7 +312,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
@@ -316,7 +316,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

22
www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2023-06-16 11:04:37 UTC
--- chrome/browser/flag_descriptions.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -2460,7 +2460,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
@@ -2427,7 +2427,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
const char kWebUIOmniboxPopupDescription[] =
"If enabled, shows the omnibox suggestions popup in WebUI.";
@ -9,7 +9,7 @@
const char kWebUiSystemFontName[] = "WebUI System font";
const char kWebUiSystemFontDescription[] =
"If enabled, all WebUI surfaces will use the default UI font of the "
@@ -6603,7 +6603,7 @@ const char kLibAssistantV2MigrationDescription[] =
@@ -6699,7 +6699,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -18,7 +18,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -6849,7 +6849,7 @@ const char kSearchWebInSidePanelDescription[] =
@@ -6930,7 +6930,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,7 +27,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -6858,7 +6858,7 @@ const char kQuickCommandsDescription[] =
@@ -6939,7 +6939,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -36,7 +36,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -6880,7 +6880,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
@@ -6961,7 +6961,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@ -45,7 +45,7 @@
const char kUseOutOfProcessVideoDecodingName[] =
"Use out-of-process video decoding (OOP-VD)";
const char kUseOutOfProcessVideoDecodingDescription[] =
@@ -6898,7 +6898,7 @@ const char kWebShareDescription[] =
@@ -6979,7 +6979,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -54,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -6918,7 +6918,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -6999,7 +6999,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -6932,7 +6932,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -7013,7 +7013,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -72,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7033,7 +7033,7 @@ const char kElasticOverscrollDescription[] =
@@ -7114,7 +7114,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -81,7 +81,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7062,7 +7062,7 @@ const char kSigninInterceptBubbleV2Description[] =
@@ -7143,7 +7143,7 @@ const char kSigninInterceptBubbleV2Description[] =
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \

22
www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
View File

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2023-06-16 11:04:37 UTC
--- chrome/browser/flag_descriptions.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/flag_descriptions.h
@@ -1385,7 +1385,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
@@ -1363,7 +1363,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
extern const char kWebUIOmniboxPopupName[];
extern const char kWebUIOmniboxPopupDescription[];
@ -9,8 +9,8 @@
extern const char kWebUiSystemFontName[];
extern const char kWebUiSystemFontDescription[];
#endif
@@ -3821,7 +3821,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
extern const char kLacrosScreenCoordinatesEnabledDescription[];
@@ -3859,7 +3859,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -18,7 +18,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -3948,14 +3948,14 @@ extern const char kSearchWebInSidePanelDescription[];
@@ -3983,14 +3983,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -35,7 +35,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -3965,7 +3965,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4000,7 +4000,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -44,7 +44,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -3975,7 +3975,7 @@ extern const char kOzonePlatformHintName[];
@@ -4010,7 +4010,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -53,7 +53,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -3983,13 +3983,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -4018,13 +4018,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -69,7 +69,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4005,7 +4005,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
@@ -4040,7 +4040,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -78,7 +78,7 @@
extern const char kUseOutOfProcessVideoDecodingName[];
extern const char kUseOutOfProcessVideoDecodingDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -4079,7 +4079,7 @@ extern const char kElasticOverscrollDescription[];
@@ -4114,7 +4114,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -87,7 +87,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4097,7 +4097,7 @@ extern const char kSigninInterceptBubbleV2Description[
@@ -4132,7 +4132,7 @@ extern const char kSigninInterceptBubbleV2Description[
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \

10
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 2023-04-08 11:38:38 UTC
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -10,12 +10,12 @@
// New headless mode is available on Linux, Windows and Mac platforms.
@ -15,10 +15,10 @@
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
@@ -72,7 +72,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
::switches::kNoErrorDialogs);
}
@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableLazyLoading);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Headless mode on Linux relies on ozone/headless platform.

16
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
View File

@ -1,18 +1,18 @@
--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -125,7 +125,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
@@ -124,7 +124,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
}
bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite(
content::BrowserContext* context) {
bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context);
if (!profile) {
return false;
@@ -162,7 +162,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
bool IsGetDisplayMediaSetSelectAllScreensAllowed(
content::BrowserContext* context,
const GURL& url) {
@@ -160,7 +160,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br
bool IsGetAllScreensMediaAllowed(content::BrowserContext* context,
const GURL& url) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context);

8
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
@ -36,9 +36,9 @@
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
g_desktop_capturer_for_testing.Get() = std::move(capturer);
@@ -146,7 +146,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
features::kGetDisplayMediaSetAutoSelectAllScreens)) ||
base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

4
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-03-10 11:01:21 UTC
--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -41,7 +41,7 @@ const char kProduct[] = "Chrome";
@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome";
const char kProduct[] = "Chrome_Mac";
#elif BUILDFLAG(IS_CHROMEOS_ASH)
const char kProduct[] = "Chrome_ChromeOS";

24
www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -66,8 +66,10 @@
@@ -67,8 +67,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -101,7 +103,7 @@
@@ -102,7 +104,7 @@
#include "chromeos/startup/startup_switches.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -21,7 +21,16 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -528,7 +530,7 @@ void RecordStartupMetrics() {
@@ -111,7 +113,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -533,7 +535,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -30,7 +39,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -728,7 +730,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -742,11 +744,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)
@ -39,3 +48,8 @@
pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>();
#endif // BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(
power_metrics::SystemPowerMonitor::GetInstance());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)

4
www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
View File

@ -1,4 +1,4 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
@@ -32,7 +32,7 @@ class PowerMetricsReporter;
class ProcessMonitor;
@ -9,7 +9,7 @@
class PressureMetricsReporter;
#endif // BUILDFLAG(IS_LINUX)
@@ -132,7 +132,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
#endif // !BUILDFLAG(IS_ANDROID)

16
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 2023-06-05 19:39:05 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -178,7 +178,7 @@
@@ -183,7 +183,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -204,7 +204,7 @@
@@ -209,7 +209,7 @@
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
@@ -770,7 +770,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -795,7 +795,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -27,7 +27,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -849,7 +849,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -877,7 +877,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -858,7 +858,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -886,7 +886,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
#if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \
(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -45,7 +45,7 @@
if (base::FeatureList::IsEnabled(
kExtendFamilyLinkUserLogSegmentToAllPlatforms)) {
metrics_service_->RegisterMetricsProvider(
@@ -966,7 +966,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -1002,7 +1002,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -54,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1163,7 +1163,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1201,7 +1201,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

12
www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -93,7 +93,7 @@
@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -456,7 +456,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -27,7 +27,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -503,7 +503,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -36,7 +36,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -553,7 +553,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -45,7 +45,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -582,7 +582,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -570,7 +570,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -54,7 +54,7 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -1004,7 +1004,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
@@ -992,7 +992,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-02-11 09:11:04 UTC
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
@@ -101,7 +101,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
@@ -106,7 +106,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

59
www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
View File

@ -1,13 +1,13 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -204,12 +204,12 @@
@@ -208,12 +208,12 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/idle/action.h"
#include "components/device_signals/core/browser/pref_names.h"
#include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -15,7 +15,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -744,14 +744,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -754,14 +754,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -32,8 +32,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1405,7 +1405,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
@@ -1418,7 +1418,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@ -41,7 +41,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1475,18 +1475,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1488,18 +1488,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -63,7 +63,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1499,7 +1499,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1512,7 +1512,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@ -72,7 +72,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1600,7 +1600,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1613,7 +1613,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -81,7 +81,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1687,13 +1687,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1700,13 +1700,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -97,7 +97,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1724,7 +1724,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1737,7 +1737,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -106,25 +106,34 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1806,7 +1806,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1819,7 +1819,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
@@ -1851,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(ENABLE_PPAPI)
{ key::kBatterySaverModeAvailability,
performance_manager::user_tuning::prefs::kBatterySaverModeState,
base::Value::Type::INTEGER },
@@ -1850,7 +1850,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2103,7 +2103,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -1938,7 +1938,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
handlers->AddHandler(
std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2124,7 +2124,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -133,7 +142,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2160,7 +2160,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2181,7 +2181,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -141,8 +150,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2533,7 +2533,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
@@ -2562,7 +2562,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -151,7 +160,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2541,7 +2541,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2570,7 +2570,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -160,7 +169,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2554,7 +2554,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2583,7 +2583,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));

4
www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/policy/device_management_service_configuration.cc
@@ -21,7 +21,7 @@
@@ -22,7 +22,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \

6
www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/policy/policy_value_and_status_aggregator.cc
@@ -55,7 +55,7 @@
@@ -52,7 +52,7 @@
#include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
@ -9,7 +9,7 @@
#include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -106,7 +106,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
@@ -98,7 +98,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
#else // BUILDFLAG(IS_CHROMEOS_ASH)
policy::CloudPolicyManager* cloud_policy_manager =
profile->GetUserCloudPolicyManager();

35
www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
View File

@ -1,12 +1,12 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -462,13 +462,13 @@
#include "components/os_crypt/sync/os_crypt.h"
@@ -461,13 +461,13 @@
#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 "components/device_signals/core/browser/pref_names.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@ -16,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -501,7 +501,7 @@
@@ -500,7 +500,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -25,7 +25,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -728,7 +728,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
@@ -705,7 +705,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@ -34,7 +34,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -869,7 +869,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
@@ -899,7 +899,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@ -43,7 +43,7 @@
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -984,7 +984,7 @@ void RegisterProfilePrefsForMigration(
@@ -1024,7 +1024,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@ -52,21 +52,22 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1683,11 +1683,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
@@ -1755,12 +1755,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
device_signals::RegisterProfilePrefs(registry);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -1850,7 +1850,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
@@ -1913,7 +1913,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
@ -75,7 +76,7 @@
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1985,7 +1985,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
@@ -2053,7 +2053,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif

12
www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
View File

@ -1,11 +1,11 @@
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -167,7 +167,7 @@ const char* const kPersistentPrefNames[] = {
@@ -165,7 +165,7 @@ const char* const kPersistentPrefNames[] = {
prefs::kShowFullscreenToolbar,
#endif
// TODO(crbug.com/1052397): 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)
// Toggleing custom frames affects all open windows in the profile, hence
// should be written to the regular profile when changed in incognito mode.
prefs::kUseCustomChromeFrame,

11
www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
@ -27,12 +27,3 @@
// No need to update if there were other query with UI clients.
if (HasQueryWithUiClientForRemoteId(remote_id)) {
return absl::nullopt;
@@ -1477,7 +1477,7 @@ template <class... T>
void PrintBackendServiceManager::RunSavedCallbacks(
RemoteSavedCallbacks<T...>& saved_callbacks,
const RemoteId& remote_id,
- std::remove_reference<T>::type... result) {
+ typename std::remove_reference<T>::type... result) {
auto found_callbacks_map = saved_callbacks.find(remote_id);
if (found_callbacks_map == saved_callbacks.end())
return; // No callbacks to run.

11
www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h
View File

@ -1,11 +0,0 @@
--- chrome/browser/printing/print_backend_service_manager.h.orig 2023-06-05 19:39:05 UTC
+++ chrome/browser/printing/print_backend_service_manager.h
@@ -587,7 +587,7 @@ class PrintBackendServiceManager {
template <class... T>
void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
const RemoteId& remote_id,
- std::remove_reference<T>::type... result);
+ typename std::remove_reference<T>::type... result);
// Test support for client ID management.
static void SetClientsForTesting(

15
www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -363,17 +363,17 @@
@@ -364,18 +364,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -8,6 +8,7 @@
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
#include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -21,7 +22,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -543,7 +543,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -545,7 +545,7 @@ void ChromeBrowserMainExtraPartsProfiles::
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
browser_sync::UserEventServiceFactory::GetInstance();
@ -30,7 +31,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
BrowsingDataHistoryObserverService::Factory::GetInstance();
@@ -614,12 +614,12 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -616,12 +616,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
DriveServiceFactory::GetInstance();
#endif
@ -42,10 +43,10 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
enterprise_signals::UserPermissionServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
#endif
@@ -726,12 +726,12 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -729,12 +729,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -60,7 +61,7 @@
enterprise_idle::IdleServiceFactory::GetInstance();
#endif
ModelTypeStoreServiceFactory::GetInstance();
@@ -798,7 +798,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -802,7 +802,7 @@ void ChromeBrowserMainExtraPartsProfiles::
PredictionServiceFactory::GetInstance();
PrimaryAccountPolicyManagerFactory::GetInstance();

8
www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -261,6 +261,10 @@
@@ -260,6 +260,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -609,7 +613,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
@@ -604,7 +608,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else
{
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -20,7 +20,7 @@
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage()
@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -868,7 +872,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

6
www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/renderer_preferences_util.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/renderer_preferences_util.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -36,7 +36,7 @@
#include "ui/views/controls/textfield/textfield.h"
@ -9,7 +9,7 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/linux/linux_ui.h"
@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
#endif
@ -18,7 +18,7 @@
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
if (linux_ui_theme) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
@@ -178,7 +178,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

56
www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
View File

@ -1,38 +1,20 @@
--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
@@ -492,7 +492,7 @@
consent-confirmation autofocus>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -502,7 +502,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -546,7 +546,7 @@
consent-confirmation>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -556,7 +556,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -290,7 +290,7 @@
autofocus="[[isModalDialog_]]">
$i18n{syncConfirmationConfirmLabel}
</cr-button>
- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -300,7 +300,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}

4
www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -18,7 +18,7 @@
#include "net/base/url_util.h"
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
@@ -368,7 +368,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
@@ -383,7 +383,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.

11
www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc Normal file
View File

@ -0,0 +1,11 @@
--- chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoader
net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
std::move(callback_).Run(
- Result(net_error, headers ? absl::optional<int>(headers->response_code())
- : absl::nullopt));
+ Result({net_error, headers ? absl::optional<int>(headers->response_code())
+ : absl::nullopt}));
}

32
www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc Normal file
View File

@ -0,0 +1,32 @@
--- chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc
@@ -51,7 +51,11 @@ void FakeBoundSessionRefreshCookieFetcher::SimulateCom
// Synchronous since tests use `BoundSessionTestCookieManager`.
OnRefreshCookieCompleted(CreateFakeCookie(cookie_expiration.value()));
} else {
+#if defined(__clang__) && (__clang_major__ >= 15)
std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN));
+#else
+ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN}));
+#endif
}
}
@@ -83,9 +87,17 @@ void FakeBoundSessionRefreshCookieFetcher::OnCookieSet
net::CookieAccessResult access_result) {
bool success = access_result.status.IsInclude();
if (!success) {
+#if defined(__clang__) && (__clang_major__ >= 15)
std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN));
+#else
+ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN}));
+#endif
} else {
+#if defined(__clang__) && (__clang_major__ >= 15)
std::move(callback_).Run(Result(net::Error::OK, net::HTTP_OK));
+#else
+ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_OK}));
+#endif
}
// |This| may be destroyed
}

6
www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
@@ -41,7 +41,7 @@
@@ -44,7 +44,7 @@
#include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
#elif BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
@ -9,7 +9,7 @@
#include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
#endif
@@ -61,7 +61,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
@@ -64,7 +64,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
#elif BUILDFLAG(IS_ANDROID)
return std::make_unique<SupervisedUserWebContentHandlerImpl>(
web_contents, frame_id, navigation_id);

4
www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -74,7 +74,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
@@ -257,7 +257,7 @@ SyncServiceFactory::SyncServiceFactory()
@@ -244,7 +244,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ThemeServiceFactory::GetInstance());
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

6
www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/themes/theme_service_factory.cc.orig 2022-10-29 17:50:56 UTC
--- chrome/browser/themes/theme_service_factory.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/themes/theme_service_factory.cc
@@ -23,11 +23,11 @@
@ -14,7 +14,7 @@
#include "ui/linux/linux_ui_factory.h"
#endif
@@ -81,7 +81,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
@@ -86,7 +86,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
@ -23,7 +23,7 @@
using ThemeService = ThemeServiceAuraLinux;
#endif
@@ -95,9 +95,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
@@ -100,9 +100,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

27
www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
View File

@ -1,7 +1,7 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -109,7 +109,7 @@
#include "components/user_manager/user_manager.h"
@@ -118,7 +118,7 @@
#define ENABLED_VLOG_LEVEL 1
#endif
-#if BUILDFLAG(IS_LINUX)
@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -305,7 +305,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -27,7 +27,16 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -1146,7 +1146,7 @@ void BrowserCommandController::InitCommandState() {
@@ -568,7 +568,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -1170,12 +1170,12 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,3 +45,9 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool use_system_title_bar = true;
#if BUILDFLAG(IS_OZONE)
use_system_title_bar = ui::OzonePlatform::GetInstance()

22
www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
View File

@ -1,20 +1,20 @@
--- chrome/browser/ui/browser_view_prefs.cc.orig 2023-01-13 08:56:02 UTC
--- chrome/browser/ui/browser_view_prefs.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/browser_view_prefs.cc
@@ -17,7 +17,7 @@ namespace {
@@ -15,7 +15,7 @@
// TODO(crbug.com/1052397): 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)
namespace {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool GetCustomFramePrefDefault() {
#if BUILDFLAG(IS_OZONE)
return ui::OzonePlatform::GetInstance()
@@ -35,7 +35,7 @@ void RegisterBrowserViewProfilePrefs(
@@ -31,7 +31,7 @@ bool GetCustomFramePrefDefault() {
void RegisterBrowserViewProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
// TODO(crbug.com/1052397): 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)
registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
GetCustomFramePrefDefault());
#endif

4
www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/chrome_pages.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -68,7 +68,7 @@
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -630,7 +630,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -629,7 +629,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

11
www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc Normal file
View File

@ -0,0 +1,11 @@
--- chrome/browser/ui/managed_ui.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/managed_ui.cc
@@ -92,7 +92,7 @@ bool ShouldDisplayManagedByParentUi(Profile* profile)
return false;
#else
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// The EnableManagedByParentUiOnDesktop flag depends on
// EnableSupervisionOnDesktopAndIOS.
CHECK(

8
www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h"
@@ -961,7 +961,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
@@ -1065,7 +1065,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -27,7 +27,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1257,7 +1257,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1232,7 +1232,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
<< "Failed launch with app: couldn't pick a profile";
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);

4
www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -263,7 +263,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
@@ -260,7 +260,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
// at the state of the MessageLoop.
Browser::CreateParams params = Browser::CreateParams(profile_, false);
params.creation_source = Browser::CreationSource::kStartupCreator;

6
www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -208,7 +208,7 @@
@@ -211,7 +211,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h"
@@ -529,12 +529,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -543,12 +543,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \

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

@ -0,0 +1,20 @@
--- chrome/browser/ui/test/popup_browsertest.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/test/popup_browsertest.cc
@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo
const display::Display display = GetDisplayNearestBrowser(popup);
gfx::Rect expected(popup->window()->GetBounds().size());
expected.AdjustToFit(display.work_area());
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1286870) Desktop Linux window bounds are inaccurate.
expected.Outset(50);
EXPECT_TRUE(expected.Contains(popup->window()->GetBounds()))
@@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent
// The popup should be constrained to the opener's available display space.
EXPECT_EQ(display, GetDisplayNearestBrowser(popup));
gfx::Rect work_area(display.work_area());
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1286870) Desktop Linux bounds flakily extend outside the
// work area on trybots, when opening with excessive width and height, e.g.:
// width=${screen.availWidth+300},height=${screen.availHeight+300} yields:

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

@ -0,0 +1,20 @@
--- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/test/test_browser_ui.cc
@@ -22,7 +22,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "ui/base/test/skia_gold_matching_algorithm.h"
#include "ui/compositor/compositor.h"
@@ -34,7 +34,7 @@
// TODO(https://crbug.com/958242) support Mac for pixel tests.
// TODO(crbug.com/1052397): 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))
#define SUPPORTS_PIXEL_TEST
#endif

4
www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/ui_features.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/ui_features.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/ui_features.cc
@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
@@ -298,7 +298,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
"TopChromeWebUIUsesSpareRenderer",
base::FEATURE_ENABLED_BY_DEFAULT);

4
www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/ui_features.h.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/ui_features.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/ui_features.h
@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);

10
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-03-10 11:01:21 UTC
--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -65,11 +65,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -69,11 +69,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
{ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
@ -14,7 +14,7 @@
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
{ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
IDC_MOVE_TAB_PREVIOUS},
@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -101,7 +101,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
{ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
{ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
@ -23,7 +23,7 @@
{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -146,7 +146,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
@ -32,7 +32,7 @@
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
@@ -243,7 +243,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -247,7 +247,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \

10
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -51,7 +51,7 @@
#include "components/user_manager/user_manager.h"
@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#include "ui/linux/linux_ui.h"
#endif
@@ -59,7 +59,7 @@
@@ -63,7 +63,7 @@
namespace {
bool IsUsingLinuxSystemTheme(Profile* profile) {
@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
@@ -298,7 +298,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@@ -303,7 +303,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@ -27,7 +27,7 @@
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
@@ -456,7 +456,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -490,7 +490,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@ -36,7 +36,7 @@
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
@@ -473,7 +473,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -507,7 +507,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;

4
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
@@ -232,7 +232,7 @@ class BrowserFrame : public views::Widget, public view
@@ -233,7 +233,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;

4
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -2001,7 +2001,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -2008,7 +2008,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

26
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -42,7 +42,7 @@
@@ -45,7 +45,7 @@
#include "ui/aura/window.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
@@ -63,7 +63,7 @@ constexpr int kBackToTabImageSize = 16;
@@ -67,7 +67,7 @@ constexpr int kBackToTabImageSize = 16;
// The height of the controls bar at the top of the window.
constexpr int kTopControlsHeight = 30;
@ -18,7 +18,7 @@
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
@@ -153,7 +153,7 @@ class WindowEventObserver : public ui::EventObserver {
@@ -159,7 +159,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@ -27,7 +27,7 @@
// Calculate input bounds for Linux. This is needed because the input bounds
// is not necessary the same as the local bounds on Linux.
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
@@ -350,7 +350,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
@@ -358,7 +358,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
hide_close_button_animation_.set_continuous(false);
hide_close_button_animation_.set_delegate(this);
@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
@@ -480,7 +480,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
@@ -491,7 +491,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@ -45,7 +45,7 @@
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
@@ -525,7 +525,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
@@ -536,7 +536,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -726,7 +726,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
@@ -743,7 +743,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@ -63,7 +63,7 @@
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
@@ -849,7 +849,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
@@ -866,7 +866,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@ -72,16 +72,16 @@
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
@@ -870,7 +870,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
@@ -887,7 +887,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return FrameBorderInsets();
#else
return gfx::Insets(kResizeBorder);
@@ -889,7 +889,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return gfx::Insets(chromeos::kResizeInsideBoundsSize);
@@ -908,7 +908,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
top_height + border_thickness.bottom());
}

6
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/controls/image_view.h"
@ -18,7 +18,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
@@ -163,7 +163,7 @@ class PictureInPictureBrowserFrameView
@@ -164,7 +164,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@ -27,7 +27,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
@@ -227,7 +227,7 @@ class PictureInPictureBrowserFrameView
@@ -239,7 +239,7 @@ class PictureInPictureBrowserFrameView
gfx::MultiAnimation show_close_button_animation_;
gfx::MultiAnimation hide_close_button_animation_;

24
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
View File

@ -1,24 +1,24 @@
--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2023-07-21 09:49:17 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
@@ -23,7 +23,7 @@
@@ -21,7 +21,7 @@
#include "chromeos/ui/frame/desks/move_to_desks_menu_model.h"
#endif
// TODO(crbug.com/1052397): 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)
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#endif
@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
@@ -36,7 +36,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate(
SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
// TODO(crbug.com/1052397): 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)
if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
PrefService* prefs = browser_->profile()->GetPrefs();
return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
@@ -62,7 +62,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
@@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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