sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/chromium: update to 118.0.5993.70

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/07ee8c14-68f1-11ee-8290-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2023-10-12 13:15:31 +02:00
parent 5322ba7548
commit d948a72206
294 changed files with 1774 additions and 1381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/chromium/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= chromium
PORTVERSION= 117.0.5938.149
PORTREVISION= 2
PORTVERSION= 118.0.5993.70
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external

14
www/chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1696414784
SHA256 (chromium-117.0.5938.149.tar.xz) = ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df
SIZE (chromium-117.0.5938.149.tar.xz) = 3141300340
SHA256 (chrome-linux-117.0.5938.149-llvm13.profdata.tar.xz) = ed73d6b2643dd3060670c99c4c708b10d2e5403d7f6edcf8489591a813b48993
SIZE (chrome-linux-117.0.5938.149-llvm13.profdata.tar.xz) = 28666288
SHA256 (chromium-117.0.5938.149-testdata.tar.xz) = 385aeae97e66a66ef0adab0397538a99d9ac59c3bb4c715f63ae1431cfb89248
SIZE (chromium-117.0.5938.149-testdata.tar.xz) = 264315044
TIMESTAMP = 1697050996
SHA256 (chromium-118.0.5993.70.tar.xz) = 49ee00a734de3dae7c421eb3c974e8d451b4de6f5b4e34b603fd6435eab6993d
SIZE (chromium-118.0.5993.70.tar.xz) = 3236238920
SHA256 (chrome-linux-118.0.5993.70-llvm13.profdata.tar.xz) = bd3bf4191752db7ccaa9c29e246f82f29f69a953c03ede7c818ff11d5db629f7
SIZE (chrome-linux-118.0.5993.70-llvm13.profdata.tar.xz) = 28957632
SHA256 (chromium-118.0.5993.70-testdata.tar.xz) = f02faeaa1dbc06ba8dbb61caddb9015e213fa548fc27b18533d75ce5cae08ee0
SIZE (chromium-118.0.5993.70-testdata.tar.xz) = 267730908
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

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

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -422,7 +421,7 @@ group("gn_all") {
@@ -417,7 +416,7 @@ group("gn_all") {
}
}
@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -622,6 +621,15 @@ group("gn_all") {
@@ -617,6 +616,15 @@ group("gn_all") {
}
}
@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -671,7 +679,7 @@ group("gn_all") {
@@ -666,7 +674,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)" ]
}
@@ -1095,7 +1103,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1094,7 +1102,7 @@ if (use_blink && !is_cronet_build) {
]
}
@ -60,7 +60,7 @@
script_test("webdriver_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1185,7 +1193,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1194,7 +1202,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1193,7 +1201,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
@@ -1653,7 +1661,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

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

@ -1,4 +1,4 @@
--- base/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- base/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ base/BUILD.gn
@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1112,11 +1112,23 @@ component("base") {
@@ -1111,11 +1111,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.
@ -33,8 +33,8 @@
+
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_mac.h" ]
@@ -1133,7 +1145,7 @@ component("base") {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1135,7 +1147,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2075,6 +2087,22 @@ component("base") {
@@ -2080,6 +2092,22 @@ component("base") {
]
}
@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2207,6 +2235,29 @@ component("base") {
@@ -2212,6 +2240,29 @@ component("base") {
}
}
@ -96,7 +96,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2217,7 +2268,7 @@ component("base") {
@@ -2222,7 +2273,7 @@ component("base") {
}
if (dep_libevent) {
@ -105,7 +105,7 @@
}
if (use_libevent) {
@@ -3587,7 +3638,7 @@ test("base_unittests") {
@@ -3596,7 +3647,7 @@ test("base_unittests") {
]
}
@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3608,7 +3659,7 @@ test("base_unittests") {
@@ -3617,7 +3668,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3619,7 +3670,7 @@ test("base_unittests") {
@@ -3628,7 +3679,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3871,7 +3922,7 @@ test("base_unittests") {
@@ -3884,7 +3935,7 @@ test("base_unittests") {
}
}

4
www/chromium/files/patch-base_allocator_partition__allocator_BUILD.gn
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ base/allocator/partition_allocator/BUILD.gn
@@ -541,7 +541,7 @@ source_set("allocator_shim") {
@@ -562,7 +562,7 @@ source_set("allocator_shim") {
]
configs += [ ":mac_no_default_new_delete_symbols" ]
}

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-09-13 12:11:42 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-11 18:22:24 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -332,7 +332,7 @@ declare_args() {
@@ -328,7 +328,7 @@ declare_args() {
# pkeys support is explicitly disabled in all Cronet builds, as some test
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.

34
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc Normal file
View file

@ -0,0 +1,34 @@
--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-10-11 18:22:24 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
@@ -12,11 +12,11 @@
#include <string.h>
#include <unistd.h>
-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
#include <link.h> // For ElfW() macro.
#endif
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
#define HAVE_DLADDR
#include <dlfcn.h>
#endif
@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
namespace {
-#if !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
constexpr size_t kBufferSize = 4096u;
@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_
}
#endif // !BUILDFLAG(IS_APPLE)
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
// Since /proc/self/maps is not available, use dladdr() to obtain module
// names and offsets inside the modules from the given addresses.
void PrintStackTraceInternal(void* const* trace, size_t size) {

6
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-09-13 12:11:42 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-10-11 18:22:24 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
@ -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,
@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false;
@@ -237,7 +237,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.
@@ -283,7 +283,7 @@ constexpr bool kUseLazyCommit = false;
@@ -284,7 +284,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() \

10
www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-09-13 12:11:42 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-10-11 18:22:24 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -46,7 +46,7 @@
@@ -47,7 +47,7 @@
#include "wow64apiset.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -849,7 +849,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

6
www/chromium/files/patch-base_base__switches.cc
View file

@ -1,7 +1,7 @@
--- base/base_switches.cc.orig 2023-09-13 12:11:42 UTC
--- base/base_switches.cc.orig 2023-10-11 18:22:24 UTC
+++ base/base_switches.cc
@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na
const char kPackageVersionCode[] = "package-version-code";
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

6
www/chromium/files/patch-base_base__switches.h
View file

@ -1,7 +1,7 @@
--- base/base_switches.h.orig 2023-09-13 12:11:42 UTC
--- base/base_switches.h.orig 2023-10-11 18:22:24 UTC
+++ base/base_switches.h
@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[];
extern const char kForceFieldTrialParams[];
@@ -62,7 +62,7 @@ extern const char kPackageVersionName[];
extern const char kPackageVersionCode[];
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

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

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2023-09-13 12:11:42 UTC
--- base/system/sys_info.h.orig 2023-10-11 18:22:24 UTC
+++ base/system/sys_info.h
@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo {
@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo {
static void ResetCpuSecurityMitigationsEnabledForTesting();
#endif
@ -9,7 +9,7 @@
private:
friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo {
@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

6
www/chromium/files/patch-base_test_launcher_test__launcher.cc
View file

@ -1,7 +1,7 @@
--- base/test/launcher/test_launcher.cc.orig 2023-05-31 08:12:17 UTC
--- base/test/launcher/test_launcher.cc.orig 2023-10-11 18:22:24 UTC
+++ base/test/launcher/test_launcher.cc
@@ -69,6 +69,7 @@
#include "third_party/libxml/chromium/libxml_utils.h"
@@ -68,6 +68,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_POSIX)
+#include <signal.h>

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

@ -0,0 +1,11 @@
--- base/threading/hang_watcher.cc.orig 2023-10-11 18:22:24 UTC
+++ base/threading/hang_watcher.cc
@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
if (is_zygote_child) {
enable_hang_watcher =
enable_hang_watcher &&

4
www/chromium/files/patch-base_trace__event_trace__log.cc
View file

@ -1,6 +1,6 @@
--- base/trace_event/trace_log.cc.orig 2023-09-13 12:11:42 UTC
--- base/trace_event/trace_log.cc.orig 2023-10-11 18:22:24 UTC
+++ base/trace_event/trace_log.cc
@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting(
@@ -2190,8 +2190,13 @@ void TraceLog::SetTraceBufferForTesting(
#if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
AutoLock lock(track_event_lock_);

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

@ -1,6 +1,15 @@
--- build/config/compiler/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- build/config/compiler/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ build/config/compiler/BUILD.gn
@@ -248,13 +248,16 @@ config("default_include_dirs") {
@@ -192,7 +192,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
# debugging information which is required by some specialized
# debugging tools.
- simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
+ simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd
}
declare_args() {
@@ -256,13 +256,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 +27,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -499,6 +502,10 @@ config("compiler") {
@@ -507,6 +510,10 @@ config("compiler") {
}
}
@ -29,7 +38,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -574,7 +581,7 @@ config("compiler") {
@@ -582,7 +589,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -38,7 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -759,7 +766,7 @@ config("compiler") {
@@ -768,7 +775,7 @@ config("compiler") {
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
@ -47,16 +56,7 @@
# TODO(https://crbug.com/972449): turn on for ChromeOS when that
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
@@ -866,7 +873,7 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
- if (is_clang && !is_nacl && !is_win && !is_apple) {
+ if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) {
cflags_cc += [ "-gsimple-template-names" ]
}
@@ -1108,7 +1115,7 @@ config("compiler_cpu_abi") {
@@ -1112,7 +1119,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -1123,7 +1130,7 @@ config("compiler_cpu_abi") {
@@ -1127,7 +1134,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -74,7 +74,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1458,7 +1465,7 @@ config("compiler_deterministic") {
@@ -1462,7 +1469,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@ -83,7 +83,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1510,7 +1517,7 @@ config("compiler_deterministic") {
@@ -1514,7 +1521,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -92,7 +92,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1764,7 +1771,7 @@ config("default_warnings") {
@@ -1778,7 +1785,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -101,7 +101,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1973,7 +1980,7 @@ config("no_chromium_code") {
@@ -1991,7 +1998,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -110,7 +110,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2483,7 +2490,7 @@ config("afdo_optimize_size") {
@@ -2501,7 +2508,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@ -119,7 +119,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2510,7 +2517,7 @@ config("afdo") {
@@ -2528,7 +2535,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -128,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2674,7 +2681,8 @@ config("symbols") {
@@ -2692,7 +2699,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

4
www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn
View file

@ -1,6 +1,6 @@
--- build/config/compiler/pgo/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- build/config/compiler/pgo/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ build/config/compiler/pgo/BUILD.gn
@@ -138,13 +138,14 @@ config("pgo_optimization_flags") {
@@ -143,13 +143,14 @@ config("pgo_optimization_flags") {
# Enable basic block layout based on the extended TSP problem. This aims to
# improve icache utilization and reduce the binary size.

4
www/chromium/files/patch-build_config_ozone.gni
View file

@ -1,6 +1,6 @@
--- build/config/ozone.gni.orig 2022-08-31 12:19:35 UTC
--- build/config/ozone.gni.orig 2023-10-11 18:22:24 UTC
+++ build/config/ozone.gni
@@ -87,7 +87,15 @@ declare_args() {
@@ -84,7 +84,15 @@ declare_args() {
} else if (is_chromeos_lacros) {
ozone_platform = "wayland"
ozone_platform_wayland = true

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

@ -1,6 +1,6 @@
--- build/toolchain/toolchain.gni.orig 2023-09-13 12:11:42 UTC
--- build/toolchain/toolchain.gni.orig 2023-10-11 18:22:24 UTC
+++ build/toolchain/toolchain.gni
@@ -62,7 +62,7 @@ if (host_os == "mac") {
@@ -67,7 +67,7 @@ if (host_os == "mac") {
host_shlib_extension = ".dylib"
} else if (host_os == "win") {
host_shlib_extension = ".dll"

8
www/chromium/files/patch-cc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- cc/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ cc/BUILD.gn
@@ -671,7 +671,7 @@ cc_test_static_library("test_support") {
@@ -674,7 +674,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -8,8 +8,8 @@
+ if (!is_android && !is_bsd) {
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -919,7 +919,6 @@ cc_test("cc_unittests") {
if (skia_use_dawn) {
@@ -929,7 +929,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

10
www/chromium/files/patch-cc_base_features.cc
View file

@ -1,11 +1,11 @@
--- cc/base/features.cc.orig 2023-09-13 12:11:42 UTC
--- cc/base/features.cc.orig 2023-10-11 18:22:24 UTC
+++ cc/base/features.cc
@@ -71,7 +71,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
@@ -85,7 +85,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
// be using a separate flag to control the launch on GL.
BASE_FEATURE(kUseDMSAAForTiles,
"UseDMSAAForTiles",
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT

24
www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -139,7 +139,7 @@
@@ -143,7 +143,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -182,16 +182,16 @@
@@ -186,16 +186,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
@@ -330,7 +330,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -334,7 +334,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
@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -419,7 +419,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) ||
@@ -542,7 +542,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -546,7 +546,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.
@@ -632,7 +632,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -636,7 +636,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -959,7 +959,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -994,7 +994,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
@ -74,7 +74,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1106,7 +1106,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1141,7 +1141,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -83,7 +83,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1136,7 +1136,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1171,7 +1171,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1526,7 +1526,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1561,7 +1561,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -101,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1628,7 +1628,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1663,7 +1663,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.

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

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-09-29 10:14:06 UTC
--- chrome/app/generated_resources.grd.orig 2023-10-11 18:22:24 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.
-->
@@ -3575,7 +3575,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3601,7 +3601,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>
@@ -5406,7 +5406,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -5432,7 +5432,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>
@@ -6095,7 +6095,7 @@ Keep your key file in a safe place. You will need it t
@@ -6145,7 +6145,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>
@@ -6141,7 +6141,7 @@ Keep your key file in a safe place. You will need it t
@@ -6191,7 +6191,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>
@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10396,7 +10396,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
@ -54,7 +54,7 @@
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10743,7 +10743,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -63,7 +63,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -11728,7 +11728,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>
<!-- Device Trust Consent dialog -->
@ -72,7 +72,7 @@
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share information about your device?
</message>
@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12136,7 +12136,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -14346,7 +14346,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

21
www/chromium/files/patch-chrome_app_settings__strings.grdp
View file

@ -1,6 +1,21 @@
--- chrome/app/settings_strings.grdp.orig 2023-09-13 12:11:42 UTC
--- chrome/app/settings_strings.grdp.orig 2023-10-11 18:22:24 UTC
+++ chrome/app/settings_strings.grdp
@@ -207,7 +207,7 @@
@@ -183,12 +183,12 @@
Manage accessibility features
</message>
</if>
- <if expr="is_win or is_linux or is_macosx">
+ <if expr="is_win or is_posix or is_macosx">
<message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE" desc="Title for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
Swipe between pages
</message>
</if>
- <if expr="is_win or is_linux">
+ <if expr="is_win or is_posix">
<message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
Navigate back and forward with swipe gesture
</message>
@@ -222,7 +222,7 @@
Theme
</message>
</if>
@ -9,7 +24,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
@@ -227,7 +227,7 @@
@@ -242,7 +242,7 @@
Use Classic
</message>
</if>

12
www/chromium/files/patch-chrome_app_theme_theme__resources.grd
View file

@ -1,6 +1,6 @@
--- chrome/app/theme/theme_resources.grd.orig 2023-09-13 12:11:42 UTC
--- chrome/app/theme/theme_resources.grd.orig 2023-10-11 18:22:24 UTC
+++ chrome/app/theme/theme_resources.grd
@@ -143,14 +143,14 @@
@@ -146,14 +146,14 @@
</if>
<if expr="_google_chrome">
<then>
@ -17,7 +17,7 @@
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
@@ -158,7 +158,7 @@
@@ -161,7 +161,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
</else>
@ -26,7 +26,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" />
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
@@ -170,7 +170,7 @@
@@ -173,7 +173,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@ -35,7 +35,7 @@
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" />
@@ -179,10 +179,10 @@
@@ -182,10 +182,10 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" />
</else>
@ -48,7 +48,7 @@
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
@@ -191,7 +191,7 @@
@@ -194,7 +194,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
</else>

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

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/BUILD.gn
@@ -6366,6 +6366,13 @@ static_library("browser") {
@@ -6390,6 +6390,13 @@ static_library("browser") {
}
}

48
www/chromium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/about_flags.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/about_flags.cc
@@ -221,7 +221,7 @@
@@ -225,7 +225,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -320,7 +320,7 @@
@@ -324,7 +324,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)
@@ -334,7 +334,7 @@
@@ -338,7 +338,7 @@
#include "chrome/browser/win/titlebar_config.h"
#endif
@ -27,7 +27,7 @@
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -434,7 +434,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -438,7 +438,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -36,7 +36,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1474,7 +1474,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
std::size(kChromeRefresh2023Level1), nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -45,7 +45,7 @@
const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
{"ShortcutBoostSearchScore", "1414"},
{"ShortcutBoostUrlScore", "1414"}};
@@ -5022,13 +5022,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5039,13 +5039,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -61,8 +61,8 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5317,7 +5317,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)},
@@ -5347,7 +5347,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kFeedSportsCard)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@ -70,16 +70,16 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -6007,7 +6007,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6025,7 +6025,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6805,7 +6805,7 @@ const FeatureEntry kFeatureEntries[] = {
{"omnibox-actions-ui-simplification",
flag_descriptions::kOmniboxActionsUISimplificationName,
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
@@ -6853,7 +6853,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@ -88,7 +88,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -7788,7 +7788,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7848,7 +7848,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -97,7 +97,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -8519,7 +8519,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8553,7 +8553,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -106,8 +106,8 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -8799,7 +8799,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
@@ -8844,7 +8844,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperRefreshRevamp)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -115,7 +115,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8859,7 +8859,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8900,7 +8900,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -124,7 +124,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9377,7 +9377,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9443,7 +9443,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -133,7 +133,7 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
@@ -10037,7 +10037,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10060,7 +10060,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
@ -142,7 +142,7 @@
{"webui-system-font", flag_descriptions::kWebUiSystemFontName,
flag_descriptions::kWebUiSystemFontDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
@@ -10223,7 +10223,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10263,7 +10263,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
@ -151,7 +151,7 @@
{"data-retention-policies-disable-sync-types-needed",
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
@@ -10616,7 +10616,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10657,7 +10657,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -160,7 +160,7 @@
{"camera-mic-preview", flag_descriptions::kCameraMicPreviewName,
flag_descriptions::kCameraMicPreviewDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia),
@@ -10793,7 +10793,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10834,7 +10834,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll,
FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)},

8
www/chromium/files/patch-chrome_browser_browser__process__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/browser_process_impl.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -216,7 +216,7 @@
@@ -215,7 +215,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1207,7 +1207,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1206,7 +1206,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1463,7 +1463,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1460,7 +1460,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

23
www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -129,13 +129,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
@ -22,10 +22,19 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/companion/visual_search/visual_search_suggestions_service_factory.h"
#include "chrome/browser/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"
@@ -949,7 +949,7 @@ void PopulateChromeFrameBinders(
@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<
@@ -977,7 +977,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -34,7 +43,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -957,7 +957,7 @@ void PopulateChromeFrameBinders(
@@ -985,7 +985,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,7 +52,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -1031,7 +1031,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1065,7 +1065,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -52,7 +61,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1046,7 +1046,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1080,7 +1080,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +70,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1535,7 +1535,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1578,7 +1578,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

14
www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -245,11 +245,11 @@
@@ -247,11 +247,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -14,7 +14,7 @@
#include "components/crash/core/app/crashpad.h"
#endif
@@ -284,14 +284,14 @@
@@ -286,14 +286,14 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -31,7 +31,7 @@
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
@@ -1029,7 +1029,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1033,7 +1033,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -40,7 +40,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1085,7 +1085,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1089,7 +1089,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -49,7 +49,7 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1325,7 +1325,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -58,7 +58,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1427,7 +1427,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1431,7 +1431,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.

34
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -433,7 +433,7 @@
@@ -436,7 +436,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -524,12 +524,12 @@
@@ -530,12 +530,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
@@ -538,14 +538,14 @@
@@ -544,14 +544,14 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -41,7 +41,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -572,11 +572,11 @@
@@ -580,11 +580,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -55,7 +55,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"
@@ -1589,7 +1589,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1598,7 +1598,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed,
true);
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
@ -64,7 +64,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1713,7 +1713,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1720,7 +1720,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -73,7 +73,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -82,7 +82,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1773,7 +1773,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1780,7 +1780,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -91,7 +91,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1792,7 +1792,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1799,7 +1799,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -100,7 +100,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2615,6 +2615,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2629,6 +2629,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -109,7 +109,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -3022,7 +3024,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -3006,7 +3008,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -118,7 +118,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4588,7 +4590,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4614,7 +4616,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -127,7 +127,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5115,7 +5117,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5161,7 +5163,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -136,7 +136,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5125,7 +5127,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5171,7 +5173,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -145,7 +145,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5164,7 +5166,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5210,7 +5212,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@ -154,7 +154,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -6983,7 +6985,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7054,7 +7056,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -471,7 +471,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -478,7 +478,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

10
www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
View file

@ -1,20 +1,20 @@
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-09-27 23:09:54 UTC
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -40,7 +40,7 @@
#include "third_party/widevine/cdm/buildflags.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
#endif
@@ -77,7 +77,7 @@ const char ImageLoaderComponentName[] = "WidevineCdm";
@@ -77,7 +77,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
const char ImageLoaderComponentName[] = "WidevineCdm";
#endif
-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_FREEBSD)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
// On Linux and ChromeOS the Widevine CDM is loaded at startup before the
// zygote is locked down. As a result there is no need to register the CDM
// with Chrome as it can't be used until Chrome is restarted.
@ -23,7 +23,7 @@
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FREEBSD)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version;
// This is running on a thread that allows IO, so simply update the hint file.

8
www/chromium/files/patch-chrome_browser_defaults.cc
View file

@ -1,8 +1,8 @@
--- chrome/browser/defaults.cc.orig 2023-07-16 15:47:57 UTC
--- chrome/browser/defaults.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/defaults.cc
@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false;
const bool kDownloadPageHasShowInFolder = true;
@@ -44,7 +44,7 @@ const bool kShowHelpMenuItemIcon = true;
const bool kShowHelpMenuItemIcon = false;
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

8
www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1594,7 +1594,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1611,7 +1611,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();
}
@@ -1713,7 +1713,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1730,7 +1730,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()) {
@@ -1759,7 +1759,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -1776,7 +1776,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/download/download_item_model.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -768,7 +768,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -769,7 +769,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();
@@ -814,7 +814,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -815,7 +815,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);
@@ -1234,7 +1234,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1200,7 +1200,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

9
www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2022-09-24 10:57:32 UTC
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
@@ -142,11 +142,11 @@ AnalysisServiceSettings::AnalysisServiceSettings(
@@ -143,7 +143,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
const char* verification_key = kKeyWindowsVerification;
#elif BUILDFLAG(IS_MAC)
const char* verification_key = kKeyMacVerification;
@ -9,8 +9,3 @@
const char* verification_key = kKeyLinuxVerification;
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const base::Value::Dict& dict = settings_value.GetDict();
const base::Value::List* signatures =
dict.FindListByDottedPath(verification_key);

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

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

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

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

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

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

8
www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-08-17 07:33:31 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/profiles/profile.h"
@ -18,9 +18,9 @@
return IsDeviceTrustConnectorFeatureEnabled();
#else
return false;
@@ -78,7 +78,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
auto* service = new DeviceTrustConnectorService(profile->GetPrefs());
@@ -80,7 +80,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan
std::unique_ptr<DeviceTrustConnectorService> service =
std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)

6
www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -54,7 +54,7 @@
@@ -55,7 +55,7 @@
#include "base/strings/utf_string_conversions.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
#include "components/device_signals/core/browser/signals_aggregator.h"
#include "components/device_signals/core/common/signals_constants.h"
@@ -139,7 +139,7 @@ void UploadSecurityEventReport(base::Value::Dict event
@@ -140,7 +140,7 @@ void UploadSecurityEventReport(base::Value::Dict event
std::move(upload_callback));
}

6
www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
@@ -17,7 +17,7 @@
@@ -16,7 +16,7 @@
#include "components/keyed_service/core/keyed_service.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
@ -9,7 +9,7 @@
#include "components/device_signals/core/browser/signals_types.h"
#endif
@@ -194,7 +194,7 @@ class RealtimeReportingClient : public KeyedService,
@@ -184,7 +184,7 @@ class RealtimeReportingClient : public KeyedService,
base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
};

20
www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-11-30 08:12:58 UTC
--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/enterprise/signals/device_info_fetcher.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
@ -9,12 +9,12 @@
#include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
#endif
@@ -71,7 +71,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
return std::make_unique<DeviceInfoFetcherMac>();
#elif BUILDFLAG(IS_WIN)
return std::make_unique<DeviceInfoFetcherWin>();
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return std::make_unique<DeviceInfoFetcherLinux>();
#else
return std::make_unique<StubDeviceFetcher>();
@@ -67,7 +67,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
return CreateInstanceInternal();
}
-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && \
+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) && \
!(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
// static
std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::CreateInstanceInternal() {

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1357,6 +1357,10 @@ static_library("extensions") {
@@ -1372,6 +1372,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

6
www/chromium/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-08-17 07:33:31 UTC
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -42,7 +42,7 @@
@@ -43,7 +43,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
@@ -106,7 +106,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SidePanelService::GetFactoryInstance();

4
www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -593,7 +593,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

10
www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -198,7 +198,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -199,7 +199,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
@ -9,12 +9,12 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
@@ -210,7 +210,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kUsesSystemThemeDeprecated] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
(*s_allowlist)[::prefs::kSystemTheme] =
settings_api::PrefType::PREF_TYPE_NUMBER;
#endif

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-08-17 07:33:31 UTC
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -833,7 +833,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
@@ -860,7 +860,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.

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -913,7 +913,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
@@ -924,7 +924,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
RequestExtensionApproval(contents);
return;
}

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/flag_descriptions.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -2556,7 +2556,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
@@ -2588,7 +2588,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
const char kWebUIOmniboxPopupDescription[] =
"If enabled, shows the omnibox suggestions popup in WebUI.";
@ -9,7 +9,7 @@
const char kWebUiSystemFontName[] = "WebUI System font";
const char kWebUiSystemFontDescription[] =
"If enabled, all WebUI surfaces will use the default UI font of the "
@@ -7040,7 +7040,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
@@ -7151,7 +7151,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -18,7 +18,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7254,7 +7254,7 @@ const char kSearchWebInSidePanelDescription[] =
@@ -7366,7 +7366,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,7 +27,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -7263,7 +7263,7 @@ const char kQuickCommandsDescription[] =
@@ -7375,7 +7375,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -36,7 +36,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7278,7 +7278,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
@@ -7390,7 +7390,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@ -45,7 +45,7 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7302,7 +7302,7 @@ const char kWebShareDescription[] =
@@ -7414,7 +7414,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -54,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7322,7 +7322,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7434,7 +7434,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7336,7 +7336,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -7448,7 +7448,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -72,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7443,7 +7443,7 @@ const char kElasticOverscrollDescription[] =
@@ -7555,7 +7555,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -81,7 +81,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7455,7 +7455,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
@@ -7567,7 +7567,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
@ -90,7 +90,7 @@
const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
"Data Retention Policies Disable Sync Types";
const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
@@ -7500,7 +7500,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
@@ -7612,7 +7612,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
"any one time. Requires #enable-media-session-service to be enabled too.";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/flag_descriptions.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/flag_descriptions.h
@@ -1452,7 +1452,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit
@@ -1472,7 +1472,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit
extern const char kWebUIOmniboxPopupName[];
extern const char kWebUIOmniboxPopupDescription[];
@ -9,7 +9,7 @@
extern const char kWebUiSystemFontName[];
extern const char kWebUiSystemFontDescription[];
#endif
@@ -4036,7 +4036,7 @@ extern const char kLacrosMergeIcuDataFileName[];
@@ -4103,7 +4103,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -18,7 +18,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4166,14 +4166,14 @@ extern const char kSearchWebInSidePanelDescription[];
@@ -4233,14 +4233,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -35,7 +35,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -4183,7 +4183,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4250,7 +4250,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -44,7 +44,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4193,7 +4193,7 @@ extern const char kOzonePlatformHintName[];
@@ -4260,7 +4260,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -53,7 +53,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4201,13 +4201,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -4268,13 +4268,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -69,7 +69,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4218,7 +4218,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
@@ -4285,7 +4285,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -78,7 +78,7 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4300,7 +4300,7 @@ extern const char kElasticOverscrollDescription[];
@@ -4367,7 +4367,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -87,7 +87,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4309,7 +4309,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe
@@ -4376,7 +4376,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
@ -96,7 +96,7 @@
extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
#endif
@@ -4336,7 +4336,7 @@ extern const char kEnableAudioFocusEnforcementName[];
@@ -4403,7 +4403,7 @@ extern const char kEnableAudioFocusEnforcementName[];
extern const char kEnableAudioFocusEnforcementDescription[];
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

12
www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -79,8 +79,10 @@
@@ -78,8 +78,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -109,7 +111,7 @@
@@ -108,7 +110,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -118,7 +120,7 @@
@@ -117,7 +119,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -30,7 +30,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -931,7 +933,7 @@ void RecordStartupMetrics() {
@@ -917,7 +919,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -39,7 +39,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -1260,11 +1262,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1227,11 +1229,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)

45
www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -93,7 +93,7 @@
@@ -92,7 +92,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"
@@ -184,7 +184,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -183,7 +183,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)
@@ -242,7 +242,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -241,7 +241,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
@ -27,7 +27,7 @@
auto* local_state = g_browser_process->local_state();
#endif
@@ -263,7 +263,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -262,7 +262,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
@ -36,7 +36,16 @@
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
@@ -494,7 +494,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -457,7 +457,7 @@ void SystemNetworkContextManager::DeleteInstance() {
g_system_network_context_manager = nullptr;
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
SystemNetworkContextManager::GssapiLibraryLoadObserver::
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
: owner_(owner) {}
@@ -515,7 +515,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -45,7 +54,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -541,7 +541,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -562,7 +562,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -54,7 +63,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -590,7 +590,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -611,7 +611,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -63,7 +72,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -619,7 +619,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -640,7 +640,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) || \
@ -72,7 +81,7 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -628,7 +628,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -649,11 +649,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@ -80,8 +89,22 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
}
@@ -980,7 +980,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
@@ -702,7 +702,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -1009,7 +1009,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

22
www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
View file

@ -1,6 +1,15 @@
--- chrome/browser/net/system_network_context_manager.h.orig 2023-05-31 08:12:17 UTC
--- chrome/browser/net/system_network_context_manager.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/net/system_network_context_manager.h
@@ -207,7 +207,7 @@ class SystemNetworkContextManager {
@@ -185,7 +185,7 @@ class SystemNetworkContextManager {
class URLLoaderFactoryForSystem;
class NetworkProcessLaunchWatcher;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
class GssapiLibraryLoadObserver
: public network::mojom::GssapiLibraryLoadObserver {
public:
@@ -229,7 +229,7 @@ class SystemNetworkContextManager {
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,3 +18,12 @@
// Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
// pref to the enforcement state.
void UpdateEnforceLocalAnchorConstraintsEnabled();
@@ -275,7 +275,7 @@ class SystemNetworkContextManager {
static absl::optional<bool> certificate_transparency_enabled_for_testing_;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
GssapiLibraryLoadObserver gssapi_library_loader_observer_{this};
#endif // BUILDFLAG(IS_LINUX)
};

14
www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-08-17 07:33:31 UTC
--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
@@ -48,7 +48,7 @@
@@ -49,7 +49,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_mac.h"
#endif // BUILDFLAG(IS_MAC)
@ -9,7 +9,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_linux.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -57,7 +57,7 @@
@@ -58,7 +58,7 @@
#include "chrome/install_static/install_util.h"
#endif // BUILDFLAG(IS_WIN)
@ -18,7 +18,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" // nogncheck
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h"
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h"
@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
@@ -91,7 +91,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
#if BUILDFLAG(IS_MAC)
storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
@ -27,12 +27,12 @@
storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
#elif BUILDFLAG(IS_WIN)
storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
@@ -246,7 +246,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled()) {
auto key_rotation_launcher =
enterprise_connectors::KeyRotationLauncher::Create(
auto* browser_dm_token_storage = BrowserDMTokenStorage::Get();
auto* device_management_service = GetDeviceManagementService();

52
www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -214,12 +214,12 @@
@@ -214,17 +214,17 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -10,12 +10,18 @@
#include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "components/enterprise/idle/idle_timeout_policy_handler.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) || \
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) ||
@@ -800,7 +800,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -811,7 +811,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -24,7 +30,7 @@
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
@@ -810,7 +810,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -821,7 +821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -33,8 +39,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1498,7 +1498,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
@@ -1532,7 +1532,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@ -42,7 +48,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1546,7 +1546,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1580,7 +1580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@ -51,7 +57,7 @@
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1572,18 +1572,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1606,12 +1606,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -66,6 +72,8 @@
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
@@ -1620,7 +1620,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
- || BUILDFLAG(IS_FUCHSIA)
@ -73,7 +81,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1596,7 +1596,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1633,7 +1633,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) \
@ -82,7 +90,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1700,7 +1700,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1737,7 +1737,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -91,7 +99,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1796,7 +1796,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1833,7 +1833,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -100,7 +108,7 @@
// TODO(crbug.com/1454054): replace the
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
// matches the name of the new `getAllScreensMedia` API.
@@ -1805,7 +1805,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -109,7 +117,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1836,7 +1836,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1873,7 +1873,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -118,7 +126,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1915,7 +1915,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1952,7 +1952,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -127,7 +135,7 @@
{ key::kBatterySaverModeAvailability,
performance_manager::user_tuning::prefs::kBatterySaverModeState,
base::Value::Type::INTEGER },
@@ -1946,7 +1946,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1983,7 +1983,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
@ -136,7 +144,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2062,7 +2062,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2097,7 +2097,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -145,7 +153,7 @@
handlers->AddHandler(
std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2266,7 +2266,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -154,7 +162,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2324,7 +2324,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2357,7 +2357,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -163,7 +171,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
@@ -2365,7 +2365,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2413,7 +2413,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) || \
@ -172,7 +180,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -2726,7 +2726,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2774,7 +2774,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -181,7 +189,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2782,7 +2782,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -190,7 +198,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2747,7 +2747,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2795,7 +2795,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));

6
www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-07-16 15:47:57 UTC
--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/policy/policy_value_and_status_aggregator.cc
@@ -52,7 +52,7 @@
@@ -53,7 +53,7 @@
#include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
@ -9,7 +9,7 @@
#include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -98,7 +98,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
@@ -99,7 +99,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
#else // BUILDFLAG(IS_CHROMEOS_ASH)
policy::CloudPolicyManager* cloud_policy_manager =
profile->GetUserCloudPolicyManager();

32
www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -472,13 +472,13 @@
@@ -478,13 +478,13 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -511,7 +511,7 @@
@@ -517,7 +517,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -25,7 +25,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -716,7 +716,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
@@ -662,7 +662,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@ -34,7 +34,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1007,7 +1007,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
@@ -948,7 +948,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@ -43,16 +43,7 @@
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1163,7 +1163,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1964,12 +1964,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1863,12 +1863,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -67,7 +58,7 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -2127,7 +2127,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
@@ -2018,7 +2018,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
@ -76,12 +67,3 @@
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -2297,7 +2297,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Added 08/2022.
if (profile_prefs->HasPrefPath(prefs::kUsesSystemThemeDeprecated)) {
auto migrated_theme =

14
www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -379,18 +379,18 @@
@@ -385,18 +385,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -22,7 +22,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -589,7 +589,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -596,7 +596,7 @@ void ChromeBrowserMainExtraPartsProfiles::
if (breadcrumbs::IsEnabled()) {
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
@ -31,7 +31,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
@@ -675,26 +675,26 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -689,26 +689,26 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
enterprise::ProfileIdServiceFactory::GetInstance();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -63,7 +63,7 @@
enterprise_signals::UserPermissionServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -797,7 +797,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -817,7 +817,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -72,7 +72,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
@@ -891,7 +891,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -912,7 +912,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
@ -81,7 +81,7 @@
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
@@ -932,7 +932,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -953,7 +953,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
ProfileThemeUpdateServiceFactory::GetInstance();
#endif

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

@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/route.ts.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/resources/settings/route.ts.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/resources/settings/route.ts
@@ -231,7 +231,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
@@ -236,7 +236,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));

4
www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -18,7 +18,7 @@
#include "net/base/url_util.h"
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
@@ -398,7 +398,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
@@ -421,7 +421,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.

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

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/browser_thread.h"
@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
@@ -310,7 +310,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
@@ -314,7 +314,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)

6
www/chromium/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 2023-04-05 11:05:06 UTC
--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -18,7 +18,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@ -9,7 +9,7 @@
#include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
#endif
@@ -106,7 +106,7 @@ class FileAnalyzer {
@@ -109,7 +109,7 @@ class FileAnalyzer {
const safe_browsing::ArchiveAnalyzerResults& archive_results);
#endif
@ -18,7 +18,7 @@
void StartExtractDocumentFeatures();
void OnDocumentAnalysisFinished(
const DocumentAnalyzerResults& document_results);
@@ -136,7 +136,7 @@ class FileAnalyzer {
@@ -139,7 +139,7 @@ class FileAnalyzer {
dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
#endif

4
www/chromium/files/patch-chrome_browser_signin_signin__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/signin/signin_util.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/signin/signin_util.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/signin/signin_util.cc
@@ -71,7 +71,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
@@ -74,7 +74,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
CookiesMover::~CookiesMover() = default;
void CookiesMover::StartMovingCookies() {

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

@ -1,6 +1,6 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -80,7 +80,7 @@
@@ -82,7 +82,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)
@@ -129,7 +129,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -131,7 +131,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();
@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory()
@@ -256,7 +256,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(PasswordStoreFactory::GetInstance());
DependsOn(PowerBookmarkServiceFactory::GetInstance());
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

6
www/chromium/files/patch-chrome_browser_themes_theme__service.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/themes/theme_service.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/themes/theme_service.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/themes/theme_service.cc
@@ -75,7 +75,7 @@
@@ -74,7 +74,7 @@
#include "extensions/browser/extension_registry_observer.h"
#endif
@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -333,7 +333,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseCustomFrame() const {

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

@ -0,0 +1,11 @@
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/actions/chrome_action_id.h
@@ -532,7 +532,7 @@
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
E(kActionContentContextQuickAnswersInlineQuery, \
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
E(kUseSystemTitleBar, IDC_USE_SYSTEM_TITLE_BAR) \
E(kRestoreWindow, IDC_RESTORE_WINDOW)

17
www/chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc
View file

@ -1,17 +0,0 @@
--- chrome/browser/ui/autofill/chrome_autofill_client.cc.orig 2023-09-13 12:11:42 UTC
+++ chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -1100,7 +1100,14 @@ void ChromeAutofillClient::PropagateAutofillPrediction
&renderer_form);
}
+#if defined(__clang__) && (__clang_major__ >= 16)
for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) {
+#else
+ for (const auto& r_f : renderer_forms_by_frame) {
+ const auto& [f_t, f_f] = r_f;
+ const auto& frame_token = f_t;
+ const auto& frame_forms = f_f;
+#endif
// Attempt to find the RFH with this `frame_token`.
content::RenderFrameHost* rfh = nullptr;
GetWebContents().ForEachRenderFrameHost(

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/browser.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/browser.h
@@ -288,7 +288,7 @@ class Browser : public TabStripModelObserver,
@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver,
int32_t restore_id = kDefaultRestoreId;
#endif

12
www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/chrome_pages.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -71,7 +71,7 @@
@@ -78,7 +78,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,12 +9,12 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -617,7 +617,7 @@ void ShowShortcutCustomizationApp(Profile* profile) {
@@ -668,7 +668,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
void ShowWebAppSettings(Browser* browser,
const std::string& app_id,
web_app::AppSettingsPageEntryPoint entry_point) {
void ShowWebAppSettingsImpl(Browser* browser,
Profile* profile,
const std::string& app_id,

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/chrome_pages.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -34,7 +34,7 @@ enum class ConsentLevel;
@@ -38,7 +38,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
@@ -237,7 +237,7 @@ void ShowShortcutCustomizationApp(Profile* profile);
@@ -249,7 +249,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

6
www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc → www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/signin_view_controller.cc.orig 2023-08-17 07:33:31 UTC
+++ chrome/browser/ui/signin_view_controller.cc
@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/signin/signin_view_controller.cc
@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
bool show_link_data_option,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h → www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
View file

@ -1,5 +1,5 @@
--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2023-09-13 12:11:42 UTC
+++ chrome/browser/ui/signin_view_controller_delegate.h
--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/signin/signin_view_controller_delegate.h
@@ -81,7 +81,7 @@ class SigninViewControllerDelegate {
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)

4
www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -96,7 +96,7 @@ static const char* kBadFlags[] = {
@@ -100,7 +100,7 @@ const char* const kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-07-16 15:47:57 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
@@ -133,7 +133,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
#endif // BUILDFLAG(IS_WIN)
@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h"
@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -921,7 +921,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1025,7 +1025,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -27,7 +27,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1232,7 +1232,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1238,7 +1238,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/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -223,7 +223,7 @@
@@ -221,7 +221,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"
@@ -614,12 +614,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -610,12 +610,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \

4
www/chromium/files/patch-chrome_browser_ui_ui__features.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/ui_features.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/ui_features.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/ui_features.cc
@@ -288,7 +288,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
"TopChromeWebUIUsesSpareRenderer",
base::FEATURE_ENABLED_BY_DEFAULT);

4
www/chromium/files/patch-chrome_browser_ui_ui__features.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/ui_features.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/ui_features.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/ui_features.h
@@ -191,7 +191,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
@@ -194,7 +194,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);

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

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

4
www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2023-01-11 09:17:16 UTC
--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc
@@ -159,7 +159,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos
@@ -178,7 +178,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos
// EyeDropper/WidgetDelegate.
set_owned_by_client();
SetPreferredSize(GetSize());

4
www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc
@@ -119,7 +119,7 @@ void EyeDropperView::MoveViewToFront() {
@@ -127,7 +127,7 @@ void EyeDropperView::MoveViewToFront() {
}
void EyeDropperView::CaptureInputIfNeeded() {

31
www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -54,7 +54,7 @@
#include "components/user_manager/user_manager.h"
@ -9,8 +9,8 @@
#include "ui/display/screen.h"
#include "ui/linux/linux_ui.h"
#endif
@@ -66,7 +66,7 @@
namespace {
@@ -89,7 +89,7 @@ class ThemeChangedObserver : public views::WidgetObser
};
bool IsUsingLinuxSystemTheme(Profile* profile) {
-#if BUILDFLAG(IS_LINUX)
@ -18,7 +18,16 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
@@ -319,7 +319,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@@ -180,7 +180,7 @@ void BrowserFrame::InitBrowserFrame() {
Init(std::move(params));
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Because getting `linux_ui_theme` requires `native_widget_` to be
// initialized, this needs to happen after Init().
if (!IsIncognitoBrowser() &&
@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@ -27,16 +36,16 @@
// 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()
@@ -547,7 +547,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@@ -558,7 +558,7 @@ void BrowserFrame::OnMenuClosed() {
}
void BrowserFrame::SelectNativeTheme() {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
@@ -564,7 +564,7 @@ void BrowserFrame::SelectNativeTheme() {
// Use the regular NativeTheme instance if running incognito mode, regardless
// of system theme (gtk, qt etc).
ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
@@ -599,7 +599,7 @@ void BrowserFrame::OnTouchUiChanged() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;

4
www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-08-17 07:33:31 UTC
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
@@ -231,7 +231,7 @@ class BrowserFrame : public views::Widget, public view
@@ -230,7 +230,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -2076,7 +2076,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -2106,7 +2106,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.

8
www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -54,7 +54,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
@@ -572,7 +572,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
@@ -568,7 +568,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;
@@ -595,7 +595,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
return false;
}
@ -27,7 +27,7 @@
ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
return frame()->tiled_edges();
}
@@ -796,7 +796,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
@@ -789,7 +789,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {

6
www/chromium/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-04-05 11:05:06 UTC
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -117,7 +117,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
@@ -116,7 +116,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
const gfx::Rect& bounding_rect) const override;
bool IsTranslucentWindowOpacitySupported() const override;
bool ShouldDrawRestoredFrameShadow() const override;
@ -9,7 +9,7 @@
ui::WindowTiledEdges GetTiledEdges() const override;
#endif
int WebAppButtonHeight() const override;
@@ -234,7 +234,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
@@ -233,7 +233,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
// Background painter for the window frame.
std::unique_ptr<views::FrameBackground> frame_background_;

22
www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -56,7 +56,7 @@
@@ -53,7 +53,7 @@
#include "ui/aura/window.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
@@ -78,7 +78,7 @@ constexpr int kBackToTabImageSize = 16;
@@ -80,7 +80,7 @@ constexpr int kBackToTabImageSize = 16;
// The height of the controls bar at the top of the window.
constexpr int kTopControlsHeight = 30;
@ -18,7 +18,7 @@
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
@@ -173,7 +173,7 @@ class WindowEventObserver : public ui::EventObserver {
@@ -175,7 +175,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@ -27,7 +27,7 @@
// Calculate input bounds for Linux. This is needed because the input bounds
// is not necessary the same as the local bounds on Linux.
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
@@ -399,7 +399,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
@@ -534,7 +534,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
}
#endif
@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
@@ -578,7 +578,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
@@ -709,7 +709,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)));
@@ -634,7 +634,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
@@ -772,7 +772,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -875,7 +875,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
@@ -1016,7 +1016,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_) {
@@ -998,7 +998,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
@@ -1140,7 +1140,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();
@@ -1019,7 +1019,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
@@ -1161,7 +1161,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@ -81,7 +81,7 @@
return FrameBorderInsets();
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return gfx::Insets(chromeos::kResizeInsideBoundsSize);
@@ -1040,7 +1040,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
@@ -1182,7 +1182,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
top_height + border_thickness.bottom());
}

19
www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -23,7 +23,7 @@
@@ -24,7 +24,7 @@
#include "ui/views/controls/image_view.h"
#include "ui/views/widget/widget_observer.h"
@ -9,7 +9,16 @@
#include "ui/linux/window_frame_provider.h"
#endif
@@ -86,7 +86,7 @@ class PictureInPictureBrowserFrameView
@@ -32,7 +32,7 @@
// window, so to prevent cutting off important dialogs we resize the
// picture-in-picture window to fit them. While ChromeOS also uses Aura, it does
// not have this issue so we do not resize on ChromeOS.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -97,7 +97,7 @@ class PictureInPictureBrowserFrameView
void Layout() override;
void AddedToWidget() override;
void RemovedFromWidget() override;
@ -18,7 +27,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
@@ -175,7 +175,7 @@ class PictureInPictureBrowserFrameView
@@ -186,7 +186,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@ -27,7 +36,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
@@ -258,7 +258,7 @@ class PictureInPictureBrowserFrameView
@@ -349,7 +349,7 @@ class PictureInPictureBrowserFrameView
// `top_bar_color_animation_`.
absl::optional<SkColor> current_foreground_color_;

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -651,7 +651,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
@@ -652,7 +652,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

8
www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
@@ -49,7 +49,7 @@ namespace {
@@ -53,7 +53,7 @@ namespace {
const int kModalDialogWidth = 448;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
const int kEnterpriseConfirmationDialogWidth = 512;
const int kEnterpriseConfirmationDialogHeight = 576;
#endif
@@ -167,7 +167,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
// static
std::unique_ptr<views::WebView>
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
@@ -442,7 +442,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
@@ -454,7 +454,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews
@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
@@ -593,7 +593,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
@@ -605,7 +605,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
return;

4
www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -487,7 +487,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons
@@ -490,7 +490,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons
if (!IsHoverAnimationActive()) {
return base_opacity;
}

20
www/chromium/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-09-13 12:11:42 UTC
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -416,7 +416,7 @@ std::string GetFileExtension(FileExtension file_extens
@@ -464,7 +464,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;
@@ -1862,7 +1862,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
@@ -1933,7 +1933,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@ -18,7 +18,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
@@ -3106,7 +3106,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
@@ -3249,7 +3249,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@ -27,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -3121,7 +3121,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -3264,7 +3264,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@ -36,7 +36,7 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -3131,7 +3131,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -3274,7 +3274,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
@ -45,7 +45,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -3147,7 +3147,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
@@ -3290,7 +3290,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
@ -54,7 +54,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -3939,7 +3939,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
@@ -4073,7 +4073,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const AppId& app_id) {
@ -63,7 +63,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
@@ -4126,7 +4126,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
@@ -4260,7 +4260,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@ -72,7 +72,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
@@ -4170,7 +4170,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
@@ -4304,7 +4304,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}

10
www/chromium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc
View file

@ -1,8 +1,8 @@
--- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/webauthn/sheet_models.cc
@@ -1496,7 +1496,11 @@ AuthenticatorMultiSourcePickerSheetModel::
using CredentialMech = AuthenticatorRequestDialogModel::Mechanism::Credential;
@@ -1499,7 +1499,11 @@ AuthenticatorMultiSourcePickerSheetModel::
using ICloudKeychainMech =
AuthenticatorRequestDialogModel::Mechanism::ICloudKeychain;
bool has_local_passkeys =
+#if (_LIBCPP_VERSION >= 160000)
std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) {
@ -10,5 +10,5 @@
+ base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) {
+#endif
return absl::holds_alternative<CredentialMech>(mech.type) &&
absl::get<CredentialMech>(mech.type).value() !=
absl::get<CredentialMech>(mech.type).value().source !=
device::AuthenticatorType::kPhone;

16
www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -213,7 +213,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
@@ -210,7 +210,7 @@
#include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
@@ -239,17 +239,17 @@
@@ -236,17 +236,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
@@ -402,7 +402,7 @@ bool IsAboutUI(const GURL& url) {
@@ -399,7 +399,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)
@@ -667,7 +667,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -660,7 +660,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUIMobileSetupHost)
return &NewWebUI<ash::cellular_setup::MobileSetupUI>;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
@@ -729,7 +729,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -722,7 +722,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)
@@ -796,27 +796,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -789,27 +789,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

14
www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -91,7 +91,7 @@
@@ -94,7 +94,7 @@
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -9,8 +9,8 @@
#include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
#include "components/device_signals/core/browser/user_permission_service.h" // nogncheck
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -183,12 +183,12 @@ enum class ReportingType {
kUserActivity
@@ -190,12 +190,12 @@ enum class ReportingType {
kLegacyTech,
};
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -24,7 +24,7 @@
const char kManagementDeviceSignalsDisclosure[] =
"managementDeviceSignalsDisclosure";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -747,7 +747,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
@@ -773,7 +773,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
GetReportingTypeValue(report_definition.reporting_type));
report_sources->Append(std::move(data));
}
@ -33,7 +33,7 @@
// Insert the device signals consent disclosure at the end of browser
// reporting section.
auto* user_permission_service = GetUserPermissionService();
@@ -1031,7 +1031,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
@@ -1061,7 +1061,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
kManagementOnPageVisitedVisibleData, &info);
}
@ -42,7 +42,7 @@
if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
AddThreatProtectionPermission(kManagementScreenCaptureEvent,
kManagementScreenCaptureData, &info);
@@ -1115,7 +1115,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
@@ -1145,7 +1145,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
->policy_service();
}

6
www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.h
@@ -24,14 +24,14 @@
#include "extensions/common/extension_id.h"
@ -17,7 +17,7 @@
extern const char kManagementDeviceSignalsDisclosure[];
#endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -114,7 +114,7 @@ class StatusCollector;
@@ -117,7 +117,7 @@ class StatusCollector;
class SystemLogUploader;
} // namespace policy
@ -26,7 +26,7 @@
namespace device_signals {
class UserPermissionService;
} // namespace device_signals
@@ -174,7 +174,7 @@ class ManagementUIHandler : public content::WebUIMessa
@@ -177,7 +177,7 @@ class ManagementUIHandler : public content::WebUIMessa
base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
base::Value::List GetApplicationsInfo(Profile* profile) const;
virtual policy::PolicyService* GetPolicyService();

6
www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-10-11 18:22:24 UTC
+++ chrome/browser/ui/webui/realbox/realbox_handler.cc
@@ -144,7 +144,7 @@ constexpr char kMacShareIconResourceName[] =
@@ -146,7 +146,7 @@ constexpr char kMacShareIconResourceName[] =
#elif BUILDFLAG(IS_WIN)
constexpr char kWinShareIconResourceName[] =
"//resources/cr_components/omnibox/icons/win_share.svg";
@ -9,7 +9,7 @@
constexpr char kLinuxShareIconResourceName[] =
"//resources/cr_components/omnibox/icons/share.svg";
#else
@@ -740,7 +740,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
@@ -745,7 +745,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
return kWinShareIconResourceName;
}

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