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

www/iridium: update to 2023.04.112

Browse source 
Approved by:	rene (mentor)
Differential Revision:	https://reviews.freebsd.org/D39769
This commit is contained in:
Robert Nagy 2023-04-23 06:52:55 +02:00
parent f8f5b995fb
commit 9c709a1d6b
313 changed files with 1704 additions and 1443 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
www/iridium/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= iridium
PORTVERSION= 2023.03.111
PORTREVISION= 3
PORTVERSION= 2023.04.112
CATEGORIES= www wayland
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
@ -102,7 +101,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
chrome_pgo_phase=0 \
enable_backup_ref_ptr_support=false \
enable_hangout_services_extension=true \
enable_js_type_check=false \
enable_nacl=false \
enable_remoting=false \
fatal_linker_warnings=false \
@ -121,7 +119,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_sysroot=false \
use_system_freetype=false \
use_system_harfbuzz=true \
use_system_libffi=true \
use_system_libjpeg=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
@ -204,8 +201,8 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif
.if ${COMPILER_VERSION} != 130
LLVM_DEFAULT= 13
.if ${COMPILER_VERSION} < 150
LLVM_DEFAULT= 15
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \

6
www/iridium/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1678693399
SHA256 (iridium-browser-2023.03.111.tar.xz) = 418395ea49900434fdecfc7f202f3e157f0f8fee639f6ca676bc88549f4eb16c
SIZE (iridium-browser-2023.03.111.tar.xz) = 1486956168
TIMESTAMP = 1682173630
SHA256 (iridium-browser-2023.04.112.tar.xz) = af3f1d110234caa6e0198f4776a7096d83e65d4310e2109a0970eb06b68844ab
SIZE (iridium-browser-2023.04.112.tar.xz) = 1427247352
SHA256 (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = c8cc1c6a6f735adfe807da0109349ebab87e0eff77f593925757da34bb31f38c
SIZE (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = 4177

16
www/iridium/files/patch-BUILD.gn
View file

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-03-13 07:33:08 UTC
--- BUILD.gn.orig 2023-04-22 17:45:15 UTC
+++ BUILD.gn
@@ -60,7 +60,7 @@ declare_args() {
root_extra_deps = []
@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -417,7 +416,7 @@ group("gn_all") {
@@ -423,7 +422,7 @@ group("gn_all") {
}
}
@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -616,6 +615,15 @@ group("gn_all") {
@@ -622,6 +621,15 @@ group("gn_all") {
}
}
@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -664,7 +672,7 @@ group("gn_all") {
@@ -670,7 +678,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)" ]
}
@@ -1086,7 +1094,7 @@ if (!is_ios) {
@@ -1093,7 +1101,7 @@ if (!is_ios) {
]
}
@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1186,7 +1194,7 @@ if (!is_ios) {
@@ -1193,7 +1201,7 @@ if (!is_ios) {
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)" ]
}
@@ -1195,7 +1203,7 @@ if (!is_ios) {
@@ -1202,7 +1210,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1661,7 +1669,7 @@ group("chromium_builder_perf") {
@@ -1670,7 +1678,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

56
www/iridium/files/patch-base_BUILD.gn
View file

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2023-03-13 07:33:08 UTC
--- base/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+++ base/BUILD.gn
@@ -168,7 +168,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@ -9,31 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1053,7 +1053,7 @@ component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"profiler/stack_base_address_posix.cc",
"profiler/stack_base_address_posix.h",
@@ -1064,6 +1064,14 @@ component("base") {
"profiler/thread_delegate_posix.h",
]
}
+
+ if (is_bsd) {
+ sources += [
+ "profiler/stack_base_address_posix.cc",
+ "profiler/stack_base_address_posix.h",
+ "profiler/stack_sampler_posix.cc",
+ ]
+ }
}
if (is_win) {
@@ -1544,11 +1552,23 @@ component("base") {
@@ -1093,11 +1093,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.
@ -58,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1576,7 +1596,7 @@ component("base") {
@@ -1125,7 +1137,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@ -67,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1617,7 +1637,7 @@ component("base") {
@@ -1166,7 +1178,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -76,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2208,6 +2228,39 @@ component("base") {
@@ -2107,6 +2119,43 @@ component("base") {
}
}
@ -88,7 +64,11 @@
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_metrics_linux.cc",
+ "process/process_handle_linux.cc"
+ "process/process_handle_linux.cc",
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
@ -115,8 +95,8 @@
+
# iOS
if (is_ios) {
sources -= [
@@ -2303,7 +2356,7 @@ component("base") {
sources += [
@@ -2202,7 +2251,7 @@ component("base") {
}
if (dep_libevent) {
@ -125,8 +105,8 @@
}
if (use_libevent) {
@@ -3556,7 +3609,7 @@ test("base_unittests") {
}
@@ -3470,7 +3519,7 @@ test("base_unittests") {
]
}
- if (is_linux || is_chromeos) {
@ -134,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3602,7 +3655,7 @@ test("base_unittests") {
@@ -3519,7 +3568,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -143,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3613,7 +3666,7 @@ test("base_unittests") {
@@ -3530,7 +3579,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -152,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3829,7 +3882,7 @@ test("base_unittests") {
@@ -3751,7 +3800,7 @@ test("base_unittests") {
}
}

6
www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
View file

@ -1,8 +1,8 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-03-13 07:33:08 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -371,8 +371,12 @@ bool TryRecommitSystemPagesInternal(
@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
#if !BUILDFLAG(IS_NACL)
void* ptr = reinterpret_cast<void*>(address);
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)

4
www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-13 07:33:08 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -416,7 +416,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
}
#endif

4
www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-03-13 07:33:08 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -233,7 +233,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {

8
www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-13 07:33:08 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -120,7 +120,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
@ -9,7 +9,7 @@
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -267,7 +267,7 @@ constexpr bool kUseLazyCommit = false;
@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@ -18,7 +18,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -312,7 +312,7 @@ constexpr bool kUseLazyCommit = false;
@@ -296,7 +296,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() \

8
www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-13 07:33:08 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -91,7 +91,7 @@ PartitionPageShift() {
@@ -92,7 +92,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
@ -9,10 +9,10 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -277,7 +277,7 @@ constexpr size_t kNumPools = 3;
//
@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// When pointer compression is enabled, we cannot use large pools (at most
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;

4
www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_page.h.orig 2022-12-01 10:35:46 UTC
--- base/allocator/partition_allocator/partition_page.h.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/partition_page.h
@@ -144,7 +144,7 @@ struct SlotSpanMetadata {
@@ -143,7 +143,7 @@ struct SlotSpanMetadata {
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;

4
www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-03-13 07:33:08 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -42,7 +42,7 @@
#include "wow64apiset.h"
@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -800,7 +800,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

6
www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-10-05 07:34:01 UTC
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-04-22 17:45:15 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
@@ -17,6 +17,10 @@
@@ -18,6 +18,10 @@
#include <pthread.h>
#endif
@ -11,7 +11,7 @@
#if defined(LIBC_GLIBC)
extern "C" void* __libc_stack_end;
#endif
@@ -47,6 +51,36 @@ void* GetStackTop() {
@@ -48,6 +52,36 @@ void* GetStackTop() {
void* GetStackTop() {
return pthread_get_stackaddr_np(pthread_self());

4
www/iridium/files/patch-base_atomicops.h
View file

@ -1,6 +1,6 @@
--- base/atomicops.h.orig 2022-10-05 07:34:01 UTC
--- base/atomicops.h.orig 2023-04-22 17:45:15 UTC
+++ base/atomicops.h
@@ -56,7 +56,11 @@ typedef intptr_t Atomic64;
@@ -71,7 +71,11 @@ typedef intptr_t Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.

10
www/iridium/files/patch-base_debug_stack__trace__posix.cc
View file

@ -1,6 +1,6 @@
--- base/debug/stack_trace_posix.cc.orig 2023-03-13 07:33:08 UTC
--- base/debug/stack_trace_posix.cc.orig 2023-04-22 17:45:15 UTC
+++ base/debug/stack_trace_posix.cc
@@ -40,7 +40,7 @@
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
// libc.
#if BUILDFLAG(IS_APPLE) || \
@ -9,7 +9,7 @@
#define HAVE_BACKTRACE
#include <execinfo.h>
#endif
@@ -58,7 +58,7 @@
@@ -59,7 +59,7 @@
#include <AvailabilityMacros.h>
#endif
@ -18,7 +18,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
@@ -761,6 +761,9 @@ class SandboxSymbolizeHelper {
@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@ -28,7 +28,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -778,6 +781,7 @@ class SandboxSymbolizeHelper {
@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;

4
www/iridium/files/patch-base_process_kill__posix.cc
View file

@ -1,6 +1,6 @@
--- base/process/kill_posix.cc.orig 2022-10-05 07:34:01 UTC
--- base/process/kill_posix.cc.orig 2023-04-22 17:45:15 UTC
+++ base/process/kill_posix.cc
@@ -158,7 +158,7 @@ void EnsureProcessTerminated(Process process) {
@@ -157,7 +157,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), Seconds(2)));
}

14
www/iridium/files/patch-base_process_process__iterator__freebsd.cc
View file

@ -1,15 +1,15 @@
--- base/process/process_iterator_freebsd.cc.orig 2022-10-05 07:34:01 UTC
--- base/process/process_iterator_freebsd.cc.orig 2023-04-22 17:45:15 UTC
+++ base/process/process_iterator_freebsd.cc
@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
: index_of_kinfo_proc_(),
filter_(filter) {
@@ -18,7 +18,7 @@ namespace base {
ProcessIterator::ProcessIterator(const ProcessFilter* filter)
: filter_(filter) {
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() };
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() };
bool done = false;
int try_num = 1;
@@ -39,7 +39,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
@@ -37,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
num_of_kinfo_proc += 16;
kinfo_procs_.resize(num_of_kinfo_proc);
len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
@ -18,7 +18,7 @@
// If we get a mem error, it just means we need a bigger buffer, so
// loop around again. Anything else is a real error and give up.
if (errno != ENOMEM) {
@@ -49,7 +49,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
@@ -47,7 +47,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
}
} else {
// Got the list, just make sure we're sized exactly right
@ -27,7 +27,7 @@
kinfo_procs_.resize(num_of_kinfo_proc);
done = true;
}
@@ -71,18 +71,13 @@ bool ProcessIterator::CheckForNextProcess() {
@@ -68,18 +68,13 @@ bool ProcessIterator::CheckForNextProcess() {
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
size_t length;
struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];

12
www/iridium/files/patch-base_process_process__iterator__openbsd.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_iterator_openbsd.cc.orig 2022-10-05 07:34:01 UTC
--- base/process/process_iterator_openbsd.cc.orig 2023-04-22 17:45:15 UTC
+++ base/process/process_iterator_openbsd.cc
@@ -6,6 +6,9 @@
@ -10,10 +10,10 @@
#include <sys/sysctl.h>
#include "base/logging.h"
@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
: index_of_kinfo_proc_(),
filter_(filter) {
@@ -16,12 +19,13 @@ namespace base {
ProcessIterator::ProcessIterator(const ProcessFilter* filter)
: filter_(filter) {
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(),
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()),
sizeof(struct kinfo_proc), 0 };
@ -25,7 +25,7 @@
do {
size_t len = 0;
@@ -32,7 +36,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
@@ -30,7 +34,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
kinfo_procs_.resize(0);
done = true;
} else {
@ -34,7 +34,7 @@
// Leave some spare room for process table growth (more could show up
// between when we check and now)
num_of_kinfo_proc += 16;
@@ -48,7 +52,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
@@ -46,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
}
} else {
// Got the list, just make sure we're sized exactly right

12
www/iridium/files/patch-base_process_process__posix.cc
View file

@ -1,8 +1,8 @@
--- base/process/process_posix.cc.orig 2022-10-05 07:34:01 UTC
--- base/process/process_posix.cc.orig 2023-04-22 17:45:15 UTC
+++ base/process/process_posix.cc
@@ -25,10 +25,15 @@
@@ -23,10 +23,15 @@
#include "base/trace_event/base_tracing.h"
#include "build/build_config.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
-#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
@ -17,7 +17,7 @@
#if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h"
#endif
@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
return ret_pid > 0;
}
@ -26,7 +26,7 @@
// Using kqueue on Mac so that we can wait on non-child processes.
// We can't use kqueues on child processes because we need to reap
// our own children using wait.
@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
const bool exited = (parent_pid < 0);
if (!exited && parent_pid != our_pid) {
@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
@@ -392,7 +397,55 @@ void Process::Exited(int exit_code) const {
@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const {
int Process::GetPriority() const {
DCHECK(IsValid());

14
www/iridium/files/patch-base_profiler_module__cache.cc
View file

@ -1,11 +1,11 @@
--- base/profiler/module_cache.cc.orig 2022-10-05 07:34:01 UTC
--- base/profiler/module_cache.cc.orig 2023-04-22 17:45:15 UTC
+++ base/profiler/module_cache.cc
@@ -34,7 +34,7 @@ struct ModuleAddressCompare {
std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) {
std::string mangled_id(module_id);
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
// Android and Linux Chrome builds use the "breakpad" format to index their
// build id, so we transform the build id for these platforms. All other
// platforms keep their symbols indexed by the original build ID.
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Linux ELF module IDs are 160bit integers, which we need to mangle
// down to 128bit integers to match the id that Breakpad outputs.
// Example on version '66.0.3359.170' x64:

6
www/iridium/files/patch-base_synchronization_lock__impl.h
View file

@ -1,6 +1,6 @@
--- base/synchronization/lock_impl.h.orig 2022-10-05 07:34:01 UTC
--- base/synchronization/lock_impl.h.orig 2023-04-22 17:45:15 UTC
+++ base/synchronization/lock_impl.h
@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
@@ -104,6 +104,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@ -11,7 +11,7 @@
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
@@ -124,6 +128,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}

12
www/iridium/files/patch-base_threading_platform__thread__posix.cc
View file

@ -1,15 +1,15 @@
--- base/threading/platform_thread_posix.cc.orig 2023-03-13 07:33:08 UTC
--- base/threading/platform_thread_posix.cc.orig 2023-04-22 17:45:15 UTC
+++ base/threading/platform_thread_posix.cc
@@ -77,7 +77,7 @@ void* ThreadFunc(void* params) {
@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN)
-#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN)
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD)
partition_alloc::internal::PCScan::NotifyThreadCreated(
partition_alloc::internal::GetStackPointer());
@@ -379,6 +379,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
#endif
@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
NOTIMPLEMENTED();

46
www/iridium/files/patch-build_config_compiler_BUILD.gn
View file

@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig 2023-03-13 07:33:08 UTC
--- build/config/compiler/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+++ build/config/compiler/BUILD.gn
@@ -232,13 +232,16 @@ config("default_include_dirs") {
@@ -237,13 +237,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@ -18,7 +18,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -284,7 +287,9 @@ config("compiler") {
@@ -289,7 +292,9 @@ config("compiler") {
configs += [
# See the definitions below.
@ -28,7 +28,7 @@
":compiler_codegen",
":compiler_deterministic",
]
@@ -460,6 +465,10 @@ config("compiler") {
@@ -465,6 +470,10 @@ config("compiler") {
}
}
@ -39,7 +39,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -955,7 +964,7 @@ config("compiler_cpu_abi") {
@@ -964,7 +973,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -48,7 +48,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -970,7 +979,7 @@ config("compiler_cpu_abi") {
@@ -979,7 +988,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -57,7 +57,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1315,6 +1324,27 @@ config("compiler_deterministic") {
@@ -1325,6 +1334,27 @@ config("compiler_deterministic") {
}
}
@ -83,9 +83,9 @@
+}
+
config("rustc_revision") {
if (enable_rust && defined(rustc_version)) {
# Similar to the above config, this is here so that all files get
@@ -1536,7 +1566,7 @@ config("default_warnings") {
if (rustc_revision != "") {
# Similar to the above config, this is here so that all files get recompiled
@@ -1543,7 +1573,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -94,7 +94,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1701,7 +1731,7 @@ config("no_chromium_code") {
@@ -1711,7 +1741,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -103,7 +103,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -1985,8 +2015,7 @@ config("default_stack_frames") {
@@ -1995,8 +2025,7 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@ -113,7 +113,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
@@ -2045,8 +2074,7 @@ config("xoptimize") {
@@ -2055,8 +2084,7 @@ config("xoptimize") {
}
# Turn off optimizations.
@ -123,7 +123,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
@@ -2086,8 +2114,7 @@ config("xno_optimize") {
@@ -2096,8 +2124,7 @@ config("xno_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and should
# be used sparingly.
@ -133,7 +133,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
@@ -2120,8 +2147,7 @@ config("xoptimize_max") {
@@ -2130,8 +2157,7 @@ config("xoptimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@ -143,7 +143,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
@@ -2147,8 +2173,7 @@ config("xoptimize_speed") {
@@ -2157,8 +2183,7 @@ config("xoptimize_speed") {
}
}
@ -153,7 +153,7 @@
cflags = [ "-O1" ] + common_optimize_on_cflags
rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
@@ -2214,7 +2239,7 @@ config("afdo_optimize_size") {
@@ -2224,7 +2249,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") {
@ -162,8 +162,8 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2230,7 +2255,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
@@ -2243,7 +2268,7 @@ config("afdo") {
}
inputs = [ _clang_sample_profile ]
}
- } else if (auto_profile_path != "" && is_a_target_toolchain) {
@ -171,7 +171,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2268,8 +2293,7 @@ config("win_pdbaltpath") {
@@ -2281,8 +2306,7 @@ config("win_pdbaltpath") {
}
# Full symbols.
@ -181,7 +181,7 @@
if (is_win) {
if (is_clang) {
cflags = [
@@ -2386,7 +2410,8 @@ config("xsymbols") {
@@ -2399,7 +2423,8 @@ config("xsymbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
@ -191,7 +191,7 @@
if (is_apple) {
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
# Make sure we don't use constructor homing on mac.
@@ -2409,8 +2434,7 @@ config("xsymbols") {
@@ -2422,8 +2447,7 @@ config("xsymbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to user
# when crash happens in unittests running on buildbot.
@ -201,7 +201,7 @@
if (is_win) {
# Functions, files, and line tables only.
cflags = []
@@ -2484,8 +2508,7 @@ config("xminimal_symbols") {
@@ -2497,8 +2521,7 @@ config("xminimal_symbols") {
# This configuration contains function names only. That is, the compiler is
# told to not generate debug information and the linker then just puts function
# names in the final debug information.

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

@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2023-03-13 07:33:08 UTC
--- build/config/rust.gni.orig 2023-04-22 17:45:15 UTC
+++ build/config/rust.gni
@@ -134,7 +134,7 @@ if (enable_rust) {
@@ -135,7 +135,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {

4
www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
View file

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2023-03-13 07:33:08 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2023-04-22 17:45:15 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -832,22 +839,12 @@ template("gcc_toolchain") {
@@ -825,22 +832,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {

6
www/iridium/files/patch-cc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2023-01-17 19:19:00 UTC
--- cc/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+++ cc/BUILD.gn
@@ -666,7 +666,7 @@ cc_test_static_library("test_support") {
@@ -668,7 +668,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -893,7 +893,6 @@ cc_test("cc_unittests") {
@@ -913,7 +913,6 @@ cc_test("cc_unittests") {
data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

6
www/iridium/files/patch-chrome_app_chrome__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/app/chrome_main.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/app/chrome_main.cc
@@ -27,7 +27,7 @@
@@ -28,7 +28,7 @@
#include "chrome/app/notification_metrics.h"
#endif
@ -9,7 +9,7 @@
#include "base/base_switches.h"
#endif
@@ -157,7 +157,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -167,7 +167,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

26
www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -137,7 +137,7 @@
@@ -136,7 +136,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
@@ -181,16 +181,16 @@
@@ -180,16 +180,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
@@ -352,7 +352,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -328,7 +328,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -38,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -437,7 +437,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -413,7 +413,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -47,7 +47,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -551,7 +551,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -527,7 +527,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -56,7 +56,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
@@ -640,7 +640,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -616,7 +616,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -928,6 +928,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -915,6 +915,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on ChromeOS.
#if BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@ -74,7 +74,7 @@
#else
bool enable_gwp_asan = true;
#endif
@@ -984,7 +986,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -970,7 +972,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::internal::TimerBase::InitializeFeatures();
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
@ -83,7 +83,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1116,7 +1118,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1102,7 +1104,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -92,7 +92,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1146,7 +1148,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1132,7 +1134,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -101,7 +101,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1528,7 +1530,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1514,7 +1516,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -110,7 +110,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1608,7 +1610,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1616,7 +1618,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.

16
www/iridium/files/patch-chrome_app_generated__resources.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-03-13 07:33:08 UTC
--- chrome/app/generated_resources.grd.orig 2023-04-22 17:45:15 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.
-->
@@ -3181,7 +3181,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3187,7 +3187,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>
@@ -4936,7 +4936,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -4942,7 +4942,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>
@@ -5603,7 +5603,7 @@ Keep your key file in a safe place. You will need it t
@@ -5612,7 +5612,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>
@@ -5649,7 +5649,7 @@ Keep your key file in a safe place. You will need it t
@@ -5658,7 +5658,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>
@@ -9448,7 +9448,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -9551,7 +9551,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -54,7 +54,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>
@@ -10789,7 +10789,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -10892,7 +10892,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -63,7 +63,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -12904,7 +12904,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -13004,7 +13004,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

6
www/iridium/files/patch-chrome_app_settings__strings.grdp
View file

@ -1,6 +1,6 @@
--- chrome/app/settings_strings.grdp.orig 2023-03-13 07:33:08 UTC
--- chrome/app/settings_strings.grdp.orig 2023-04-22 17:45:15 UTC
+++ chrome/app/settings_strings.grdp
@@ -163,7 +163,7 @@
@@ -166,7 +166,7 @@
Theme
</message>
</if>
@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
@@ -183,7 +183,7 @@
@@ -186,7 +186,7 @@
Use Classic
</message>
</if>

6
www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-03-13 07:33:08 UTC
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-04-22 17:45:15 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
<includes>
@ -9,7 +9,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
@@ -62,7 +62,7 @@
@@ -63,7 +63,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@ -18,7 +18,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
@@ -76,7 +76,7 @@
@@ -77,7 +77,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->

28
www/iridium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/about_flags.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/about_flags.cc
@@ -219,7 +219,7 @@
@@ -216,7 +216,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -301,7 +301,7 @@
@@ -303,7 +303,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)
@@ -407,7 +407,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -409,7 +409,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -27,7 +27,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1322,7 +1322,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
@@ -1350,7 +1350,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam
kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = {
{"DocumentProviderMaxLowQualitySuggestions", "1"},
@@ -4375,13 +4375,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4397,13 +4397,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -52,7 +52,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -4633,7 +4633,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4667,7 +4667,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -61,7 +61,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5191,7 +5191,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5271,7 +5271,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -70,7 +70,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -5834,7 +5834,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5915,7 +5915,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
@ -79,7 +79,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -6789,7 +6789,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6838,7 +6838,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -88,7 +88,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -7532,7 +7532,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7573,7 +7573,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -97,7 +97,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -7759,7 +7759,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7789,7 +7789,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -106,7 +106,7 @@
{"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName,
flag_descriptions::kGetDisplayMediaSetDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -7809,7 +7809,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7848,7 +7848,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -115,7 +115,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -8346,7 +8346,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8381,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

14
www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -113,13 +113,13 @@
@@ -114,13 +114,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -192,7 +192,7 @@
@@ -194,7 +194,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
@@ -853,7 +853,7 @@ void PopulateChromeFrameBinders(
@@ -859,7 +859,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -861,7 +861,7 @@ void PopulateChromeFrameBinders(
@@ -867,7 +867,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -926,14 +926,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -932,14 +932,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1332,7 +1332,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1375,7 +1375,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

10
www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -240,11 +240,11 @@
@@ -239,11 +239,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
@@ -279,7 +279,7 @@
@@ -278,7 +278,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -23,7 +23,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -986,7 +986,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -988,7 +988,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -32,7 +32,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 .
@@ -1042,7 +1042,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1044,7 +1044,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) || \

32
www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -412,7 +412,7 @@
@@ -417,7 +417,7 @@
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
#include "ui/display/screen.h"
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -497,12 +497,12 @@
@@ -503,12 +503,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
@@ -511,13 +511,13 @@
@@ -517,13 +517,13 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -40,7 +40,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)
@@ -546,11 +546,11 @@
@@ -552,11 +552,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -54,7 +54,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"
@@ -1559,7 +1559,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1571,7 +1571,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true);
registry->RegisterBooleanPref(
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false);
@ -63,7 +63,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1666,7 +1666,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1678,7 +1678,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -72,7 +72,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1705,7 +1705,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1717,7 +1717,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.
@ -81,7 +81,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1726,7 +1726,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1738,7 +1738,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -90,7 +90,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1745,7 +1745,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -99,7 +99,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2578,6 +2578,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2576,6 +2576,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -108,7 +108,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2949,7 +2951,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2957,7 +2959,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -117,7 +117,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4442,7 +4444,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4475,7 +4477,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -126,7 +126,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -4964,14 +4966,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4997,14 +4999,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -143,7 +143,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5010,7 +5012,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5043,7 +5045,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@ -152,7 +152,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -6616,7 +6618,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -6670,7 +6672,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {

4
www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2022-03-28 18:11:04 UTC
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/devtools/devtools_eye_dropper.cc
@@ -186,7 +186,7 @@ void DevToolsEyeDropper::UpdateCursor() {
@@ -185,7 +185,7 @@ void DevToolsEyeDropper::UpdateCursor() {
// magnified projection only with centered hotspot.
// Mac Retina requires cursor to be > 120px in order to render smoothly.

8
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1554,7 +1554,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1561,7 +1561,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();
}
@@ -1668,7 +1668,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1675,7 +1675,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1714,7 +1714,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -1721,7 +1721,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

6
www/iridium/files/patch-chrome_browser_download_download__commands.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_commands.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/download/download_commands.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/download/download_commands.cc
@@ -27,7 +27,7 @@
@@ -26,7 +26,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command)
@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command)
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

8
www/iridium/files/patch-chrome_browser_download_download__item__model.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/download/download_item_model.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -756,7 +756,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -765,7 +765,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();
@@ -799,7 +799,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -808,7 +808,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
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);
@@ -1210,7 +1210,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1220,7 +1220,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

20
www/iridium/files/patch-chrome_browser_download_download__prefs.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/download/download_prefs.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
@ -8,8 +8,8 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
@@ -61,6 +62,10 @@
#include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
@@ -64,6 +65,10 @@
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
#endif
+#if BUILDFLAG(IS_OPENBSD)
@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -71,7 +76,7 @@ namespace {
@@ -74,7 +79,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -182,7 +187,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
@@ -185,7 +190,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
@@ -302,7 +307,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -312,7 +317,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -475,7 +480,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -485,7 +490,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;
@@ -507,7 +512,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -517,7 +522,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();
@@ -538,7 +543,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -548,7 +553,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;
@@ -662,7 +667,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -672,7 +677,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/iridium/files/patch-chrome_browser_download_download__prefs.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.h.orig 2022-12-06 08:09:13 UTC
--- chrome/browser/download/download_prefs.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/download/download_prefs.h
@@ -118,7 +118,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@ -9,7 +9,7 @@
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
@@ -178,7 +178,7 @@ class DownloadPrefs {
@@ -183,7 +183,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

11
www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/enterprise/connectors/connectors_prefs.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/connectors_prefs.cc
@@ -69,7 +69,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
}
void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
registry->RegisterInt64Pref(kLatestCrashReportCreationTime, 0);
#endif
}

4
www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -507,7 +507,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
@@ -511,7 +511,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);

13
www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-12-06 08:09:13 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -21,7 +21,7 @@
#include "components/policy/core/common/management/management_service.h"
@ -8,4 +8,13 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -75,7 +75,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
DependsOn(policy::ManagementServiceFactory::GetInstance());
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Depends on this service via the SignalsService having a dependency on it.
DependsOn(enterprise_signals::SignalsAggregatorFactory::GetInstance());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

16
www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
View file

@ -1,17 +1,17 @@
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-01-17 19:19:00 UTC
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -22,7 +22,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/win/win_signals_decorator.h"
#endif // BUILDFLAG(IS_WIN)
@@ -18,7 +18,7 @@
#include "chrome/browser/profiles/profile.h"
#include "components/policy/core/common/management/management_service.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -62,7 +62,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
decorators.push_back(std::make_unique<WinSignalsDecorator>());
#endif // BUILDFLAG(IS_WIN)
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
enterprise_signals::ContextInfoFetcher::CreateInstance(
profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)

37
www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
View file

@ -1,19 +1,20 @@
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-12-01 10:35:46 UTC
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
@@ -19,14 +19,14 @@
#include "chrome/common/chrome_paths.h"
#include "components/version_info/version_info.h"
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
#include "components/crash/core/app/crashpad.h"
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#endif // !BUILDFLAG(IS_FUCHSIA)
namespace enterprise_connectors {
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
namespace {
// key names used when building the dictionary to pass to the real-time
// reporting API
@@ -14,7 +14,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter(
if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
return;
}
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
Profile* profile = Profile::FromBrowserContext(context);
@@ -27,7 +27,7 @@ BrowserCrashEventRouter::~BrowserCrashEventRouter() {
if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
return;
}
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
crash_reporting_context->RemoveProfile(this);

29
www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h
View file

@ -1,29 +0,0 @@
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-03-13 07:33:08 UTC
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h
@@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#endif // !BUILDFLAG(IS_FUCHSIA)
namespace enterprise_connectors {
@@ -31,7 +31,7 @@ class BrowserCrashEventRouter
BrowserCrashEventRouter& operator=(BrowserCrashEventRouter&&) = delete;
~BrowserCrashEventRouter() override;
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
void OnCloudReportingLaunched(
enterprise_reporting::ReportScheduler* report_scheduler) override;
void UploadToReportingServer(
@@ -46,7 +46,7 @@ class BrowserCrashEventRouter
raw_ptr<policy::ChromeBrowserCloudManagementController, DanglingUntriaged>
controller_ = nullptr;
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
// ReportCrashes() checks the enterprise policy settings, retrieves crash
// reports from the crashpad local database and sends reports that have not
// been sent to the reporting server.

11
www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
@@ -18,7 +18,7 @@
namespace enterprise_connectors {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
namespace {

29
www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h Normal file
View file

@ -0,0 +1,29 @@
--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.h
@@ -10,7 +10,7 @@
#include "chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#endif
@@ -29,7 +29,7 @@ class CrashReportingContext
CrashReportingContext operator=(CrashReportingContext&&) = delete;
~CrashReportingContext() override;
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
static CrashReportingContext* GetInstance();
void AddProfile(BrowserCrashEventRouter* router, Profile* profile);
@@ -51,7 +51,7 @@ class CrashReportingContext
#endif
};
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
// Utility function to parse reports from a crash database that were
// created past a given timestamp. Included in header for testing.

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1336,6 +1336,10 @@ static_library("extensions") {
@@ -1340,6 +1340,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

6
www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -40,7 +40,7 @@
@@ -41,7 +41,7 @@
#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
@ -9,7 +9,7 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
@@ -92,7 +92,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
@@ -100,7 +100,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SidePanelService::GetFactoryInstance();

8
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@
#include "components/reporting/util/statusor.h"
@ -17,8 +17,8 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
device_signals::SignalsAggregationRequest CreateAggregationRequest(
const std::string& user_id,
@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
device_signals::SignalName signal_name) {
@@ -211,7 +211,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
@@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
@@ -638,7 +638,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif

4
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -520,7 +520,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
@@ -523,7 +523,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

6
www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -189,7 +189,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;

11
www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -831,7 +831,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
// ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as
// minimized.
// TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1410400): Find a fix for wayland as well.
// Must be defined inside IS_LINUX to compile on windows/mac.

4
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -309,7 +309,7 @@ const struct {
@@ -313,7 +313,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif

16
www/iridium/files/patch-chrome_browser_flag__descriptions.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/flag_descriptions.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -6087,7 +6087,7 @@ const char kLibAssistantV2MigrationDescription[] =
@@ -6166,7 +6166,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -9,7 +9,7 @@
const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API";
const char kGetDisplayMediaSetDescription[] =
"When enabled, the getDisplayMediaSet API for capturing multiple surfaces "
@@ -6316,7 +6316,7 @@ const char kSearchWebInSidePanelDescription[] =
@@ -6402,7 +6402,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.";
@@ -6325,7 +6325,7 @@ const char kQuickCommandsDescription[] =
@@ -6411,7 +6411,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.";
@@ -6346,7 +6346,7 @@ const char kWebShareDescription[] =
@@ -6432,7 +6432,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -36,7 +36,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -6366,7 +6366,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -6452,7 +6452,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -45,7 +45,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -6380,7 +6380,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -6466,7 +6466,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -54,7 +54,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -6481,7 +6481,7 @@ const char kElasticOverscrollDescription[] =
@@ -6567,7 +6567,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

14
www/iridium/files/patch-chrome_browser_flag__descriptions.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/flag_descriptions.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/flag_descriptions.h
@@ -3520,7 +3520,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
@@ -3568,7 +3568,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
extern const char kLacrosScreenCoordinatesEnabledDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -9,7 +9,7 @@
extern const char kGetDisplayMediaSetName[];
extern const char kGetDisplayMediaSetDescription[];
@@ -3639,14 +3639,14 @@ extern const char kSearchWebInSidePanelDescription[];
@@ -3690,14 +3690,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)
@@ -3656,7 +3656,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -3707,7 +3707,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[];
@@ -3666,7 +3666,7 @@ extern const char kOzonePlatformHintName[];
@@ -3717,7 +3717,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[];
@@ -3674,13 +3674,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -3725,13 +3725,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) ||
@@ -3760,7 +3760,7 @@ extern const char kElasticOverscrollDescription[];
@@ -3811,7 +3811,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

7
www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -10,11 +10,11 @@
@@ -10,12 +10,12 @@
// New headless mode is available on Linux, Windows and Mac platforms.
// More platforms will be added later, so avoid function level clutter
// by providing stub implementations at the end of the file.
@ -8,13 +8,14 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "base/base_switches.h"
#include "chrome/common/chrome_switches.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
@@ -64,7 +64,7 @@ void SetUpCommandLine(const base::CommandLine* command
@@ -72,7 +72,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
::switches::kNoErrorDialogs);
}

4
www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-10-05 07:34:01 UTC
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -362,6 +362,10 @@ void WebRtcLogUploader::SetupMultipart(
@@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart(
const char product[] = "Chrome_ChromeOS";
#elif BUILDFLAG(IS_FUCHSIA)
const char product[] = "Chrome_Fuchsia";

22
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -61,8 +61,10 @@
@ -12,7 +12,16 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -491,7 +493,7 @@ void RecordStartupMetrics() {
@@ -92,7 +94,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -495,7 +497,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -21,3 +30,12 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -685,7 +687,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>();
#endif // BUILDFLAG(IS_LINUX)
}

20
www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
@@ -22,7 +22,7 @@ class PowerMetricsReporter;
class ProcessMonitor;
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
class PressureMetricsReporter;
#endif // BUILDFLAG(IS_LINUX)
@@ -88,7 +88,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
#endif // !BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Reports pressure metrics.
std::unique_ptr<PressureMetricsReporter> pressure_metrics_reporter_;
#endif // BUILDFLAG(IS_LINUX)

12
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -174,7 +174,7 @@
@@ -176,7 +176,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -736,7 +736,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -738,7 +738,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -18,7 +18,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -817,7 +817,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -819,7 +819,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -27,7 +27,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -915,7 +915,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -919,7 +919,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -36,7 +36,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1099,7 +1099,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1103,7 +1103,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

37
www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -92,7 +92,7 @@
@@ -93,7 +93,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -177,7 +177,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -178,7 +178,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -455,7 +455,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -456,7 +456,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -27,7 +27,16 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -527,7 +527,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -489,7 +489,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
base::Unretained(this)));
#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)
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -539,7 +539,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -36,3 +45,21 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -568,7 +568,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- 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,
@@ -944,7 +944,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
#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)
void SystemNetworkContextManager::UpdateEnforceLocalAnchorConstraintsEnabled() {
const PrefService::Preference* enforce_local_anchor_constraints_enabled_pref =
local_state_->FindPreference(

11
www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/net/system_network_context_manager.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/net/system_network_context_manager.h
@@ -194,7 +194,7 @@ class SystemNetworkContextManager {
void UpdateExplicitlyAllowedNetworkPorts();
#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)
// Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
// pref to the enforcement state.
void UpdateEnforceLocalAnchorConstraintsEnabled();

8
www/iridium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2022-03-28 18:11:04 UTC
--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/new_tab_page/modules/drive/drive_service.cc
@@ -28,7 +28,7 @@
#include "services/network/public/cpp/resource_request.h"
namespace {
-#if OS_LINUX
+#if defined(OS_LINUX) || defined(OS_BSD)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
constexpr char kPlatform[] = "LINUX";
#elif OS_WIN
#elif BUILDFLAG(IS_WIN)
constexpr char kPlatform[] = "WINDOWS";

53
www/iridium/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-03-13 07:33:08 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -201,17 +201,17 @@
@@ -202,17 +202,17 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -21,7 +21,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -745,14 +745,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -755,14 +755,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -38,8 +38,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1382,7 +1382,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
@@ -1399,7 +1399,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@ -47,7 +47,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1452,18 +1452,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1469,18 +1469,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -69,7 +69,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1476,7 +1476,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1493,7 +1493,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) \
@ -78,7 +78,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1583,7 +1583,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1597,7 +1597,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -87,7 +87,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1670,13 +1670,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1684,13 +1684,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -103,7 +103,16 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1723,7 +1723,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1721,7 +1721,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#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)
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1750,7 +1750,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \
@ -112,16 +121,16 @@
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
@@ -1783,7 +1783,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kPrefixedStorageInfoEnabled,
storage::kPrefixedStorageInfoEnabled,
base::Value::Type::BOOLEAN },
@@ -1810,7 +1810,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
@@ -1828,7 +1828,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1855,7 +1855,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(ENABLE_PPAPI)
@ -130,7 +139,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2092,7 +2092,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2119,7 +2119,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -139,7 +148,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2150,7 +2150,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2177,7 +2177,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -148,7 +157,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2185,7 +2185,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2212,7 +2212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -157,7 +166,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -2526,7 +2526,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2559,7 +2559,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
extensions::pref_names::kManifestV2Availability, /*min=*/0, /*max=*/3,
/*clamp=*/false));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -166,7 +175,7 @@
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2539,7 +2539,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2572,7 +2572,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -175,7 +184,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2547,7 +2547,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2580,7 +2580,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -184,7 +193,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2560,7 +2560,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2593,7 +2593,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));

49
www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc
View file

@ -1,12 +1,11 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -458,14 +458,14 @@
@@ -458,13 +458,13 @@
#include "components/os_crypt/os_crypt.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/web_applications/url_handler_prefs.h"
#include "components/device_signals/core/browser/pref_names.h"
#endif
@ -17,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -498,7 +498,7 @@
@@ -497,7 +497,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -26,7 +25,25 @@
#include "ui/color/system_theme.h"
#endif
@@ -1069,7 +1069,7 @@ void RegisterProfilePrefsForMigration(
@@ -790,7 +790,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -872,7 +872,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
}
@@ -985,7 +985,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@ -35,16 +52,7 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1346,7 +1346,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1683,11 +1683,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1623,11 +1623,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
@ -58,7 +66,16 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -2086,7 +2086,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
@@ -1824,7 +1824,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1969,7 +1969,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif

4
www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = {
@@ -167,7 +167,7 @@ const char* const kPersistentPrefNames[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -547,7 +547,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
@@ -811,7 +811,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -813,7 +813,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@ -18,7 +18,7 @@
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
@@ -868,7 +868,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -870,7 +870,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:

42
www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
View file

@ -1,6 +1,13 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -262,7 +262,7 @@
@@ -338,17 +338,17 @@
#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/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +16,36 @@
#include "chrome/browser/enterprise/idle/idle_service_factory.h"
#endif
@@ -451,12 +451,12 @@ void ChromeBrowserMainExtraPartsProfiles::
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
#endif
@@ -495,7 +495,7 @@ void ChromeBrowserMainExtraPartsProfiles::
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
browser_sync::UserEventServiceFactory::GetInstance();
-#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
BrowsingDataHistoryObserverService::Factory::GetInstance();
@@ -557,12 +557,12 @@ void ChromeBrowserMainExtraPartsProfiles::
DomainDiversityReporterFactory::GetInstance();
dom_distiller::DomDistillerServiceFactory::GetInstance();
DownloadCoreServiceFactory::GetInstance();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
enterprise_signals::SignalsAggregatorFactory::GetInstance();
#endif
enterprise::ProfileIdServiceFactory::GetInstance();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
#endif
@@ -660,12 +660,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -257,6 +257,10 @@
@@ -261,6 +261,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -863,7 +867,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -868,7 +872,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

8
www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/renderer_preferences_util.cc.orig 2022-12-01 10:35:46 UTC
--- chrome/browser/renderer_preferences_util.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -37,7 +37,7 @@
@@ -36,7 +36,7 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/linux/linux_ui.h"
@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -155,7 +155,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()) {
@@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -178,7 +178,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

4
www/iridium/files/patch-chrome_browser_resources_settings_route.ts
View file

@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/route.ts.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/resources/settings/route.ts.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/resources/settings/route.ts
@@ -220,7 +220,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
@@ -223,7 +223,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));

4
www/iridium/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 2022-12-06 08:09:13 UTC
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -20,7 +20,7 @@
#include "content/public/browser/browser_thread.h"
@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
@@ -325,7 +325,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)

10
www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-12-06 08:09:13 UTC
--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -18,7 +18,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@ -18,12 +18,12 @@
void StartExtractDocumentFeatures();
void OnDocumentAnalysisFinished(
const DocumentAnalyzerResults& document_results);
@@ -133,7 +133,7 @@ class FileAnalyzer {
scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_;
@@ -136,7 +136,7 @@ class FileAnalyzer {
dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
scoped_refptr<SandboxedDocumentAnalyzer> document_analyzer_;
std::unique_ptr<SandboxedDocumentAnalyzer, base::OnTaskRunnerDeleter>
document_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
base::TimeTicks document_analysis_start_time_;
#endif

10
www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -126,7 +126,7 @@
@@ -127,7 +127,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
@@ -467,7 +467,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -469,7 +469,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -18,7 +18,7 @@
if (features::kTabGroupsSaveSyncIntegration.Get()) {
controllers.push_back(std::make_unique<syncer::ModelTypeController>(
syncer::SAVED_TAB_GROUP,
@@ -480,7 +480,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -482,7 +482,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.
@ -27,7 +27,7 @@
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
@@ -639,7 +639,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
@@ -641,7 +641,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

8
www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -75,7 +75,7 @@
@@ -76,7 +76,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
@@ -116,7 +116,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -117,7 +117,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
@@ -250,7 +250,7 @@ SyncServiceFactory::SyncServiceFactory()
@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ThemeServiceFactory::GetInstance());
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

4
www/iridium/files/patch-chrome_browser_ui_browser.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser.h.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/browser.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/browser.h
@@ -280,7 +280,7 @@ class Browser : public TabStripModelObserver,
@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver,
int32_t restore_id = kDefaultRestoreId;
#endif

10
www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -105,7 +105,7 @@
@@ -104,7 +104,7 @@
#include "components/user_manager/user_manager.h"
#endif
@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
@@ -294,7 +294,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
@@ -546,7 +546,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -1101,7 +1101,7 @@ void BrowserCommandController::InitCommandState() {
@@ -1104,7 +1104,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/chrome_pages.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -68,7 +68,7 @@
@@ -69,7 +69,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
@@ -641,7 +641,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -651,7 +651,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

6
www/iridium/files/patch-chrome_browser_ui_chrome__pages.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.h.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/chrome_pages.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -33,7 +33,7 @@ enum class ConsentLevel;
@@ -34,7 +34,7 @@ enum class ConsentLevel;
} // namespace signin
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
@@ -225,7 +225,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -241,7 +241,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

8
www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2022-10-05 07:34:01 UTC
--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
@@ -37,7 +37,7 @@ class SharingHubBubbleController {
virtual bool ShouldOfferOmniboxIcon() = 0;
@ -6,6 +6,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// These two methods return the sets of first- and third-party actions;
// first-party actions are internal to Chrome and third-party actions are
// other websites or apps.
// This method returns the set of first-party actions, which are actions
// internal to Chrome. Third-party actions (those outside Chrome) are
// currently not supported.

17
www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@ -6,10 +6,19 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
#include "components/headless/policy/headless_mode_policy.h"
@@ -918,7 +918,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
@@ -1022,7 +1022,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -18,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) &&
@@ -1198,7 +1198,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1214,7 +1214,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/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -205,7 +205,7 @@
@@ -203,7 +203,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"
@@ -543,12 +543,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -542,12 +542,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) || \

8
www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -47,7 +47,7 @@
#include "components/user_manager/user_manager.h"
@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
@@ -271,7 +271,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@@ -290,7 +290,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@ -27,7 +27,7 @@
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
@@ -394,7 +394,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -413,7 +413,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@ -36,7 +36,7 @@
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
@@ -411,7 +411,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -430,7 +430,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;

6
www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-01-17 19:19:00 UTC
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@ -9,7 +9,7 @@
#include "ui/base/ui_base_types.h"
#endif
@@ -63,7 +63,7 @@ class BrowserFrame : public views::Widget, public view
@@ -64,7 +64,7 @@ class BrowserFrame : public views::Widget, public view
~BrowserFrame() override;
@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
@@ -210,7 +210,7 @@ class BrowserFrame : public views::Widget, public view
@@ -223,7 +223,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;

4
www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -2033,7 +2033,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -2092,7 +2092,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.

10
www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -55,7 +55,7 @@
@@ -56,7 +56,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
#include "ui/views/window/window_shape.h"
@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
@@ -555,7 +555,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
@@ -585,7 +585,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -18,7 +18,7 @@
return FrameButtonStyle::kMdButton;
#else
return FrameButtonStyle::kImageButton;
@@ -578,7 +578,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
@@ -608,7 +608,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
return false;
}
@ -27,7 +27,7 @@
ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
return frame()->tiled_edges();
}
@@ -774,7 +774,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
@@ -810,7 +810,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {

8
www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-01-17 19:19:00 UTC
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -113,7 +113,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
@@ -117,7 +117,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
const gfx::Rect& bounding_rect) const override;
bool IsTranslucentWindowOpacitySupported() const override;
bool ShouldDrawRestoredFrameShadow() const override;
@ -8,8 +8,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
ui::WindowTiledEdges GetTiledEdges() const override;
#endif
@@ -229,7 +229,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
int WebAppButtonHeight() const override;
@@ -234,7 +234,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
// Background painter for the window frame.
std::unique_ptr<views::FrameBackground> frame_background_;

14
www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -40,7 +40,7 @@
#include "ui/aura/window.h"
@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
@@ -460,7 +460,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
@@ -469,7 +469,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)));
@@ -505,7 +505,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
@@ -514,7 +514,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -710,7 +710,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
@@ -719,7 +719,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_) {
@@ -833,7 +833,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
@@ -842,7 +842,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();
@@ -854,7 +854,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
@@ -863,7 +863,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@ -81,7 +81,7 @@
return FrameBorderInsets();
#else
return gfx::Insets(kResizeBorder);
@@ -865,7 +865,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
@@ -874,7 +874,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
return FrameBorderInsets().top() + kTopControlsHeight;
}

8
www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/controls/image_view.h"
@ -9,7 +9,7 @@
#include "ui/linux/window_frame_provider.h"
#endif
@@ -74,7 +74,7 @@ class PictureInPictureBrowserFrameView
@@ -78,7 +78,7 @@ class PictureInPictureBrowserFrameView
void Layout() override;
void AddedToWidget() override;
void RemovedFromWidget() override;
@ -18,7 +18,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
@@ -155,7 +155,7 @@ class PictureInPictureBrowserFrameView
@@ -159,7 +159,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@ -27,7 +27,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
@@ -218,7 +218,7 @@ class PictureInPictureBrowserFrameView
@@ -222,7 +222,7 @@ class PictureInPictureBrowserFrameView
gfx::MultiAnimation show_close_button_animation_;
gfx::MultiAnimation hide_close_button_animation_;

20
www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -81,7 +81,7 @@
@@ -82,7 +82,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
@ -9,7 +9,7 @@
#include "ui/aura/client/drag_drop_client.h"
#endif
@@ -259,7 +259,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
@@ -260,7 +260,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
@ -18,16 +18,16 @@
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
@@ -511,7 +511,7 @@ void TabDragController::Init(TabDragContext* source_co
@@ -512,7 +512,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
// - Chrome OS
// - ChromeOS Ash
// Releasing capture on Ash cancels gestures so avoid it.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
@@ -1112,7 +1112,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
@@ -1151,7 +1151,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,7 +36,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
@@ -2106,7 +2106,7 @@ void TabDragController::CompleteDrag() {
@@ -2202,7 +2202,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@ -45,7 +45,7 @@
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
@@ -2500,7 +2500,7 @@ TabDragController::Liveness TabDragController::GetLoca
@@ -2596,7 +2596,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-12-01 10:35:46 UTC
--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
@@ -79,7 +79,7 @@ void FixWidgetStackOrder(views::Widget* widget, const
@@ -78,7 +78,7 @@ void FixWidgetStackOrder(views::Widget* widget, const
return;
}

34
www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -385,7 +385,7 @@ std::string GetFileExtension(FileExtension file_extens
@@ -401,7 +401,7 @@ std::string GetFileExtension(FileExtension file_extens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
@@ -559,7 +559,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
@@ -582,7 +582,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
}
#endif
@ -18,7 +18,7 @@
bool IconManagerCheckIconTopLeftColor(WebAppIconManager& icon_manager,
const AppId& app_id,
std::vector<int> sizes_px,
@@ -890,7 +890,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
@@ -917,7 +917,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts.";
// TODO(crbug.com/1273568): Investigate the true source of flakiness instead
// of papering over it here.
@ -27,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts());
#endif
LOG(INFO)
@@ -1637,7 +1637,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
@@ -1715,7 +1715,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@ -36,7 +36,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
@@ -2591,7 +2591,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
@@ -2749,7 +2749,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@ -45,7 +45,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -2605,7 +2605,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -2764,7 +2764,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@ -54,25 +54,25 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -2615,7 +2615,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -2774,7 +2774,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (!BeforeStateCheckAction(__FUNCTION__))
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
ASSERT_TRUE(IsFileHandledBySite(site, file_extension));
@@ -2626,7 +2626,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
}
@@ -2786,7 +2786,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (!BeforeStateCheckAction(__FUNCTION__))
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
ASSERT_FALSE(IsFileHandledBySite(site, file_extension));
@@ -3137,7 +3137,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
}
@@ -3362,7 +3362,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const AppId& app_id) {
@ -81,7 +81,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
@@ -3307,7 +3307,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
@@ -3537,7 +3537,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@ -90,7 +90,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
@@ -3351,7 +3351,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
@@ -3581,7 +3581,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}
@ -99,7 +99,7 @@
SkColor expected_icon_pixel_color =
GetSiteConfigurationFromAppName(name).icon_color;
do_icon_colors_match = IconManagerCheckIconTopLeftColor(
@@ -3404,7 +3404,7 @@ bool WebAppIntegrationTestDriver::IsFileHandledBySite(
@@ -3634,7 +3634,7 @@ bool WebAppIntegrationTestDriver::IsFileHandledBySite(
app_id);
is_file_handled =
shell_integration::CanApplicationHandleURL(app_path, test_file_url);

6
www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/about_ui.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/webui/about_ui.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/webui/about_ui.cc
@@ -603,7 +603,7 @@ std::string ChromeURLs() {
@@ -602,7 +602,7 @@ std::string ChromeURLs() {
return html;
}
@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest(
@@ -656,7 +656,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}

15
www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
View file

@ -1,8 +1,17 @@
--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
@@ -392,7 +392,7 @@ void AppHomePageHandler::FillExtensionInfoList(
@@ -353,7 +353,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
bool deprecated_app = false;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
auto* context = extension_system_->extension_service()->GetBrowserContext();
deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
@@ -419,7 +419,7 @@ void AppHomePageHandler::FillExtensionInfoList(
bool is_deprecated_app = false;
auto* context = extension_service_->GetBrowserContext();
auto* context = extension_system_->extension_service()->GetBrowserContext();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)

14
www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -325,7 +325,7 @@
@@ -329,7 +329,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
@@ -351,17 +351,17 @@
@@ -355,17 +355,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
@@ -721,7 +721,7 @@ bool IsAboutUI(const GURL& url) {
@@ -735,7 +735,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1017,7 +1017,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<ash::personalization_app::PersonalizationAppUI>;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
@@ -1075,7 +1075,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1092,7 +1092,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
@@ -1139,27 +1139,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1159,27 +1159,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

10
www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -125,7 +125,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
@ -18,7 +18,7 @@
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -233,7 +233,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
@@ -234,7 +234,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
#endif
html_source->AddBoolean("isChildAccount", profile->IsChild());
@ -27,7 +27,7 @@
bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
#else
bool allow_qt_theme = false;
@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
{"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
{"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@ -36,7 +36,7 @@
{"gtkTheme", IDS_SETTINGS_GTK_THEME},
{"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
{"qtTheme", IDS_SETTINGS_QT_THEME},
@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -390,7 +390,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@ -45,7 +45,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
@@ -411,7 +411,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/web_applications/commands/install_app_locally_command.cc
@@ -84,7 +84,7 @@ void InstallAppLocallyCommand::StartWithLock(
@@ -71,7 +71,7 @@ void InstallAppLocallyCommand::StartWithLock(
options.os_hooks[OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();

22
www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-03-13 07:33:08 UTC
--- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-04-22 17:45:15 UTC
+++ chrome/browser/web_applications/os_integration/os_integration_test_override.cc
@@ -147,7 +147,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled(
@@ -179,7 +179,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled(
Profile* profile,
const AppId& app_id,
const std::string& app_name) {
@ -9,7 +9,7 @@
std::string shortcut_filename =
"chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
return base::PathExists(startup().Append(shortcut_filename));
@@ -217,7 +217,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP
@@ -349,7 +349,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP
app_installed_profiles.end()) {
return shortcut_path;
}
@ -18,7 +18,7 @@
std::string shortcut_filename =
"chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
@@ -242,7 +242,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof
@@ -374,7 +374,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof
base::FilePath app_shortcut_path =
GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
return base::PathExists(app_shortcut_path);
@ -27,7 +27,7 @@
base::FilePath desktop_shortcut_path =
GetShortcutPath(profile, desktop(), app_id, app_name);
return base::PathExists(desktop_shortcut_path);
@@ -270,7 +270,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut
@@ -402,7 +402,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut
GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
DCHECK(base::PathExists(app_folder_shortcut_path));
return base::DeletePathRecursively(app_folder_shortcut_path);
@ -36,7 +36,7 @@
base::FilePath desktop_shortcut_path =
GetShortcutPath(profile, desktop(), app_id, app_name);
LOG(INFO) << desktop_shortcut_path;
@@ -287,7 +287,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut
@@ -419,7 +419,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut
return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin();
#elif BUILDFLAG(IS_MAC)
return DeleteChromeAppsDir();
@ -45,7 +45,7 @@
return DeleteDesktopDirOnLinux();
#else
NOTREACHED() << "Not implemented on ChromeOS/Fuchsia ";
@@ -327,7 +327,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL
@@ -459,7 +459,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL
startup_enabled_[file_path] = enable_on_login;
}
@ -54,7 +54,7 @@
bool OsIntegrationTestOverride::DeleteDesktopDirOnLinux() {
if (desktop_.IsValid()) {
return desktop_.Delete();
@@ -360,7 +360,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
@@ -492,7 +492,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
#elif BUILDFLAG(IS_MAC)
bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
DCHECK(success);
@ -63,7 +63,7 @@
bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
DCHECK(success);
success = startup_.CreateUniqueTempDirUnderPath(base_path);
@@ -379,7 +379,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
@@ -511,7 +511,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
#elif BUILDFLAG(IS_MAC)
bool success = chrome_apps_folder_.CreateUniqueTempDir();
DCHECK(success);
@ -72,7 +72,7 @@
bool success = desktop_.CreateUniqueTempDir();
DCHECK(success);
success = startup_.CreateUniqueTempDir();
@@ -387,7 +387,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
@@ -519,7 +519,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
#endif
}
@ -81,7 +81,7 @@
auto callback =
base::BindRepeating([](base::FilePath filename, std::string xdg_command,
std::string file_contents) {
@@ -421,7 +421,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride(
@@ -553,7 +553,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride(
}
}
}

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