kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/ungoogled-chromium: update to 121.0.6167.139

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/dc9e5237-c197-11ee-86bb-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2024-02-03 17:07:19 +01:00
parent a9e0d2d682
commit 52eee8b78d
391 changed files with 2223 additions and 41342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
www/ungoogled-chromium/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 120.0.6099.224
PORTVERSION= 121.0.6167.139
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
@ -37,7 +37,6 @@ BUILD_DEPENDS= bash:shells/bash \
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
libatspi.so:accessibility/at-spi2-core \
libspeechd.so:accessibility/speech-dispatcher \
libsnappy.so:archivers/snappy \
libFLAC.so:audio/flac \
libopus.so:audio/opus \
libspeex.so:audio/speex \
@ -108,7 +107,8 @@ GN_ARGS+= enable_widevine=true \
toolkit_views=true \
use_allocator_shim=false \
use_aura=true \
use_custom_libcxx=false \
use_custom_libcxx=true \
use_custom_libunwind=true \
use_lld=true \
use_partition_alloc=true \
use_partition_alloc_as_malloc=false \
@ -128,6 +128,7 @@ GN_ARGS+= build_with_tflite_lib=false \
clang_use_chrome_plugins=false \
disable_fieldtrial_testing_config=true \
enable_backup_ref_ptr_support=false \
enable_log_error_not_reached=true \
enable_hangout_services_extension=false \
enable_mdns=false \
enable_nacl=false \
@ -242,8 +243,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif
.if ${COMPILER_VERSION} < 160
LLVM_DEFAULT= 16
.if ${COMPILER_VERSION} < 170
LLVM_DEFAULT= 17
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@ -311,7 +312,7 @@ pre-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
./build/linux/unbundle/replace_gn_files.py --system-libraries \
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
libusb libwebp libxml libxslt openh264 opus || ${FALSE}
# Chromium uses an unreleased version of FFmpeg, so configure it
cd ${WRKSRC}/third_party/ffmpeg && \
${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
@ -384,6 +385,7 @@ do-install:
# SwiftShader
.if ${ARCH} != aarch64
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/vk_swiftshader_icd.json ${STAGEDIR}${DATADIR}
.endif
post-install-DEBUG-on:

14
www/ungoogled-chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1705683725
SHA256 (chromium-120.0.6099.224.tar.xz) = 850a85c8d8a01041a07dfaaea8289fa5f8294b4e375e6b77997b61434e0a2f1a
SIZE (chromium-120.0.6099.224.tar.xz) = 3299542904
SHA256 (ungoogled-chromium-120.0.6099.224-1.tar.gz) = b96fd3d5d64ffd5efa3bc52966adfd7fd1dd3e85ebf3517924054b577ac03750
SIZE (ungoogled-chromium-120.0.6099.224-1.tar.gz) = 665887
SHA256 (chromium-120.0.6099.224-testdata.tar.xz) = db8ef8f50dd759f548fd269202f9d084e3d1bb92b587bd5e0023707ac29518ea
SIZE (chromium-120.0.6099.224-testdata.tar.xz) = 268575524
TIMESTAMP = 1706973655
SHA256 (chromium-121.0.6167.139.tar.xz) = e12cc967bef7a79630828792f02d95297a06eb905c98e4c6e065fd5e74d6f9ff
SIZE (chromium-121.0.6167.139.tar.xz) = 3340424948
SHA256 (ungoogled-chromium-121.0.6167.139-1.tar.gz) = a4f389f9159effbbe47a07ade0b8b9b86ebb64a56230ea7a4b43664cd499f829
SIZE (ungoogled-chromium-121.0.6167.139-1.tar.gz) = 666180
SHA256 (chromium-121.0.6167.139-testdata.tar.xz) = ea1431ca694fd314ec542642f1ef5112df737792106dd991edf46eb012732a15
SIZE (chromium-121.0.6167.139-testdata.tar.xz) = 272290844
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

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

@ -1,6 +1,6 @@
--- BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
@@ -62,7 +62,7 @@ declare_args() {
root_extra_deps = []
}
@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -95,7 +95,6 @@ group("gn_all") {
@@ -94,7 +94,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -415,7 +414,7 @@ group("gn_all") {
@@ -417,7 +416,7 @@ group("gn_all") {
}
}
@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -607,6 +606,15 @@ group("gn_all") {
@@ -609,6 +608,15 @@ group("gn_all") {
}
}
@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -656,7 +664,7 @@ group("gn_all") {
@@ -655,7 +663,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)" ]
}
@@ -1077,7 +1085,7 @@ if (use_blink && !is_cronet_build) {
@@ -1076,7 +1084,7 @@ if (use_blink && !is_cronet_build) {
]
}
@ -60,7 +60,7 @@
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1150,7 +1158,7 @@ if (use_blink && !is_cronet_build) {
@@ -1166,7 +1174,7 @@ if (use_blink && !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)" ]
}
@@ -1159,7 +1167,7 @@ if (use_blink && !is_cronet_build) {
@@ -1175,7 +1183,7 @@ if (use_blink && !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)" ]
}
@@ -1624,7 +1632,7 @@ group("chromium_builder_perf") {
@@ -1616,7 +1624,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

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

@ -1,6 +1,6 @@
--- apps/ui/views/app_window_frame_view.cc.orig 2023-12-23 12:33:28 UTC
--- apps/ui/views/app_window_frame_view.cc.orig 2024-02-03 15:42:55 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

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

@ -1,4 +1,4 @@
--- base/BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- base/BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ base/BUILD.gn
@@ -186,7 +186,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"
@@ -1105,11 +1105,23 @@ component("base") {
@@ -1098,11 +1098,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) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1129,7 +1141,7 @@ component("base") {
@@ -1122,7 +1134,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2088,6 +2100,22 @@ component("base") {
@@ -2077,6 +2089,22 @@ component("base") {
]
}
@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2220,6 +2248,29 @@ component("base") {
@@ -2207,6 +2235,29 @@ component("base") {
}
}
@ -96,7 +96,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2230,7 +2281,7 @@ component("base") {
@@ -2217,7 +2268,7 @@ component("base") {
}
if (dep_libevent) {
@ -105,7 +105,7 @@
}
if (use_libevent) {
@@ -3619,7 +3670,7 @@ test("base_unittests") {
@@ -3615,7 +3666,7 @@ test("base_unittests") {
]
}
@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3640,7 +3691,7 @@ test("base_unittests") {
@@ -3637,7 +3688,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",
@@ -3651,7 +3702,7 @@ test("base_unittests") {
@@ -3648,7 +3699,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3913,7 +3964,7 @@ test("base_unittests") {
@@ -3909,7 +3960,7 @@ test("base_unittests") {
}
}

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-11-04 07:08:51 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-02-03 15:42:55 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -319,7 +319,7 @@ declare_args() {
@@ -333,7 +333,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.

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

@ -1,11 +1,11 @@
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -582,7 +582,7 @@ source_set("allocator_shim") {
]
configs += [ ":mac_no_default_new_delete_symbols" ]
@@ -855,7 +855,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
}
- if (is_chromeos || is_linux) {
+ if ((is_chromeos || is_linux) && !is_bsd) {
sources += [
shim_headers += [
"shim/allocator_shim_override_cpp_symbols.h",
"shim/allocator_shim_override_glibc_weak_symbols.h",

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

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-12-23 12:33:28 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-02-03 15:42:55 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
@@ -12,11 +12,11 @@
#include <string.h>
@ -11,10 +11,10 @@
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
#define HAVE_DLADDR
#include <dlfcn.h>
#endif
@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
@@ -24,7 +24,7 @@ namespace partition_alloc::internal::base::debug {
namespace {
@ -23,7 +23,7 @@
constexpr size_t kBufferSize = 4096u;
@@ -359,7 +359,7 @@ void PrintStackTraceInternal(const void** trace, size_
@@ -358,7 +358,7 @@ void PrintStackTraceInternal(const void** trace, size_
}
#endif // !BUILDFLAG(IS_APPLE)

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

@ -1,8 +1,8 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2023-12-23 12:33:28 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-02-03 15:42:55 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
@@ -17,7 +17,7 @@
#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
#include "build/build_config.h"
#include "partition_alloc/partition_alloc_base/logging.h"
#include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)

27
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
View file

@ -1,15 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2023-12-23 12:33:28 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-02-03 15:42:55 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
@@ -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() \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD))
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -241,7 +241,7 @@ constexpr bool kUseLazyCommit = false;
@@ -255,7 +255,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,12 +9,12 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -288,7 +288,7 @@ constexpr bool kUseLazyCommit = false;
@@ -301,7 +301,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() \
- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)))
+ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD))
// Enable shadow metadata.
//
-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1
#else
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2023-12-23 12:33:28 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-02-03 15:42:55 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
@@ -107,7 +107,7 @@ PartitionPageShift() {
@@ -111,7 +111,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
@ -9,7 +9,7 @@
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -309,7 +309,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
@@ -313,7 +313,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) || \

8
www/ungoogled-chromium/files/patch-base_compiler__specific.h
View file

@ -1,4 +1,4 @@
--- base/compiler_specific.h.orig 2023-05-05 12:12:41 UTC
--- base/compiler_specific.h.orig 2024-02-03 15:42:55 UTC
+++ base/compiler_specific.h
@@ -41,9 +41,9 @@
// Annotate a function indicating it should not be inlined.
@ -12,8 +12,8 @@
#define NOINLINE __attribute__((noinline))
#elif defined(COMPILER_MSVC)
#define NOINLINE __declspec(noinline)
@@ -51,9 +51,9 @@
#define NOINLINE
@@ -60,9 +60,9 @@
#define NOOPT
#endif
-#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
@ -24,7 +24,7 @@
#define ALWAYS_INLINE inline __attribute__((__always_inline__))
#elif defined(COMPILER_MSVC) && defined(NDEBUG)
#define ALWAYS_INLINE __forceinline
@@ -69,7 +69,7 @@
@@ -78,7 +78,7 @@
// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
// Use like:
// NOT_TAIL_CALLED void FooBar();

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

@ -1,6 +1,6 @@
--- base/files/file_path_watcher.h.orig 2023-02-11 09:11:04 UTC
--- base/files/file_path_watcher.h.orig 2024-02-03 15:42:55 UTC
+++ base/files/file_path_watcher.h
@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher {
@@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher {
Type type = Type::kNonRecursive;
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

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-12-23 12:33:28 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2024-02-03 15:42:55 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -703,7 +703,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
@@ -836,7 +836,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
}
delegate.RunUntilEventsMatch(event_expecter);
@ -9,7 +9,7 @@
ASSERT_TRUE(WriteFile(file1, "content v2"));
// Mac implementation does not detect files modified in a directory.
// TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
@@ -1639,7 +1639,7 @@ namespace {
@@ -1772,7 +1772,7 @@ namespace {
enum Permission { Read, Write, Execute };
@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
@@ -1673,7 +1673,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
@@ -1806,7 +1806,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
} // namespace

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

@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig 2023-11-04 07:08:51 UTC
--- base/files/file_util_posix.cc.orig 2024-02-03 15:42:55 UTC
+++ base/files/file_util_posix.cc
@@ -756,33 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -772,33 +772,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().

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

@ -1,4 +1,4 @@
--- base/logging_unittest.cc.orig 2023-02-11 09:11:04 UTC
--- base/logging_unittest.cc.orig 2024-02-03 15:42:55 UTC
+++ base/logging_unittest.cc
@@ -32,7 +32,7 @@
#include "base/posix/eintr_wrapper.h"
@ -9,7 +9,7 @@
#include <ucontext.h>
#endif
@@ -575,14 +575,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
@@ -570,14 +570,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
// need the arch-specific boilerplate below, which is inspired by breakpad.
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
uintptr_t crash_addr = 0;

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

@ -1,6 +1,6 @@
--- base/native_library_unittest.cc.orig 2022-10-29 17:50:56 UTC
--- base/native_library_unittest.cc.orig 2024-02-03 15:42:55 UTC
+++ base/native_library_unittest.cc
@@ -134,7 +134,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
// versions with respect to symbol resolution scope.
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
#if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \

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

@ -1,6 +1,6 @@
--- base/process/memory_linux.cc.orig 2023-02-11 09:11:04 UTC
--- base/process/memory_linux.cc.orig 2024-02-03 15:42:55 UTC
+++ base/process/memory_linux.cc
@@ -20,6 +20,7 @@
@@ -28,6 +28,7 @@ void __libc_free(void*);
namespace base {
@ -8,7 +8,7 @@
namespace {
void ReleaseReservationOrTerminate() {
@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() {
@@ -37,12 +38,14 @@ void ReleaseReservationOrTerminate() {
}
} // namespace
@ -23,7 +23,7 @@
// Set the new-out of memory handler.
std::set_new_handler(&ReleaseReservationOrTerminate);
// If we're using glibc's allocator, the above functions will override
@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() {
@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() {
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
allocator_shim::SetCallNewHandlerOnMallocFailure(true);
#endif
@ -34,7 +34,7 @@
// ScopedAllowBlocking() has private constructor and it can only be used in
// friend classes/functions. Declaring a class is easier in this situation to
// avoid adding more dependency to thread_restrictions.h because of the
@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
bool AdjustOOMScore(ProcessId process, int score) {
return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
}

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

@ -1,6 +1,6 @@
--- base/process/process_handle.h.orig 2022-10-01 07:40:07 UTC
--- base/process/process_handle.h.orig 2024-02-03 15:42:55 UTC
+++ base/process/process_handle.h
@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
@@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
// processes may be reused.
BASE_EXPORT UniqueProcId GetUniqueIdForProcess();

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

@ -1,6 +1,6 @@
--- base/rand_util.h.orig 2023-12-23 12:33:28 UTC
--- base/rand_util.h.orig 2024-02-03 15:42:55 UTC
+++ base/rand_util.h
@@ -136,7 +136,7 @@ void RandomShuffle(Itr first, Itr last) {
@@ -146,7 +146,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}

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

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2023-12-23 12:33:28 UTC
--- base/system/sys_info.h.orig 2024-02-03 15:42:55 UTC
+++ base/system/sys_info.h
@@ -321,6 +321,8 @@ class BASE_EXPORT SysInfo {
@@ -318,6 +318,8 @@ class BASE_EXPORT SysInfo {
static void ResetCpuSecurityMitigationsEnabledForTesting();
#endif
@ -9,7 +9,7 @@
private:
friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
@@ -333,7 +335,7 @@ class BASE_EXPORT SysInfo {
@@ -330,7 +332,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_test_launcher_test__launcher.cc
View file

@ -1,6 +1,6 @@
--- base/test/launcher/test_launcher.cc.orig 2023-11-04 07:08:51 UTC
--- base/test/launcher/test_launcher.cc.orig 2024-02-03 15:42:55 UTC
+++ base/test/launcher/test_launcher.cc
@@ -70,6 +70,7 @@
@@ -69,6 +69,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_POSIX)

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

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- build/config/compiler/BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ build/config/compiler/BUILD.gn
@@ -202,7 +202,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
@ -56,7 +56,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
@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") {
@@ -1175,7 +1182,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" ]
@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") {
@@ -1190,7 +1197,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" ]
@@ -1523,7 +1530,7 @@ config("compiler_deterministic") {
@@ -1525,7 +1532,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",
@@ -1575,7 +1582,7 @@ config("compiler_deterministic") {
@@ -1577,7 +1584,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -92,7 +92,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1860,7 +1867,7 @@ config("default_warnings") {
@@ -1862,7 +1869,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -101,7 +101,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -2066,7 +2073,7 @@ config("no_chromium_code") {
@@ -2065,7 +2072,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",
@@ -2595,7 +2602,7 @@ config("afdo_optimize_size") {
@@ -2594,7 +2601,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.
@@ -2622,7 +2629,7 @@ config("afdo") {
@@ -2621,7 +2628,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -128,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2786,7 +2793,8 @@ config("symbols") {
@@ -2785,7 +2792,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

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

@ -1,25 +0,0 @@
--- build/config/linux/atspi2/BUILD.gn.orig 2023-11-04 07:08:51 UTC
+++ build/config/linux/atspi2/BUILD.gn
@@ -21,10 +21,21 @@ if (use_atk) {
minor = atspi_version[1]
micro = atspi_version[2]
+ # These aren't necessarily used if atspi is not old enough to require them.
+ # Also, gn considers variables unused if the only use of them is
+ # short-circuited away, so for example if major == 2 and minor == 48, micro
+ # would be unused.
+ not_needed([
+ "major",
+ "minor",
+ "micro",
+ ])
+
# ATSPI 2.49.90 now defines these for us and it's an error for us to
# redefine them on the compiler command line.
# See ATSPI 927344a34cd5bf81fc64da4968241735ecb4f03b
- if (minor < 49 || (minor == 49 && micro < 90)) {
+ if (major < 2 || (major == 2 && minor < 49) ||
+ (major == 2 && minor == 49 && micro < 90)) {
defines = [
"ATSPI_MAJOR_VERSION=$major",
"ATSPI_MINOR_VERSION=$minor",

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

@ -1,4 +1,4 @@
--- cc/BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- cc/BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ cc/BUILD.gn
@@ -676,7 +676,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
if (skia_use_dawn) {
@@ -931,7 +931,6 @@ cc_test("cc_unittests") {
@@ -935,7 +935,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

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

@ -1,6 +1,6 @@
--- cc/base/features.cc.orig 2023-11-04 07:08:51 UTC
--- cc/base/features.cc.orig 2024-02-03 15:42:55 UTC
+++ cc/base/features.cc
@@ -84,7 +84,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
@@ -88,7 +88,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
// be using a separate flag to control the launch on GL.
BASE_FEATURE(kUseDMSAAForTiles,
"UseDMSAAForTiles",

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-12-23 12:33:28 UTC
--- chrome/app/app_management_strings.grdp.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/app_management_strings.grdp
@@ -194,7 +194,7 @@
@@ -197,7 +197,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>

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

@ -1,4 +1,4 @@
--- chrome/app/chrome_main.cc.orig 2023-11-04 07:08:51 UTC
--- chrome/app/chrome_main.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/chrome_main.cc
@@ -29,11 +29,11 @@
#include "chrome/app/notification_metrics.h"
@ -14,7 +14,16 @@
#include "chrome/app/chrome_main_linux.h"
#endif
@@ -138,7 +138,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -81,7 +81,7 @@ int ChromeMain(int argc, const char** argv) {
#error Unknown platform.
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
PossiblyDetermineFallbackChromeChannel(argv[0]);
#endif
@@ -142,7 +142,7 @@ int ChromeMain(int argc, const char** argv) {
SetUpBundleOverrides();
#endif
@ -23,7 +32,7 @@
AppendExtraArgumentsToCommandLine(command_line);
#endif
@@ -167,7 +167,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -171,7 +171,7 @@ int ChromeMain(int argc, const char** argv) {
headless_mode_handle = headless::InitHeadlessMode();
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

24
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-12-23 12:33:28 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -145,7 +145,7 @@
@@ -146,7 +146,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
@@ -189,16 +189,16 @@
@@ -190,16 +190,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
@@ -337,7 +337,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -338,7 +338,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
@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -423,7 +423,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) ||
@@ -600,7 +600,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -601,7 +601,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.
@@ -690,7 +690,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -691,7 +691,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -1044,7 +1044,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
@@ -1048,7 +1048,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
@ -74,7 +74,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1196,7 +1196,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1200,7 +1200,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
@@ -1226,7 +1226,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1230,7 +1230,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1637,7 +1637,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1641,7 +1641,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)) {
@@ -1746,7 +1746,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1750,7 +1750,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.

8
www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/chromium_strings.grd.orig 2023-12-23 12:33:28 UTC
--- chrome/app/chromium_strings.grd.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/chromium_strings.grd
@@ -315,7 +315,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
@ -9,7 +9,7 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Chromium
</message>
@@ -465,7 +465,7 @@ If you update this file, be sure also to update google
@@ -483,7 +483,7 @@ If you update this file, be sure also to update google
To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
</message>
</if>
@ -18,7 +18,7 @@
<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>
@@ -892,7 +892,7 @@ Permissions you've already given to websites and apps
@@ -920,7 +920,7 @@ Permissions you've already given to websites and apps
</message>
</if>
@ -27,7 +27,7 @@
<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>
@@ -1277,7 +1277,7 @@ Permissions you've already given to websites and apps
@@ -1299,7 +1299,7 @@ Permissions you've already given to websites and apps
</message>
</if>

20
www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-12-23 12:33:28 UTC
--- chrome/app/generated_resources.grd.orig 2024-02-03 15:42:55 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.
-->
@@ -3609,7 +3609,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3665,7 +3665,7 @@ are declared in tools/grit/grit_rule.gni.
</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>
@@ -5494,7 +5494,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -5553,7 +5553,7 @@ are declared in tools/grit/grit_rule.gni.
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>
@@ -6207,7 +6207,7 @@ Keep your key file in a safe place. You will need it t
@@ -6284,7 +6284,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>
@@ -6253,7 +6253,7 @@ Keep your key file in a safe place. You will need it t
@@ -6330,7 +6330,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,7 @@
<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>
@@ -10611,7 +10611,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10956,7 +10956,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>
@ -54,7 +54,7 @@
<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>
@@ -10958,7 +10958,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -11303,7 +11303,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -63,7 +63,7 @@
<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>
@@ -11956,7 +11956,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -12301,7 +12301,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>
<!-- Device Trust Consent dialog -->
@ -72,7 +72,7 @@
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share information about your device?
</message>
@@ -12364,7 +12364,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12709,7 +12709,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -14571,7 +14571,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -14940,7 +14940,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

6
www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/google_chrome_strings.grd.orig 2023-12-23 12:33:28 UTC
--- chrome/app/google_chrome_strings.grd.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
@ -18,7 +18,7 @@
<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>
@@ -877,7 +877,7 @@ Permissions you've already given to websites and apps
@@ -887,7 +887,7 @@ Permissions you've already given to websites and apps
</if>
</if>
@ -27,7 +27,7 @@
<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
@@ -1302,7 +1302,7 @@ Permissions you've already given to websites and apps
@@ -1306,7 +1306,7 @@ Permissions you've already given to websites and apps
</message>
</if>

39
www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
View file

@ -1,29 +1,20 @@
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-12-23 12:33:28 UTC
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
@@ -14,7 +14,7 @@
</outputs>
<release seq="1">
<includes>
<if expr="_google_chrome">
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<include name="IDR_PRODUCT_LOGO_64" file="${branding_path_component}/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="${branding_path_component}/linux/product_logo_128.png" type="BINDATA" />
@@ -40,7 +40,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_SVG" file="${branding_path_component}/chrome_logo.svg" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_ANIMATION_SVG" file="${branding_path_component}/chrome_logo_animation.svg" type="BINDATA" />
- <if expr="is_linux">
+ <if expr="is_posix">
<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" />
@@ -63,7 +63,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
- <if expr="is_linux">
+ <if expr="is_posix">
<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" />
@@ -77,7 +77,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128_BETA" file="${branding_path_component}/linux/product_logo_128_beta.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128_DEV" file="${branding_path_component}/linux/product_logo_128_dev.png" type="BINDATA" />
</if>

69
www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd
View file

@ -1,59 +1,46 @@
--- chrome/app/theme/theme_resources.grd.orig 2023-10-13 13:20:35 UTC
--- chrome/app/theme/theme_resources.grd.orig 2024-02-03 15:42:55 UTC
+++ chrome/app/theme/theme_resources.grd
@@ -146,14 +146,14 @@
@@ -153,14 +153,14 @@
</if>
<if expr="_google_chrome">
<then>
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/linux/product_logo_32_dev.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/linux/product_logo_32.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="${branding_path_component}/linux/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="${branding_path_component}/linux/product_logo_32_dev.png" />
</then>
- <else> <!-- not is_linux -->
+ <else> <!-- not is_posix -->
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
@@ -161,7 +161,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/product_logo_32.png" />
@@ -168,7 +168,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="${branding_path_component}/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="${branding_path_component}/product_logo_32_dev.png" />
</else>
- </if> <!-- is_linux -->
+ </if> <!-- is_posix -->
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="${branding_path_component}/product_logo_32_canary.png" />
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
@@ -173,7 +173,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="${branding_path_component}/product_logo_name_22.png" />
@@ -178,7 +178,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="${branding_path_component}/product_logo_enterprise_white.png" />
</then>
<else> <!-- not _google_chrome -->
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/linux/product_logo_32.png" />
@@ -187,7 +187,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/product_logo_32.png" />
</else>
- </if> <!-- is_linux -->
+ </if> <!-- is_posix -->
<if expr="_is_chrome_for_testing_branded">
<then>
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" />
@@ -182,10 +182,10 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" />
</else>
- </if> <!-- is_linux -->
+ </if> <!-- is_posix -->
</then>
<else> <!-- not _is_chrome_for_testing_branded -->
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
@@ -194,7 +194,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
</else>
- </if> <!-- is_linux -->
+ </if> <!-- is_posix -->
</else>
</if> <!-- _is_chrome_for_testing_branded -->
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />

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

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2024-01-17 09:38:09 UTC
--- chrome/browser/BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/BUILD.gn
@@ -6526,6 +6526,13 @@ static_library("browser") {
@@ -6515,6 +6515,13 @@ static_library("browser") {
}
}

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

@ -1,4 +1,4 @@
--- chrome/browser/about_flags.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/about_flags.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/about_flags.cc
@@ -232,7 +232,7 @@
#include "ui/ui_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -331,7 +331,7 @@
@@ -330,7 +330,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)
@@ -345,7 +345,7 @@
@@ -344,7 +344,7 @@
#include "chrome/browser/win/titlebar_config.h"
#endif
@ -27,7 +27,7 @@
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -475,7 +475,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -482,7 +482,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -36,16 +36,34 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1464,7 +1464,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
@@ -1452,7 +1452,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
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 kShortcutBoostSearchAndUrl1414[] = {
{"ShortcutBoostSearchScore", "1414"},
{"ShortcutBoostUrlScore", "1414"}};
@@ -5304,13 +5304,13 @@ const FeatureEntry kFeatureEntries[] = {
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"},
@@ -3935,7 +3935,7 @@ const flags_ui::FeatureEntry::FeatureVariation
std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
};
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
const flags_ui::FeatureEntry::FeatureParam
@@ -4684,7 +4684,7 @@ const FeatureEntry kFeatureEntries[] = {
"DXGIWaitableSwapChain"),
},
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -5228,13 +5228,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -61,8 +79,8 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5621,7 +5621,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kFeedSportsCard)},
@@ -5548,7 +5548,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kRefreshFeedOnRestart)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@ -70,7 +88,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -6260,7 +6260,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6201,7 +6201,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -79,7 +97,7 @@
{"omnibox-actions-ui-simplification",
flag_descriptions::kOmniboxActionsUISimplificationName,
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
@@ -7096,7 +7096,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7056,7 +7056,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@ -88,7 +106,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -8131,7 +8131,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8075,7 +8075,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -97,7 +115,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -8156,7 +8156,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8100,7 +8100,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
@ -106,7 +124,7 @@
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -8826,7 +8826,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8750,7 +8750,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -115,7 +133,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -9097,7 +9097,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9024,7 +9024,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -124,7 +142,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -9139,7 +9139,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9066,7 +9066,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -133,25 +151,25 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9697,7 +9697,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9657,7 +9657,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
@@ -10804,7 +10804,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10781,7 +10781,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia),
@@ -10986,7 +10986,7 @@ const FeatureEntry kFeatureEntries[] = {
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10947,7 +10947,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
#endif
@ -160,21 +178,12 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -11300,7 +11300,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop, FEATURE_VALUE_TYPE(blink::features::kPasswordStrongLabel)},
#endif
@@ -11338,7 +11338,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kAutofillEnableCardBenefitsDescription, kOsAll,
FEATURE_VALUE_TYPE(autofill::features::kAutofillEnableCardBenefits)},
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"attach-logs-to-autofill-rater-extentsion-report",
flag_descriptions::kAttachLogsToAutofillRaterExtensionReportName,
flag_descriptions::kAttachLogsToAutofillRaterExtensionReportDescription,
@@ -11309,7 +11309,7 @@ const FeatureEntry kFeatureEntries[] = {
kAttachLogsToAutofillRaterExtensionReport)},
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"fill-multi-line", flag_descriptions::kFillMultiLineName,
flag_descriptions::kFillMultiLineDescription, kOsWin | kOsLinux | kOsMac,
FEATURE_VALUE_TYPE(compose::features::kFillMultiLine)},
{flag_descriptions::kAutofillContentEditablesId,
flag_descriptions::kAutofillContentEditablesName,
flag_descriptions::kAutofillContentEditablesDescription,

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

@ -0,0 +1,11 @@
--- chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/accessibility/pdf_ocr_controller.cc
@@ -86,7 +86,7 @@ void AnnounceToScreenReader(const int message_id) {
// TODO(crbug.com/1442928): Sending announcements results in a failure in
// `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and
// flaky fail when running Chrome.
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
const Browser* browser = BrowserList::GetInstance()->GetLastActive();
if (!browser) {
VLOG(2) << "Browser is not ready to announce";

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

@ -1,6 +1,6 @@
--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/apps/app_service/publishers/extension_apps.cc
@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default;
@@ -24,7 +24,7 @@ ExtensionApps::~ExtensionApps() = default;
bool ExtensionApps::Accepts(const extensions::Extension* extension) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/browser_features.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/browser_features.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/browser_features.cc
@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache,
BASE_FEATURE(kDestroyProfileOnBrowserClose,
@ -9,12 +9,12 @@
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -292,7 +292,7 @@ BASE_FEATURE(kOmniboxTriggerForNoStatePrefetch,
"OmniboxTriggerForNoStatePrefetch",
base::FEATURE_DISABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
BASE_FEATURE(kPayloadTestComponent,
"PayloadTestComponent",
@@ -286,7 +286,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2,
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
"SupportSearchSuggestionForPrerender2",
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);

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

@ -1,11 +0,0 @@
--- chrome/browser/browser_features.h.orig 2023-12-23 12:33:28 UTC
+++ chrome/browser/browser_features.h
@@ -121,7 +121,7 @@ BASE_DECLARE_FEATURE(kAutocompleteActionPredictorConfi
BASE_DECLARE_FEATURE(kOmniboxTriggerForNoStatePrefetch);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
BASE_DECLARE_FEATURE(kPayloadTestComponent);
#endif

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

@ -1,4 +1,4 @@
--- chrome/browser/browser_process_impl.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/browser_process_impl.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -218,7 +218,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1217,7 +1217,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1224,7 +1224,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1462,7 +1462,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1470,7 +1470,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-12-23 12:33:28 UTC
--- chrome/browser/browser_process_impl.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/browser_process_impl.h
@@ -384,7 +384,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -386,7 +386,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

20
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-12-23 12:33:28 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -130,13 +130,13 @@
@@ -126,13 +126,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,16 +16,16 @@
#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
@@ -224,7 +224,7 @@
@@ -218,7 +218,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/companion/visual_search/visual_search_suggestions_service_factory.h"
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
@@ -863,7 +863,7 @@ void BindScreen2xMainContentExtractor(
@@ -862,7 +862,7 @@ void BindScreen2xMainContentExtractor(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -34,7 +34,7 @@
void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<
@@ -1009,7 +1009,7 @@ void PopulateChromeFrameBinders(
@@ -1004,7 +1004,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -43,7 +43,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -1017,7 +1017,7 @@ void PopulateChromeFrameBinders(
@@ -1012,7 +1012,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -52,7 +52,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
@@ -1097,7 +1097,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1094,7 +1094,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +61,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1118,7 +1118,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1115,7 +1115,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -70,7 +70,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1651,7 +1651,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1653,7 +1653,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2024-01-17 09:38:09 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -246,11 +246,11 @@
@@ -247,11 +247,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
@@ -284,14 +284,14 @@
@@ -285,14 +285,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) || \
@ -31,7 +31,24 @@
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
@@ -1039,7 +1039,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -354,14 +354,14 @@
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "sql/database.h"
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
namespace {
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -40,7 +57,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 .
@@ -1095,7 +1095,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1124,7 +1124,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) || \
@ -49,7 +66,16 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1331,7 +1331,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1323,7 +1323,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Delete the media history database if it still exists.
// TODO(crbug.com/1198344): Remove this.
base::ThreadPool::PostTask(
@@ -1372,7 +1372,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -58,7 +84,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1437,7 +1437,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1478,7 +1478,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
@ -67,7 +93,7 @@
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
@@ -1969,7 +1969,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -2008,7 +2008,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.

34
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-12-23 12:33:28 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -446,7 +446,7 @@
@@ -458,7 +458,7 @@
#include "storage/browser/file_system/external_mount_points.h"
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#elif BUILDFLAG(IS_ANDROID)
@@ -547,12 +547,12 @@
@@ -561,12 +561,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -563,14 +563,14 @@
@@ -577,14 +577,14 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.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)
@@ -586,7 +586,7 @@
@@ -600,7 +600,7 @@
#include "components/lens/lens_features.h"
#endif
@ -50,7 +50,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1566,7 +1566,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1535,7 +1535,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
registry->RegisterBooleanPref(
policy::policy_prefs::kPPAPISharedImagesForVideoDecoderAllowed, true);
@ -59,7 +59,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1690,7 +1690,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1659,7 +1659,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -68,7 +68,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1696,7 +1696,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.
@ -77,7 +77,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1717,7 +1717,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -86,7 +86,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1767,7 +1767,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -95,7 +95,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2601,6 +2601,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2574,6 +2574,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#if(0)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -104,7 +104,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2966,7 +2968,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2915,7 +2917,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -113,7 +113,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4637,7 +4639,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4597,7 +4599,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5192,7 +5194,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5160,7 +5162,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -131,7 +131,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5202,7 +5204,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5170,7 +5172,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -140,7 +140,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5233,7 +5235,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5201,7 +5203,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -149,7 +149,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7101,7 +7103,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7105,7 +7107,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -484,7 +484,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -495,7 +495,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

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

@ -1,11 +0,0 @@
--- chrome/browser/component_updater/registration.cc.orig 2023-12-23 12:33:28 UTC
+++ chrome/browser/component_updater/registration.cc
@@ -223,7 +223,7 @@ void RegisterComponentsForUpdate() {
RegisterTpcdMetadataComponent(cus);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1490685): Remove this test component once the
// experiment has concluded.
if (base::FeatureList::IsEnabled(features::kPayloadTestComponent)) {

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

@ -0,0 +1,19 @@
--- chrome/browser/compose/chrome_compose_client.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/compose/chrome_compose_client.cc
@@ -170,14 +170,14 @@ void ChromeComposeClient::CloseUI(compose::mojom::Clos
void ChromeComposeClient::ApproveConsent() {
pref_service_->SetBoolean(
unified_consent::prefs::kPageContentCollectionEnabled, true);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
pref_service_->SetBoolean(prefs::kPrefHasAcceptedComposeConsent, true);
#endif
UpdateAllSessionsWithConsentApproved();
}
void ChromeComposeClient::AcknowledgeConsentDisclaimer() {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
pref_service_->SetBoolean(prefs::kPrefHasAcceptedComposeConsent, true);
#endif
UpdateAllSessionsWithConsentApproved();

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

@ -1,6 +1,6 @@
--- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2023-11-04 07:08:51 UTC
--- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/content_settings/one_time_permission_provider.cc
@@ -226,8 +226,13 @@ void OneTimePermissionProvider::OnSuspend() {
@@ -231,8 +231,13 @@ void OneTimePermissionProvider::OnSuspend() {
while (rule_iterator && rule_iterator->HasNext()) {
auto rule = rule_iterator->Next();
@ -14,7 +14,7 @@
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
setting_type,
permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
@@ -329,8 +334,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG
@@ -334,8 +339,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG
auto rule = rule_iterator->Next();
if (rule->primary_pattern.Matches(origin_gurl) &&
rule->secondary_pattern.Matches(origin_gurl)) {

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-12-23 12:33:28 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1594,7 +1594,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1604,7 +1604,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();
}
@@ -1660,7 +1660,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1670,7 +1670,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) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/download/download_item_model.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -752,7 +752,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -753,7 +753,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
@@ -798,7 +798,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -799,7 +799,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1078,7 +1078,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1079,7 +1079,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

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

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/download/download_prefs.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -181,7 +186,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
@@ -179,7 +184,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -303,7 +308,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -301,7 +306,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -463,7 +468,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -461,7 +466,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -495,7 +500,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -493,7 +498,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -526,7 +531,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -524,7 +529,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -650,7 +655,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -648,7 +653,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.

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

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2023-10-13 13:20:35 UTC
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
@@ -143,7 +143,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
const char* verification_key = kKeyWindowsVerification;
#elif BUILDFLAG(IS_MAC)
const char* verification_key = kKeyMacVerification;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1366,6 +1366,10 @@ static_library("extensions") {
@@ -1371,6 +1371,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

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

@ -1,15 +1,15 @@
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -43,7 +43,7 @@
#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
@@ -44,7 +44,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "printing/buildflags/buildflags.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
@@ -118,7 +118,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
@@ -126,7 +126,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SidePanelService::GetFactoryInstance();

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

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
@@ -24,7 +24,7 @@
#include "base/win/registry.h"
@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() {
@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDir() {
bool got_path = false;
#if BUILDFLAG(IS_WIN)
got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
@ -18,7 +18,7 @@
std::unique_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() {
@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDir() {
if (!got_path)
return path;

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

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@
#include "components/reporting/util/statusor.h"
@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
@@ -593,7 +593,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
@@ -592,7 +592,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif

4
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-12-23 12:33:28 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -601,7 +601,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
@@ -597,7 +597,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

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

@ -1,20 +1,20 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-11-04 07:08:51 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
settings_api::PrefType::kBoolean;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
settings_api::PrefType::kBoolean;
#endif
@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;
@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// Appearance settings.
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kSystemTheme] =
settings_api::PrefType::PREF_TYPE_NUMBER;
(*s_allowlist)[::prefs::kSystemTheme] = settings_api::PrefType::kNumber;
#endif
(*s_allowlist)[::prefs::kHomePage] = settings_api::PrefType::kUrl;

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

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -29,7 +29,7 @@
#include "extensions/browser/process_manager.h"
@ -18,7 +18,7 @@
if (extension) {
enabled_by_permissions =
extension->permissions_data()->active_permissions().HasAPIPermission(
@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
@@ -576,7 +576,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
ExtensionFunction::ResponseAction
WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-11-04 07:08:51 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -907,7 +907,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
@@ -892,7 +892,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
RequestExtensionApproval(contents);
return;
}

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

@ -1,6 +1,6 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -321,7 +321,7 @@ const struct {
@@ -323,7 +323,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/flag_descriptions.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -7255,7 +7255,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
@@ -7424,7 +7424,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -9,7 +9,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7494,7 +7494,7 @@ const char kSearchWebInSidePanelDescription[] =
@@ -7664,7 +7664,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -7503,7 +7503,7 @@ const char kQuickCommandsDescription[] =
@@ -7673,7 +7673,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,7 +27,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7518,7 +7518,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
@@ -7688,7 +7688,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@ -36,7 +36,7 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7542,7 +7542,7 @@ const char kWebShareDescription[] =
@@ -7712,7 +7712,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -45,7 +45,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7562,7 +7562,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7732,7 +7732,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -54,7 +54,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7576,7 +7576,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -7746,7 +7746,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -63,7 +63,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7675,7 +7675,7 @@ const char kElasticOverscrollDescription[] =
@@ -7852,7 +7852,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -72,9 +72,9 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7721,7 +7721,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
"any one time. Requires #enable-media-session-service to be enabled too.";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -7904,7 +7904,7 @@ const char kComposeName[] = "CCO Edits";
const char kComposeDescription[] = "Enables CCO editing feature";
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/flag_descriptions.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/flag_descriptions.h
@@ -4172,7 +4172,7 @@ extern const char kLacrosMergeIcuDataFileName[];
@@ -4260,7 +4260,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -9,7 +9,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4312,14 +4312,14 @@ extern const char kSearchWebInSidePanelDescription[];
@@ -4400,14 +4400,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -26,7 +26,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -4329,7 +4329,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4417,7 +4417,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -35,7 +35,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4339,7 +4339,7 @@ extern const char kOzonePlatformHintName[];
@@ -4427,7 +4427,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -44,7 +44,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4347,13 +4347,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -4435,13 +4435,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -60,7 +60,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4364,7 +4364,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
@@ -4452,7 +4452,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -69,7 +69,7 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4441,7 +4441,7 @@ extern const char kElasticOverscrollDescription[];
@@ -4534,7 +4534,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -78,9 +78,9 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4471,7 +4471,7 @@ extern const char kEnableAudioFocusEnforcementName[];
extern const char kEnableAudioFocusEnforcementDescription[];
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -4570,7 +4570,7 @@ extern const char kComposeName[];
extern const char kComposeDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)

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

@ -1,6 +1,6 @@
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/media_galleries/media_file_system_registry.cc
@@ -586,7 +586,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
// Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry()
: file_system_context_(new MediaFileSystemContextImpl) {

11
www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
View file

@ -1,11 +0,0 @@
--- 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
@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome";
const char kProduct[] = "Chrome_Mac";
#elif BUILDFLAG(IS_CHROMEOS_ASH)
const char kProduct[] = "Chrome_ChromeOS";
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
const char kProduct[] = "Chrome_Linux";
#elif BUILDFLAG(IS_ANDROID)
const char kProduct[] = "Chrome_Android";

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

@ -1,13 +1,11 @@
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -291,6 +291,10 @@ void WebRtcLogUploader::SetupMultipart(
const char product[] = "Chrome_ChromeOS";
#elif BUILDFLAG(IS_FUCHSIA)
const char product[] = "Chrome_Fuchsia";
+#elif defined(OS_OPENBSD)
+ const char product[] = "Chrome_OpenBSD";
+#elif defined(OS_FREEBSD)
+ const char product[] = "Chrome_FreeBSD";
@@ -100,7 +100,7 @@ std::string GetLogUploadProduct() {
const char product[] = "Chrome_Mac";
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#if !defined(ADDRESS_SANITIZER)
const char product[] = "Chrome_Linux";
#else
#error Platform not supported.
#endif

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

@ -1,4 +1,4 @@
--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
@@ -25,10 +25,10 @@
#include "components/webrtc_logging/browser/text_log_list.h"
@ -13,7 +13,7 @@
using webrtc_event_logging::WebRtcEventLogManager;
@@ -284,7 +284,7 @@ void WebRtcLoggingController::StartEventLogging(
@@ -288,7 +288,7 @@ void WebRtcLoggingController::StartEventLogging(
web_app_id, callback);
}
@ -22,7 +22,7 @@
void WebRtcLoggingController::GetLogsDirectory(
LogsDirectoryCallback callback,
LogsDirectoryErrorCallback error_callback) {
@@ -329,7 +329,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
@@ -334,7 +334,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
FROM_HERE,
base::BindOnce(std::move(callback), file_system.id(), registered_name));
}

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

@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-05-05 12:12:41 UTC
--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
@@ -134,7 +134,7 @@ class WebRtcLoggingController
@@ -133,7 +133,7 @@ class WebRtcLoggingController
size_t web_app_id,
const StartEventLoggingCallback& callback);
@ -9,7 +9,7 @@
// Ensures that the WebRTC Logs directory exists and then grants render
// process access to the 'WebRTC Logs' directory, and invokes |callback| with
// the ids necessary to create a DirectoryEntry object.
@@ -199,7 +199,7 @@ class WebRtcLoggingController
@@ -197,7 +197,7 @@ class WebRtcLoggingController
content::BrowserContext* GetBrowserContext() const;

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

@ -1,4 +1,4 @@
--- chrome/browser/memory_details.cc.orig 2023-09-17 07:59:53 UTC
--- chrome/browser/memory_details.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/memory_details.cc
@@ -38,7 +38,7 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
@ -10,7 +10,7 @@
#endif
@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
std::ref(process)));
});
}
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)

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

@ -1,4 +1,4 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-11-04 07:08:51 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -78,8 +78,10 @@
@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -108,7 +110,7 @@
@@ -104,7 +106,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -117,7 +119,7 @@
@@ -113,7 +115,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -30,7 +30,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -917,7 +919,7 @@ void RecordStartupMetrics() {
@@ -837,7 +839,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -39,7 +39,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -1239,11 +1241,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1145,11 +1147,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)

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-09-01 04:52:40 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
@@ -33,7 +33,7 @@ class PowerMetricsReporter;
class ProcessMonitor;
@ -9,7 +9,7 @@
class PressureMetricsReporter;
#endif // BUILDFLAG(IS_LINUX)
@@ -139,7 +139,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
@@ -131,7 +131,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
#endif // !BUILDFLAG(IS_ANDROID)

42
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-12-23 12:33:28 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -184,7 +184,7 @@
@@ -185,7 +185,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -9,16 +9,16 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -210,7 +210,7 @@
@@ -202,7 +202,7 @@
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#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))
@@ -810,7 +810,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -806,7 +806,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -27,16 +27,16 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -894,7 +894,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// 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))
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -1013,7 +1013,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -1004,7 +1004,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -45,12 +45,12 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1212,7 +1212,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
@@ -1204,7 +1204,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// 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))
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(

24
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-12-23 12:33:28 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -92,7 +92,7 @@
@ -104,8 +104,8 @@
pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@ -113,7 +113,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -632,7 +632,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -625,7 +625,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -122,16 +122,16 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
@@ -649,7 +649,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -670,11 +670,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -658,11 +658,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@ -145,7 +145,7 @@
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
@@ -727,7 +727,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
@@ -715,7 +715,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@ -154,7 +154,7 @@
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -938,7 +938,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
@@ -929,7 +929,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}
@ -163,8 +163,8 @@
if (!enabled) {
g_network_service_will_allow_gssapi_library_load = true;
}
@@ -1052,7 +1052,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
@@ -1010,7 +1010,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)

8
www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/net/system_network_context_manager.h.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/net/system_network_context_manager.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/net/system_network_context_manager.h
@@ -185,7 +185,7 @@ class SystemNetworkContextManager {
class URLLoaderFactoryForSystem;
@ -9,8 +9,8 @@
class GssapiLibraryLoadObserver
: public network::mojom::GssapiLibraryLoadObserver {
public:
@@ -229,7 +229,7 @@ class SystemNetworkContextManager {
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
@@ -221,7 +221,7 @@ class SystemNetworkContextManager {
void UpdateExplicitlyAllowedNetworkPorts();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@ -18,7 +18,7 @@
// Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
// pref to the enforcement state.
void UpdateEnforceLocalAnchorConstraintsEnabled();
@@ -277,7 +277,7 @@ class SystemNetworkContextManager {
@@ -269,7 +269,7 @@ class SystemNetworkContextManager {
static absl::optional<bool> certificate_transparency_enabled_for_testing_;

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-09-17 07:59:53 UTC
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
@@ -115,7 +115,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
@@ -133,7 +133,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
// 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) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
@@ -49,7 +49,7 @@
@@ -50,7 +50,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_mac.h"
#endif // BUILDFLAG(IS_MAC)
@ -9,7 +9,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_linux.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -58,7 +58,7 @@
@@ -59,7 +59,7 @@
#include "chrome/install_static/install_util.h"
#endif // BUILDFLAG(IS_WIN)
@ -18,7 +18,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h"
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
@@ -91,7 +91,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
#if BUILDFLAG(IS_MAC)
storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
@ -27,7 +27,7 @@
storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
#elif BUILDFLAG(IS_WIN)
storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
@@ -261,7 +261,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {

68
www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -216,19 +216,20 @@
@@ -221,19 +221,20 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -24,7 +24,16 @@
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
@@ -798,14 +799,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -244,7 +245,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "chrome/browser/policy/battery_saver_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -806,14 +807,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -41,7 +50,7 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1537,7 +1538,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1545,7 +1546,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -50,7 +59,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1582,7 +1583,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1590,7 +1591,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@ -59,7 +68,7 @@
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1608,18 +1609,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1616,18 +1617,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -81,7 +90,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1632,7 +1633,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1640,7 +1641,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) \
@ -90,7 +99,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1730,7 +1731,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1738,7 +1739,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -99,7 +108,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1823,7 +1824,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1831,7 +1832,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -108,7 +117,7 @@
// TODO(crbug.com/1454054): replace the
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
// matches the name of the new `getAllScreensMedia` API.
@@ -1832,7 +1833,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1840,7 +1841,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -117,8 +126,8 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1863,7 +1864,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
@@ -1865,7 +1866,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@ -126,16 +135,16 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1939,7 +1940,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1941,7 +1942,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::kBatterySaverModeAvailability,
performance_manager::user_tuning::prefs::kBatterySaverModeState,
base::Value::Type::INTEGER },
@@ -1970,7 +1971,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST },
@@ -1969,7 +1970,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
@ -144,7 +153,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2007,7 +2008,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2006,7 +2007,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
base::Value::Type::BOOLEAN },
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -153,7 +162,7 @@
{ key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST},
@@ -2102,7 +2103,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2116,7 +2117,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -161,8 +170,8 @@
+ 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) ||
@@ -2278,7 +2279,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Note: This needs to be created after `DefaultSearchPolicyHandler`.
@@ -2295,7 +2296,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -171,7 +180,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2336,7 +2337,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2353,7 +2354,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -180,7 +189,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
@@ -2730,7 +2731,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2747,7 +2748,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -189,7 +198,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2738,7 +2739,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2755,7 +2756,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -198,7 +207,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2755,7 +2756,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2772,7 +2773,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
/*new_policy_handler=*/std::make_unique<
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
policy::key::kRelatedWebsiteSetsOverrides, chrome_schema)));
@ -207,3 +216,12 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2797,7 +2798,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN)));
#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<BatterySaverPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_ASH)

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

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -482,18 +482,18 @@
@@ -490,18 +490,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -22,7 +22,7 @@
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#endif
@@ -525,7 +525,7 @@
@@ -533,7 +533,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -31,7 +31,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -649,7 +649,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
@@ -657,7 +657,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@ -40,7 +40,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -979,7 +979,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
@@ -1017,7 +1017,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@ -49,7 +49,7 @@
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1952,12 +1952,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -2022,12 +2022,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -64,7 +64,7 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
enterprise_signin::RegisterProfilePrefs(registry);
#endif
@@ -2114,7 +2114,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
@@ -2187,7 +2187,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023

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

@ -1,8 +1,8 @@
--- chrome/browser/printing/printer_query.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/printing/printer_query.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/printing/printer_query.cc
@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));
printer_name, print_backend->GetPrinterDriverInfo(printer_name));
-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
+#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS)

20
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-12-23 12:33:28 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -400,18 +400,18 @@
@@ -401,18 +401,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -22,16 +22,16 @@
#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"
@@ -620,7 +620,7 @@ void ChromeBrowserMainExtraPartsProfiles::
if (breadcrumbs::IsEnabled()) {
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
@@ -643,7 +643,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance();
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
-#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::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
@@ -726,26 +726,26 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -763,26 +763,26 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -63,7 +63,7 @@
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -861,7 +861,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -900,7 +900,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -72,7 +72,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
@@ -958,7 +958,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -998,7 +998,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
@ -81,7 +81,7 @@
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
@@ -1002,7 +1002,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1042,7 +1042,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
ProfileThemeUpdateServiceFactory::GetInstance();
#endif

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-11-04 07:08:51 UTC
--- chrome/browser/renderer_preferences_util.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -38,7 +38,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"
@@ -152,7 +152,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -150,7 +150,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()) {
@@ -175,7 +175,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -173,7 +173,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

4
www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts
View file

@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/route.ts.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/resources/settings/route.ts.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/resources/settings/route.ts
@@ -242,7 +242,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
@@ -245,7 +245,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));

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-10-13 13:20:35 UTC
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-02-03 15:42:55 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
@@ -421,7 +421,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
@@ -417,7 +417,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.

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

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/browser_thread.h"
@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
@@ -314,7 +314,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
@@ -318,7 +318,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)

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

@ -0,0 +1,11 @@
--- chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc
@@ -133,7 +133,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* regis
void SetUpIfNeeded(const base::FieldTrial::EntropyProvider& entropy_provider,
base::FeatureList* feature_list,
PrefService* local_state) {
-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
// Platform not in scope for this client-side trial.
return;
#else

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/ui/chrome_pages.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -78,7 +78,7 @@
@@ -79,7 +79,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -671,7 +671,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
@@ -701,7 +701,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/chrome_pages.h.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/ui/chrome_pages.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -38,7 +38,7 @@ enum class ConsentLevel;
} // namespace signin
@ -9,7 +9,7 @@
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
@@ -255,7 +255,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
@@ -258,7 +258,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-11-04 07:08:51 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -133,7 +133,7 @@
@@ -135,7 +135,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
#endif // BUILDFLAG(IS_WIN)
@ -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"
@@ -925,7 +925,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -935,7 +935,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())) {
@@ -1029,7 +1029,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1040,7 +1040,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) &&
@@ -1242,7 +1242,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1251,7 +1251,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);

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-12-23 12:33:28 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -225,7 +225,7 @@
@@ -226,7 +226,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"
@@ -641,12 +641,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -645,12 +645,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) || \

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-12-23 12:33:28 UTC
--- chrome/browser/ui/ui_features.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/ui_features.cc
@@ -315,7 +315,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
@@ -345,7 +345,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-11-04 07:08:51 UTC
--- chrome/browser/ui/ui_features.h.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/ui_features.h
@@ -195,7 +195,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
@@ -219,7 +219,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);

10
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h
View file

@ -1,10 +0,0 @@
--- chrome/browser/ui/views/dark_mode_manager_linux.h.orig 2023-10-13 13:20:35 UTC
+++ chrome/browser/ui/views/dark_mode_manager_linux.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_VIEWS_DARK_MODE_MANAGER_LINUX_H_
#include <string>
+#include <vector>
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"

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 2024-01-06 08:40:52 UTC
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -2172,7 +2172,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -2154,7 +2154,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.

22
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-12-23 12:33:28 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -55,7 +55,7 @@
@@ -57,7 +57,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
@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16;
@@ -85,7 +85,7 @@ constexpr int kContentSettingIconSize = 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
@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver {
@@ -180,7 +180,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()) {
@@ -560,7 +560,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
@@ -570,7 +570,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
AddChildView(std::move(auto_pip_setting_overlay));
}
@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
@@ -736,7 +736,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
@@ -746,7 +746,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)));
@@ -811,7 +811,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
@@ -825,7 +825,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -1058,7 +1058,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
@@ -1079,7 +1079,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_) {
@@ -1182,7 +1182,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
@@ -1203,7 +1203,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@ -72,7 +72,7 @@
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
@@ -1203,7 +1203,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
@@ -1224,7 +1224,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@ -81,7 +81,7 @@
return FrameBorderInsets();
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return gfx::Insets(chromeos::kResizeInsideBoundsSize);
@@ -1224,7 +1224,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
@@ -1245,7 +1245,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
top_height + border_thickness.bottom());
}

11
www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc
View file

@ -1,11 +0,0 @@
--- chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc.orig 2023-11-04 07:08:51 UTC
+++ chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc
@@ -89,7 +89,7 @@ void DiceWebSigninInterceptionBackdropLayer::DrawDarkB
// The dark layer should be drawn on top of this region, but it's not easily
// accessible in code, and requires specific implementations.
// After the 2023 refresh, this drag area no longer exists.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On linux, the drag area is accessible through the
// `MirroredFrameBorderInsets()` function, which crashes on non-Linux
// platforms.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -660,7 +660,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
@@ -666,7 +666,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/views/tab_search_bubble_host.cc
@@ -222,7 +222,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
@@ -249,7 +249,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
// Mac should have tabsearch on the right side. Windows >= Win10 has the
// Tab Search button as a FrameCaptionButton, but it still needs to be on the
// left if it exists.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
@@ -612,7 +612,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
@@ -611,7 +611,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
return;

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

@ -0,0 +1,11 @@
--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-02-03 15:42:55 UTC
+++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -716,7 +716,7 @@ void MaybeRegisterChromeFeaturePromos(
FeaturePromoSpecification::AcceleratorInfo())
.SetBubbleArrow(HelpBubbleArrow::kTopLeft)));
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// kIPHDesktopPWAsLinkCapturingLaunch:
registry.RegisterFeature(std::move(
FeaturePromoSpecification::CreateForCustomAction(

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