kpriv
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 123.0.6312.58

This commit is contained in:
robert 2024-03-22 13:10:55 +00:00
parent 84df8925f1
commit ee4e5ac03f
334 changed files with 1446 additions and 1420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/chromium/Makefile
View File

@ -9,8 +9,7 @@ DPB_PROPERTIES+= lonesome
COMMENT= Chromium browser
V= 122.0.6261.111
REVISION= 0
V= 123.0.6312.58
DISTNAME= chromium-${V}
@ -78,6 +77,7 @@ BUILD_DEPENDS= archivers/bzip2 \
devel/gperf \
devel/bison \
lang/node \
lang/rust \
shells/bash \
sysutils/flock \
sysutils/pciutils \
@ -161,7 +161,6 @@ GN_ARGS= enable_nacl=false \
enable_remoting=false \
enable_hangout_services_extension=true \
enable_log_error_not_reached=true \
enable_rust=false \
use_kerberos=false \
use_sndio=true \
use_cups=true \
@ -186,6 +185,13 @@ GN_ARGS= enable_nacl=false \
use_udev=true \
v8_enable_cet_ibt=true
# rust
RUSTC_VERSION!!=rustc -V
MAKE_ENV+= RUSTC_BOOTSTRAP=1
GN_ARGS+= enable_rust=true \
rust_sysroot_absolute=\"${LOCALBASE}\" \
rustc_version=\"${RUSTC_VERSION}\"
# notyet
GN_ARGS+= use_vaapi=false

12
www/chromium/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (chrome-linux-122.0.6261.111-llvm17.profdata.tar.xz) = 9COGvjiSpLa+UWNQhopNuz/kt4ra+dr7lS+zDO2Q0w4=
SHA256 (chromium-122.0.6261.111-testdata.tar.xz) = gNxT4RCz8Ppe82v2rhiKA08y2uuZlCz7Tx6dbSB4aso=
SHA256 (chromium-122.0.6261.111.tar.xz) = Cz2i8MpjYl6EobNlcfI1kSSLj8tCLOaDwJKD2/w1wwk=
SHA256 (chrome-linux-123.0.6312.58-llvm17.profdata.tar.xz) = /Jt3KWe6qE9EwDh/BUQzwi1MzC4N62myrHgm8N5EdlU=
SHA256 (chromium-123.0.6312.58-testdata.tar.xz) = pdvMPdSnRp2xqF4xc5UIyJGfs3ymBQphfwWTKeDUWUA=
SHA256 (chromium-123.0.6312.58.tar.xz) = +Nrkov97ALtE+hNsIQFjj+pPIy5IGb4/czgd3A079xg=
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g=
SIZE (chrome-linux-122.0.6261.111-llvm17.profdata.tar.xz) = 29671344
SIZE (chromium-122.0.6261.111-testdata.tar.xz) = 280203120
SIZE (chromium-122.0.6261.111.tar.xz) = 3422993788
SIZE (chrome-linux-123.0.6312.58-llvm17.profdata.tar.xz) = 29783740
SIZE (chromium-123.0.6312.58-testdata.tar.xz) = 275371844
SIZE (chromium-123.0.6312.58.tar.xz) = 3465099244
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

18
www/chromium/patches/patch-BUILD_gn
View File

@ -1,7 +1,7 @@
Index: BUILD.gn
--- BUILD.gn.orig
+++ BUILD.gn
@@ -63,7 +63,7 @@ declare_args() {
@@ -64,7 +64,7 @@ declare_args() {
root_extra_deps = []
}
@ -10,7 +10,7 @@ Index: BUILD.gn
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -95,7 +95,6 @@ group("gn_all") {
@@ -96,7 +96,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@ -18,7 +18,7 @@ Index: BUILD.gn
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -425,7 +424,7 @@ group("gn_all") {
@@ -428,7 +427,7 @@ group("gn_all") {
}
}
@ -27,7 +27,7 @@ Index: BUILD.gn
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -625,6 +624,15 @@ group("gn_all") {
@@ -628,6 +627,15 @@ group("gn_all") {
}
}
@ -43,7 +43,7 @@ Index: BUILD.gn
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -671,7 +679,7 @@ group("gn_all") {
@@ -674,7 +682,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -52,7 +52,7 @@ Index: BUILD.gn
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1092,7 +1100,7 @@ if (use_blink && !is_cronet_build) {
@@ -1095,7 +1103,7 @@ if (use_blink && !is_cronet_build) {
]
}
@ -61,7 +61,7 @@ Index: BUILD.gn
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1183,7 +1191,7 @@ if (use_blink && !is_cronet_build) {
@@ -1186,7 +1194,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -70,7 +70,7 @@ Index: BUILD.gn
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1192,7 +1200,7 @@ if (use_blink && !is_cronet_build) {
@@ -1195,7 +1203,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -79,7 +79,7 @@ Index: BUILD.gn
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1642,7 +1650,7 @@ group("chromium_builder_perf") {
@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

22
www/chromium/patches/patch-base_BUILD_gn
View File

@ -1,7 +1,7 @@
Index: base/BUILD.gn
--- base/BUILD.gn.orig
+++ base/BUILD.gn
@@ -187,7 +187,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -192,7 +192,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@ -10,7 +10,7 @@ Index: base/BUILD.gn
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1118,11 +1118,23 @@ component("base") {
@@ -1126,11 +1126,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.
@ -35,7 +35,7 @@ Index: base/BUILD.gn
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1142,7 +1154,7 @@ component("base") {
@@ -1150,7 +1162,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -44,7 +44,7 @@ Index: base/BUILD.gn
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2088,6 +2100,22 @@ component("base") {
@@ -2106,6 +2118,22 @@ component("base") {
]
}
@ -67,7 +67,7 @@ Index: base/BUILD.gn
# iOS
if (is_ios) {
sources += [
@@ -2218,6 +2246,31 @@ component("base") {
@@ -2241,6 +2269,31 @@ component("base") {
}
}
@ -99,7 +99,7 @@ Index: base/BUILD.gn
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2228,7 +2281,7 @@ component("base") {
@@ -2251,7 +2304,7 @@ component("base") {
}
if (dep_libevent) {
@ -108,7 +108,7 @@ Index: base/BUILD.gn
}
if (use_libevent) {
@@ -2993,7 +3046,7 @@ if (is_apple) {
@@ -3027,7 +3080,7 @@ if (is_apple) {
}
}
@ -117,7 +117,7 @@ Index: base/BUILD.gn
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
@@ -3629,14 +3682,14 @@ test("base_unittests") {
@@ -3675,14 +3728,14 @@ test("base_unittests") {
]
}
@ -134,7 +134,7 @@ Index: base/BUILD.gn
deps += [ ":stack_canary_linux_unittests" ]
}
}
@@ -3651,7 +3704,7 @@ test("base_unittests") {
@@ -3701,7 +3754,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -143,7 +143,7 @@ Index: base/BUILD.gn
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3662,7 +3715,7 @@ test("base_unittests") {
@@ -3712,7 +3765,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -152,7 +152,7 @@ Index: base/BUILD.gn
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3925,7 +3978,7 @@ test("base_unittests") {
@@ -3980,7 +4033,7 @@ test("base_unittests") {
}
}

2
www/chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni
View File

@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc.gni
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
@@ -335,7 +335,7 @@ declare_args() {
@@ -357,7 +357,7 @@ declare_args() {
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.
enable_pkeys =

2
www/chromium/patches/patch-base_allocator_partition_allocator_src_partition_alloc_BUILD_gn
View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -852,7 +852,7 @@ if (is_clang_or_gcc) {
@@ -858,7 +858,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
}

12
www/chromium/patches/patch-base_base_switches_cc
View File

@ -1,12 +0,0 @@
Index: base/base_switches.cc
--- base/base_switches.cc.orig
+++ base/base_switches.cc
@@ -172,7 +172,7 @@ const char kPackageVersionName[] = "package-version-na
const char kPackageVersionCode[] = "package-version-code";
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
// Crashpad is fully enabled on Linux. Indicates that Crashpad should be
// enabled.

12
www/chromium/patches/patch-base_base_switches_h
View File

@ -1,12 +0,0 @@
Index: base/base_switches.h
--- base/base_switches.h.orig
+++ base/base_switches.h
@@ -60,7 +60,7 @@ extern const char kPackageVersionName[];
extern const char kPackageVersionCode[];
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
// Crashpad is fully enabled on Linux.
extern const char kEnableCrashpad[];

2
www/chromium/patches/patch-base_functional_unretained_traits_h
View File

@ -1,7 +1,7 @@
Index: base/functional/unretained_traits.h
--- base/functional/unretained_traits.h.orig
+++ base/functional/unretained_traits.h
@@ -99,7 +99,7 @@ struct SupportsUnretainedImpl {
@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl {
// official builds, and then in non-test code as well.
#if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \
(!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \

4
www/chromium/patches/patch-base_i18n_icu_util_cc
View File

@ -1,7 +1,7 @@
Index: base/i18n/icu_util.cc
--- base/i18n/icu_util.cc.orig
+++ base/i18n/icu_util.cc
@@ -51,7 +51,7 @@
@@ -52,7 +52,7 @@
#include "third_party/icu/source/common/unicode/unistr.h"
#endif
@ -10,7 +10,7 @@ Index: base/i18n/icu_util.cc
BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() {
@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));

2
www/chromium/patches/patch-base_native_library_unittest_cc
View File

@ -1,7 +1,7 @@
Index: base/native_library_unittest.cc
--- base/native_library_unittest.cc.orig
+++ base/native_library_unittest.cc
@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
@@ -133,7 +133,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
// versions with respect to symbol resolution scope.
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
#if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \

96
www/chromium/patches/patch-base_process_process_handle_openbsd_cc
View File

@ -1,19 +1,23 @@
Index: base/process/process_handle_openbsd.cc
--- base/process/process_handle_openbsd.cc.orig
+++ base/process/process_handle_openbsd.cc
@@ -3,8 +3,11 @@
@@ -3,48 +3,112 @@
// found in the LICENSE file.
#include "base/process/process_handle.h"
+#include "base/files/file_util.h"
#include <stddef.h>
+#include <stdlib.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/types.h>
#include <unistd.h>
@@ -12,39 +15,59 @@
+#include <kvm.h>
+
namespace base {
ProcessId GetParentProcessId(ProcessHandle process) {
@ -27,18 +31,19 @@ Index: base/process/process_handle_openbsd.cc
if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
return -1;
- mib[5] = (length / sizeof(struct kinfo_proc));
+ info = (struct kinfo_proc *)malloc(length);
+
mib[5] = (length / sizeof(struct kinfo_proc));
- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return -1;
+ mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc)));
- return info.p_ppid;
+ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) {
+ ppid = -1;
+ goto out;
+ }
- return info.p_ppid;
+
+ ppid = info->p_ppid;
+
+out:
@ -48,16 +53,20 @@ Index: base/process/process_handle_openbsd.cc
FilePath GetProcessExecutablePath(ProcessHandle process) {
- struct kinfo_proc kp;
- size_t len;
+ struct kinfo_proc *info;
+ size_t length;
+ char *path = NULL;
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
sizeof(struct kinfo_proc), 0 };
+ struct kinfo_file *files;
+ kvm_t *kd = NULL;
+ char errbuf[_POSIX2_LINE_MAX];
+ char **retvalargs, *cpath, retval[PATH_MAX];
+ int cnt;
size_t len;
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
- sizeof(struct kinfo_proc), 0 };
+ char *tokens[2];
+ struct stat sb;
+ FilePath *result = nullptr;
- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1)
+ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1)
return FilePath();
- return FilePath();
- mib[5] = (len / sizeof(struct kinfo_proc));
- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0)
- return FilePath();
@ -65,26 +74,61 @@ Index: base/process/process_handle_openbsd.cc
- return FilePath();
- if (strcmp(kp.p_comm, "chrome") == 0)
- return FilePath(kp.p_comm);
+ int mib[] = { CTL_KERN, KERN_PROC_ARGS, process, KERN_PROC_ARGV };
- return FilePath();
+ info = (struct kinfo_proc *)malloc(length);
+ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
+ *result = FilePath(cpath);
+ else
+ *result = FilePath("/usr/local/chrome/chrome");
+
+ mib[5] = (length / sizeof(struct kinfo_proc));
+ if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) {
+ retvalargs = static_cast<char**>(malloc(len));
+ if (!retvalargs)
+ return *result;
+
+ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0)
+ goto out;
+ if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) {
+ free(retvalargs);
+ return *result;
+ }
+
+ if ((info->p_flag & P_SYSTEM) != 0)
+ goto out;
+ if ((*tokens = strtok(retvalargs[0], ":")) == NULL) {
+ free(retvalargs);
+ return *result;
+ }
+
+ if (strcmp(info->p_comm, "chrome") == 0) {
+ path = info->p_comm;
+ goto out;
+ free(retvalargs);
+
+ if (tokens[0] == NULL)
+ return *result;
+
+ if (realpath(tokens[0], retval) == NULL)
+ return *result;
+
+ if (stat(retval, &sb) < 0)
+ return *result;
+
+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES,
+ errbuf)) == NULL)
+ return *result;
+
+ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process,
+ sizeof(struct kinfo_file), &cnt)) == NULL) {
+ kvm_close(kd);
+ return *result;
+ }
+
+ for (int i = 0; i < cnt; i++) {
+ if (files[i].fd_fd == KERN_FILE_TEXT &&
+ files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
+ files[i].va_fileid == sb.st_ino) {
+ kvm_close(kd);
+ *result = FilePath(retval);
+ }
+ }
+ }
+
+out:
+ free(info);
+ return FilePath(path);
+ return *result;
}
} // namespace base

2
www/chromium/patches/patch-base_process_process_metrics_h
View File

@ -110,7 +110,7 @@ Index: base/process/process_metrics.h
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics {
@@ -594,7 +592,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

2
www/chromium/patches/patch-base_process_process_unittest_cc
View File

@ -1,7 +1,7 @@
Index: base/process/process_unittest.cc
--- base/process/process_unittest.cc.orig
+++ base/process/process_unittest.cc
@@ -198,7 +198,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
@@ -199,7 +199,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
// was spawned and a time recorded after it was spawned. However, since the
// base::Time and process creation clocks don't match, tolerate some error.
constexpr base::TimeDelta kTolerance =

2
www/chromium/patches/patch-base_profiler_stack_sampling_profiler_unittest_cc
View File

@ -1,7 +1,7 @@
Index: base/profiler/stack_sampling_profiler_unittest.cc
--- base/profiler/stack_sampling_profiler_unittest.cc.orig
+++ base/profiler/stack_sampling_profiler_unittest.cc
@@ -41,7 +41,7 @@
@@ -42,7 +42,7 @@
#include <intrin.h>
#include <malloc.h>
#include <windows.h>

2
www/chromium/patches/patch-base_rand_util_posix_cc
View File

@ -50,7 +50,7 @@ Index: base/rand_util_posix.cc
} // namespace
@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) {
RandBytes(make_span(reinterpret_cast<uint8_t*>(output), output_length));
RandBytes(make_span(static_cast<uint8_t*>(output), output_length));
}
+#if !BUILDFLAG(IS_BSD)

4
www/chromium/patches/patch-base_synchronization_lock_impl_h
View File

@ -1,7 +1,7 @@
Index: base/synchronization/lock_impl.h
--- base/synchronization/lock_impl.h.orig
+++ base/synchronization/lock_impl.h
@@ -106,6 +106,10 @@ void LockImpl::Unlock() {
@@ -105,6 +105,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@ -12,7 +12,7 @@ Index: base/synchronization/lock_impl.h
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
@@ -126,6 +130,9 @@ void LockImpl::Unlock() {
@@ -125,6 +129,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}

4
www/chromium/patches/patch-base_syslog_logging_cc
View File

@ -1,7 +1,7 @@
Index: base/syslog_logging.cc
--- base/syslog_logging.cc.orig
+++ base/syslog_logging.cc
@@ -15,7 +15,7 @@
@@ -17,7 +17,7 @@
#include "base/strings/string_util.h"
#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
@ -10,7 +10,7 @@ Index: base/syslog_logging.cc
// <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
// base::LOG_INFO, base::LOG_WARNING.
#include <syslog.h>
@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() {
@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() {
if (user_sid != nullptr)
::LocalFree(user_sid);

6
www/chromium/patches/patch-base_system_sys_info_posix_cc
View File

@ -1,7 +1,7 @@
Index: base/system/sys_info_posix.cc
--- base/system/sys_info_posix.cc.orig
+++ base/system/sys_info_posix.cc
@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
@@ -118,7 +118,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
namespace base {
@ -10,7 +10,7 @@ Index: base/system/sys_info_posix.cc
// static
int SysInfo::NumberOfProcessors() {
#if BUILDFLAG(IS_MAC)
@@ -174,7 +174,7 @@ int SysInfo::NumberOfProcessors() {
@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() {
return cached_num_cpus;
}
@ -19,7 +19,7 @@ Index: base/system/sys_info_posix.cc
// static
uint64_t SysInfo::AmountOfVirtualMemory() {
@@ -264,6 +264,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
@@ -265,6 +265,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
arch = "x86";
} else if (arch == "amd64") {
arch = "x86_64";

2
www/chromium/patches/patch-base_test_test_file_util_posix_cc
View File

@ -1,7 +1,7 @@
Index: base/test/test_file_util_posix.cc
--- base/test/test_file_util_posix.cc.orig
+++ base/test/test_file_util_posix.cc
@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() {
@@ -89,7 +89,7 @@ void SyncPageCacheToDisk() {
}
#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \

2
www/chromium/patches/patch-base_threading_hang_watcher_cc
View File

@ -1,7 +1,7 @@
Index: base/threading/hang_watcher.cc
--- base/threading/hang_watcher.cc.orig
+++ base/threading/hang_watcher.cc
@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
@@ -332,7 +332,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);

2
www/chromium/patches/patch-base_threading_platform_thread_internal_posix_cc
View File

@ -1,7 +1,7 @@
Index: base/threading/platform_thread_internal_posix.cc
--- base/threading/platform_thread_internal_posix.cc.orig
+++ base/threading/platform_thread_internal_posix.cc
@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
@@ -42,7 +42,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
}
int GetCurrentThreadNiceValue() {

4
www/chromium/patches/patch-base_trace_event_process_memory_dump_cc
View File

@ -1,7 +1,7 @@
Index: base/trace_event/process_memory_dump.cc
--- base/trace_event/process_memory_dump.cc.orig
+++ base/trace_event/process_memory_dump.cc
@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
@@ -113,7 +113,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
#if BUILDFLAG(IS_WIN)
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
@ -10,7 +10,7 @@ Index: base/trace_event/process_memory_dump.cc
std::unique_ptr<char[]> vec(new char[max_vec_size]);
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
@@ -135,7 +135,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
for (size_t i = 0; i < page_count; i++)
resident_page_count += vec[i].VirtualAttributes.Valid;

12
www/chromium/patches/patch-build_config_clang_BUILD_gn Normal file
View File

@ -0,0 +1,12 @@
Index: build/config/clang/BUILD.gn
--- build/config/clang/BUILD.gn.orig
+++ build/config/clang/BUILD.gn
@@ -194,7 +194,7 @@ template("clang_lib") {
# Adds a dependency on the Clang runtime library clang_rt.builtins.
clang_lib("compiler_builtins") {
- if (!toolchain_has_rust) {
+ if (!toolchain_has_rust || is_bsd) {
# Since there's no Rust in the toolchain, there's no concern that we'll use
# the Rust stdlib's intrinsics here.
#

14
www/chromium/patches/patch-build_config_compiler_BUILD_gn
View File

@ -28,7 +28,7 @@ Index: build/config/compiler/BUILD.gn
}
# compiler ---------------------------------------------------------------------
@@ -520,6 +523,10 @@ config("compiler") {
@@ -515,6 +518,10 @@ config("compiler") {
}
}
@ -39,7 +39,7 @@ Index: build/config/compiler/BUILD.gn
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -595,7 +602,7 @@ config("compiler") {
@@ -590,7 +597,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -84,7 +84,7 @@ Index: build/config/compiler/BUILD.gn
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1874,12 +1881,9 @@ config("default_warnings") {
@@ -1877,12 +1884,9 @@ config("default_warnings") {
# TODO(crbug.com/1494809): Evaluate and possibly enable.
"-Wno-vla-extension",
@ -98,7 +98,7 @@ Index: build/config/compiler/BUILD.gn
cflags_cc += [
# TODO(https://crbug.com/1513724): Fix and re-enable.
"-Wno-c++11-narrowing-const-reference",
@@ -2067,7 +2071,7 @@ config("no_chromium_code") {
@@ -2100,7 +2104,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -107,7 +107,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2596,7 +2600,7 @@ config("afdo_optimize_size") {
@@ -2619,7 +2623,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") {
@ -116,7 +116,7 @@ Index: build/config/compiler/BUILD.gn
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2623,7 +2627,7 @@ config("afdo") {
@@ -2646,7 +2650,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -125,7 +125,7 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2787,7 +2791,8 @@ config("symbols") {
@@ -2810,7 +2814,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

14
www/chromium/patches/patch-build_config_rust_gni Normal file
View File

@ -0,0 +1,14 @@
Index: build/config/rust.gni
--- build/config/rust.gni.orig
+++ build/config/rust.gni
@@ -280,6 +280,10 @@ if (is_linux || is_chromeos) {
}
}
+if (is_bsd) {
+ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os)
+}
+
assert(!toolchain_has_rust || rust_abi_target != "")
# This variable is passed to the Rust libstd build.

11
www/chromium/patches/patch-build_rust_std_BUILD_gn Normal file
View File

@ -0,0 +1,11 @@
Index: build/rust/std/BUILD.gn
--- build/rust/std/BUILD.gn.orig
+++ build/rust/std/BUILD.gn
@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
- "profiler_builtins",
"rustc_std_workspace_alloc",
"rustc_std_workspace_core",
"rustc_std_workspace_std",

4
www/chromium/patches/patch-build_toolchain_gcc_toolchain_gni
View File

@ -1,7 +1,7 @@
Index: build/toolchain/gcc_toolchain.gni
--- build/toolchain/gcc_toolchain.gni.orig
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
}
@ -15,7 +15,7 @@ Index: build/toolchain/gcc_toolchain.gni
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -886,22 +893,12 @@ template("gcc_toolchain") {
@@ -890,22 +897,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {

2
www/chromium/patches/patch-build_toolchain_toolchain_gni
View File

@ -1,7 +1,7 @@
Index: build/toolchain/toolchain.gni
--- build/toolchain/toolchain.gni.orig
+++ build/toolchain/toolchain.gni
@@ -72,7 +72,7 @@ if (host_os == "mac") {
@@ -68,7 +68,7 @@ if (host_os == "mac") {
host_shlib_extension = ".dylib"
} else if (host_os == "win") {
host_shlib_extension = ".dll"

2
www/chromium/patches/patch-cc_BUILD_gn
View File

@ -10,7 +10,7 @@ Index: cc/BUILD.gn
data_deps = [ "//third_party/mesa_headers" ]
}
if (skia_use_dawn) {
@@ -938,7 +938,6 @@ cc_test("cc_unittests") {
@@ -937,7 +937,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

10
www/chromium/patches/patch-chrome_app_chrome_main_cc
View File

@ -1,8 +1,8 @@
Index: chrome/app/chrome_main.cc
--- chrome/app/chrome_main.cc.orig
+++ chrome/app/chrome_main.cc
@@ -29,11 +29,11 @@
#include "chrome/app/notification_metrics.h"
@@ -28,11 +28,11 @@
#include "chrome/app/chrome_main_mac.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -15,7 +15,7 @@ Index: chrome/app/chrome_main.cc
#include "chrome/app/chrome_main_linux.h"
#endif
@@ -81,7 +81,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -80,7 +80,7 @@ int ChromeMain(int argc, const char** argv) {
#error Unknown platform.
#endif
@ -24,7 +24,7 @@ Index: chrome/app/chrome_main.cc
PossiblyDetermineFallbackChromeChannel(argv[0]);
#endif
@@ -142,7 +142,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -141,7 +141,7 @@ int ChromeMain(int argc, const char** argv) {
SetUpBundleOverrides();
#endif
@ -33,7 +33,7 @@ Index: chrome/app/chrome_main.cc
AppendExtraArgumentsToCommandLine(command_line);
#endif
@@ -171,7 +171,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -170,7 +170,7 @@ int ChromeMain(int argc, const char** argv) {
headless_mode_handle = headless::InitHeadlessMode();
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

38
www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc
View File

@ -10,7 +10,7 @@ Index: chrome/app/chrome_main_delegate.cc
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -190,16 +190,16 @@
@@ -188,16 +188,16 @@
#include "v8/include/v8.h"
#endif
@ -30,7 +30,7 @@ Index: chrome/app/chrome_main_delegate.cc
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -339,7 +339,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -337,7 +337,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -39,7 +39,7 @@ Index: chrome/app/chrome_main_delegate.cc
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -424,7 +424,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -48,7 +48,16 @@ Index: chrome/app/chrome_main_delegate.cc
// 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) ||
@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -481,7 +481,7 @@ void AddFeatureFlagsToCommandLine(
}
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
void SIGTERMProfilingShutdown(int signal) {
content::Profiling::Stop();
struct sigaction sigact;
@@ -636,7 +636,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -57,7 +66,7 @@ Index: chrome/app/chrome_main_delegate.cc
// 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.
@@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -763,7 +763,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -66,7 +75,16 @@ Index: chrome/app/chrome_main_delegate.cc
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -1138,7 +1138,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
@@ -1116,7 +1116,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
const bool emit_crashes =
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
chrome::GetChannel() == version_info::Channel::CANARY ||
chrome::GetChannel() == version_info::Channel::DEV;
#else
@@ -1130,7 +1130,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
@ -75,7 +93,7 @@ Index: chrome/app/chrome_main_delegate.cc
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1290,7 +1290,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1276,7 +1276,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -84,7 +102,7 @@ Index: chrome/app/chrome_main_delegate.cc
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1320,7 +1320,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1306,7 +1306,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -93,7 +111,7 @@ Index: chrome/app/chrome_main_delegate.cc
nacl::RegisterPathProvider();
#endif
@@ -1717,7 +1717,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1703,7 +1703,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -102,7 +120,7 @@ Index: chrome/app/chrome_main_delegate.cc
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1826,7 +1826,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1804,7 +1804,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.

2
www/chromium/patches/patch-chrome_browser_BUILD_gn
View File

@ -1,7 +1,7 @@
Index: chrome/browser/BUILD.gn
--- chrome/browser/BUILD.gn.orig
+++ chrome/browser/BUILD.gn
@@ -6477,6 +6477,13 @@ static_library("browser") {
@@ -6513,6 +6513,13 @@ static_library("browser") {
}
}

81
www/chromium/patches/patch-chrome_browser_about_flags_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/about_flags.cc
#include "base/allocator/buildflags.h"
#endif
@@ -327,7 +327,7 @@
@@ -326,7 +326,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@ -19,7 +19,7 @@ Index: chrome/browser/about_flags.cc
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -336,7 +336,7 @@
@@ -335,7 +335,7 @@
#include "chrome/browser/win/titlebar_config.h"
#endif
@ -28,7 +28,7 @@ Index: chrome/browser/about_flags.cc
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -493,7 +493,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -492,7 +492,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -37,7 +37,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1389,7 +1389,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
@@ -1374,7 +1374,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -46,7 +46,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"},
@@ -3749,7 +3749,7 @@ const flags_ui::FeatureEntry::FeatureVariation
@@ -3687,7 +3687,7 @@ const flags_ui::FeatureEntry::FeatureVariation
std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
};
@ -55,7 +55,7 @@ Index: chrome/browser/about_flags.cc
const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
const flags_ui::FeatureEntry::FeatureParam
@@ -4506,7 +4506,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4425,7 +4425,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_ANDROID)
@ -64,7 +64,16 @@ Index: chrome/browser/about_flags.cc
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -5063,7 +5063,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4864,7 +4864,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
flag_descriptions::kShortcutsNotAppsDescription,
kOsMac | kOsWin | kOsLinux | kOsFuchsia,
@@ -4993,7 +4993,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -73,7 +82,7 @@ Index: chrome/browser/about_flags.cc
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5079,7 +5079,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5009,7 +5009,7 @@ const FeatureEntry kFeatureEntries[] = {
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
#endif // BUILDFLAG(IS_LINUX)
@ -82,7 +91,7 @@ Index: chrome/browser/about_flags.cc
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5367,7 +5367,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5292,7 +5292,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kRefreshFeedOnRestart)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -91,7 +100,7 @@ Index: chrome/browser/about_flags.cc
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -6011,7 +6011,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5943,7 +5943,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -100,7 +109,7 @@ Index: chrome/browser/about_flags.cc
{"omnibox-actions-ui-simplification",
flag_descriptions::kOmniboxActionsUISimplificationName,
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
@@ -6836,7 +6836,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6800,7 +6800,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@ -108,8 +117,8 @@ Index: chrome/browser/about_flags.cc
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -7817,7 +7817,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(net::features::kAsyncDns)},
@@ -7778,7 +7778,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -118,7 +127,7 @@ Index: chrome/browser/about_flags.cc
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -7850,7 +7850,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7811,7 +7811,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
@ -127,16 +136,7 @@ Index: chrome/browser/about_flags.cc
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -8478,7 +8478,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -8738,7 +8738,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8709,7 +8709,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -145,7 +145,7 @@ Index: chrome/browser/about_flags.cc
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8780,7 +8780,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8751,7 +8751,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -154,7 +154,7 @@ Index: chrome/browser/about_flags.cc
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9065,7 +9065,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9040,7 +9040,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -163,16 +163,16 @@ Index: chrome/browser/about_flags.cc
{"policy-indication-for-managed-default-search",
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
@@ -9365,7 +9365,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9344,7 +9344,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
@@ -10432,7 +10432,7 @@ const FeatureEntry kFeatureEntries[] = {
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -10334,7 +10334,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@ -181,16 +181,16 @@ Index: chrome/browser/about_flags.cc
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10463,7 +10463,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10365,7 +10365,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"site-search-settings-policy",
flag_descriptions::kSiteSearchSettingsPolicyName,
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
@@ -10593,7 +10593,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10495,7 +10495,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
#endif
@ -199,7 +199,7 @@ Index: chrome/browser/about_flags.cc
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10945,7 +10945,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10838,7 +10838,7 @@ const FeatureEntry kFeatureEntries[] = {
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
#endif
@ -208,3 +208,12 @@ Index: chrome/browser/about_flags.cc
{"restart-to-gain-access-to-keychain",
flag_descriptions::kRestartToGainAccessToKeychainName,
flag_descriptions::kRestartToGainAccessToKeychainDescription,
@@ -11092,7 +11092,7 @@ const FeatureEntry kFeatureEntries[] = {
// Controls the view mode for (history) sync screen.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
{"minor-mode-restrictions-for-history-sync-opt-in",
flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInName,
flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInDescription,

2
www/chromium/patches/patch-chrome_browser_accessibility_pdf_ocr_controller_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/accessibility/pdf_ocr_controller.cc
--- chrome/browser/accessibility/pdf_ocr_controller.cc.orig
+++ chrome/browser/accessibility/pdf_ocr_controller.cc
@@ -86,7 +86,7 @@ void AnnounceToScreenReader(const int message_id) {
@@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) {
// TODO(crbug.com/1442928): Sending announcements results in a failure in
// `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and
// flaky fail when running Chrome.

6
www/chromium/patches/patch-chrome_browser_after_startup_task_utils_cc
View File

@ -1,9 +1,9 @@
Index: chrome/browser/after_startup_task_utils.cc
--- chrome/browser/after_startup_task_utils.cc.orig
+++ chrome/browser/after_startup_task_utils.cc
@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() {
TRACE_EVENT0("startup", "SetBrowserStartupIsComplete");
g_startup_complete_flag.Get().Set();
@@ -115,7 +115,7 @@ void SetBrowserStartupIsComplete() {
TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
GetStartupCompleteFlag().Set();
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)

2
www/chromium/patches/patch-chrome_browser_background_background_mode_manager_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/background/background_mode_manager.cc
--- chrome/browser/background/background_mode_manager.cc.orig
+++ chrome/browser/background/background_mode_manager.cc
@@ -869,7 +869,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
@@ -870,7 +870,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();

2
www/chromium/patches/patch-chrome_browser_background_background_mode_optimizer_cc
View File

@ -8,5 +8,5 @@ Index: chrome/browser/background/background_mode_optimizer.cc
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) {
// Private ctor.
return base::WrapUnique(new BackgroundModeOptimizer());
}

4
www/chromium/patches/patch-chrome_browser_browser_features_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/browser_features.cc
--- chrome/browser/browser_features.cc.orig
+++ chrome/browser/browser_features.cc
@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache,
@@ -44,7 +44,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -10,7 +10,7 @@ Index: chrome/browser/browser_features.cc
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -302,7 +302,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2,
@@ -328,7 +328,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2,
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
"SupportSearchSuggestionForPrerender2",
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \

8
www/chromium/patches/patch-chrome_browser_browser_process_impl_cc
View File

@ -1,8 +1,8 @@
Index: chrome/browser/browser_process_impl.cc
--- chrome/browser/browser_process_impl.cc.orig
+++ chrome/browser/browser_process_impl.cc
@@ -219,7 +219,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@@ -220,7 +220,7 @@
#include "chrome/browser/ui/profiles/profile_picker.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@ -10,7 +10,7 @@ Index: chrome/browser/browser_process_impl.cc
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1232,7 +1232,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1253,7 +1253,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -19,7 +19,7 @@ Index: chrome/browser/browser_process_impl.cc
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1511,7 +1511,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1533,7 +1533,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

12
www/chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc
View File

@ -26,7 +26,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
@@ -829,7 +829,7 @@ void BindScreen2xMainContentExtractor(
@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -35,7 +35,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<
@@ -1025,7 +1025,7 @@ void PopulateChromeFrameBinders(
@@ -1027,7 +1027,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -44,7 +44,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -1033,7 +1033,7 @@ void PopulateChromeFrameBinders(
@@ -1035,7 +1035,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -53,7 +53,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -1120,7 +1120,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1122,7 +1122,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -62,7 +62,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1132,7 +1132,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1134,7 +1134,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -71,7 +71,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1676,7 +1676,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1687,7 +1687,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

18
www/chromium/patches/patch-chrome_browser_chrome_browser_main_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_browser_main.cc
--- chrome/browser/chrome_browser_main.cc.orig
+++ chrome/browser/chrome_browser_main.cc
@@ -245,11 +245,11 @@
@@ -246,11 +246,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -15,7 +15,7 @@ Index: chrome/browser/chrome_browser_main.cc
#include "components/crash/core/app/crashpad.h"
#endif
@@ -282,14 +282,14 @@
@@ -283,14 +283,14 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -32,7 +32,7 @@ Index: chrome/browser/chrome_browser_main.cc
#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"
@@ -351,14 +351,14 @@
@@ -352,14 +352,14 @@
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -49,7 +49,7 @@ Index: chrome/browser/chrome_browser_main.cc
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1073,7 +1073,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -58,7 +58,7 @@ Index: chrome/browser/chrome_browser_main.cc
// 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 .
@@ -1124,7 +1124,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1121,7 +1121,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) || \
@ -67,7 +67,7 @@ Index: chrome/browser/chrome_browser_main.cc
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1323,7 +1323,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1320,7 +1320,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -76,7 +76,7 @@ Index: chrome/browser/chrome_browser_main.cc
// Delete the media history database if it still exists.
// TODO(crbug.com/1198344): Remove this.
base::ThreadPool::PostTask(
@@ -1372,7 +1372,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1369,7 +1369,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -85,7 +85,7 @@ Index: chrome/browser/chrome_browser_main.cc
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1480,7 +1480,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1477,7 +1477,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
@ -94,7 +94,7 @@ Index: chrome/browser/chrome_browser_main.cc
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
@@ -2011,7 +2011,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -2016,7 +2016,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.

12
www/chromium/patches/patch-chrome_browser_chrome_browser_main_extra_parts_ozone_cc Normal file
View File

@ -0,0 +1,12 @@
Index: chrome/browser/chrome_browser_main_extra_parts_ozone.cc
--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig
+++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
@@ -31,7 +31,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
}
void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() {
-#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
// Lacros's `PostMainMessageLoopRun` must be called at the very end of
// `PostMainMessageLoopRun` in
// `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`.

22
www/chromium/patches/patch-chrome_browser_chrome_browser_main_linux_cc
View File

@ -1,7 +1,16 @@
Index: chrome/browser/chrome_browser_main_linux.cc
--- chrome/browser/chrome_browser_main_linux.cc.orig
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -67,7 +67,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
@@ -24,7 +24,7 @@
#include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
#include "ui/base/l10n/l10n_util.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -71,7 +71,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
#endif // BUILDFLAG(IS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS)
@ -11,7 +20,16 @@ Index: chrome/browser/chrome_browser_main_linux.cc
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
@@ -124,7 +126,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
@@ -135,7 +137,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {

12
www/chromium/patches/patch-chrome_browser_chrome_browser_main_linux_h Normal file
View File

@ -0,0 +1,12 @@
Index: chrome/browser/chrome_browser_main_linux.h
--- chrome/browser/chrome_browser_main_linux.h.orig
+++ chrome/browser/chrome_browser_main_linux.h
@@ -30,7 +30,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows
// ChromeBrowserMainPartsPosix overrides.
void PostCreateMainMessageLoop() override;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void PostMainMessageLoopRun() override;
#endif
void PreProfileInit() override;

46
www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.cc
--- chrome/browser/chrome_content_browser_client.cc.orig
+++ chrome/browser/chrome_content_browser_client.cc
@@ -456,7 +456,7 @@
@@ -457,7 +457,7 @@
#include "storage/browser/file_system/external_mount_points.h"
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#elif BUILDFLAG(IS_ANDROID)
@@ -559,12 +559,12 @@
@@ -565,12 +565,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -25,7 +25,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -575,14 +575,14 @@
@@ -581,14 +581,14 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
#endif
@ -42,7 +42,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -598,7 +598,7 @@
@@ -604,7 +604,7 @@
#include "components/lens/lens_features.h"
#endif
@ -51,7 +51,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1457,7 +1457,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1467,7 +1467,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
#if BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
#endif // BUILDFLAG(IS_CHROMEOS)
@ -60,7 +60,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1576,7 +1576,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1588,7 +1588,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -69,7 +69,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1613,7 +1613,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1625,7 +1625,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.
@ -78,7 +78,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1634,7 +1634,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1646,7 +1646,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -87,7 +87,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1653,7 +1653,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1665,7 +1665,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -96,16 +96,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2485,6 +2485,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2502,7 +2502,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
client_info->client_id);
}
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
+#elif BUILDFLAG(IS_BSD)
+ bool enable_crash_reporter = false;
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2826,7 +2828,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
-#if !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
pid_t pid;
if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
command_line->AppendSwitchASCII(
@@ -2823,7 +2823,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -114,7 +114,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4478,7 +4480,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4506,7 +4506,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -123,7 +123,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5037,7 +5039,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5065,7 +5065,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -132,7 +132,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5047,7 +5049,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5075,7 +5075,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -141,7 +141,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5086,7 +5088,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5114,7 +5114,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@ -150,7 +150,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7033,7 +7035,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7083,7 +7083,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.

2
www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.h
--- chrome/browser/chrome_content_browser_client.h.orig
+++ chrome/browser/chrome_content_browser_client.h
@@ -489,7 +489,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -497,7 +497,7 @@ class ChromeContentBrowserClient : public content::Con
bool IsPluginAllowedToUseDevChannelAPIs(
content::BrowserContext* browser_context,
const GURL& url) override;

19
www/chromium/patches/patch-chrome_browser_component_updater_widevine_cdm_component_installer_cc
View File

@ -1,16 +1,16 @@
Index: chrome/browser/component_updater/widevine_cdm_component_installer.cc
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -40,7 +40,7 @@
@@ -41,7 +41,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_BSD)
#include "base/path_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
#endif
@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
const char ImageLoaderComponentName[] = "WidevineCdm";
#endif
@ -19,7 +19,16 @@ Index: chrome/browser/component_updater/widevine_cdm_component_installer.cc
// 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.
@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version
}
#endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#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. To locate the Widevine CDM at startup, a hint file
// is used. Update the hint file with the new Widevine CDM path.
@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
return;
}

6
www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/download/chrome_download_manager_delegate.cc
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1661,7 +1661,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1674,7 +1674,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -10,7 +10,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -1780,7 +1780,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1793,7 +1793,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) || \
@ -19,7 +19,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
// 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()) {
@@ -1826,7 +1826,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -1839,7 +1839,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

2
www/chromium/patches/patch-chrome_browser_download_download_item_model_cc
View File

@ -19,7 +19,7 @@ Index: chrome/browser/download/download_item_model.cc
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1149,7 +1149,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1107,7 +1107,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

8
www/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_cc
View File

@ -5,8 +5,8 @@ Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router
BrowserCrashEventRouter::BrowserCrashEventRouter(
content::BrowserContext* context) {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
Profile* profile = Profile::FromBrowserContext(context);
@ -14,8 +14,8 @@ Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router
}
BrowserCrashEventRouter::~BrowserCrashEventRouter() {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
crash_reporting_context->RemoveProfile(this);

4
www/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash_reporting_context_cc
View File

@ -5,8 +5,8 @@ Index: chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
namespace enterprise_connectors {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
namespace {

2
www/chromium/patches/patch-chrome_browser_extensions_BUILD_gn
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/BUILD.gn
--- chrome/browser/extensions/BUILD.gn.orig
+++ chrome/browser/extensions/BUILD.gn
@@ -1380,6 +1380,10 @@ static_library("extensions") {
@@ -1376,6 +1376,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

2
www/chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -600,7 +600,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

2
www/chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -279,7 +279,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
@@ -281,7 +281,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "openbsd") == 0) {

4
www/chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
settings_api::PrefType::kBoolean;
@ -10,7 +10,7 @@ Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::kBoolean;
#endif
@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// Appearance settings.
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;

2
www/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/tabs/tabs_api.cc
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -836,7 +836,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
@@ -889,7 +889,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
// minimized.
// TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
// TODO(crbug.com/1410400): Find a fix for wayland as well.

35
www/chromium/patches/patch-chrome_browser_flag_descriptions_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.cc
--- chrome/browser/flag_descriptions.cc.orig
+++ chrome/browser/flag_descriptions.cc
@@ -2895,7 +2895,7 @@ const char kCbdTimeframeRequiredDescription[] =
@@ -2931,7 +2931,7 @@ const char kCbdTimeframeRequiredDescription[] =
"value to the list.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,16 +10,16 @@ Index: chrome/browser/flag_descriptions.cc
const char kPolicyIndicationForManagedDefaultSearchName[] =
"Enable policy indication for managed Default Search provider";
const char kPolicyIndicationForManagedDefaultSearchDescription[] =
@@ -3213,7 +3213,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
@@ -3256,7 +3256,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
"but in the same SiteInstanceGroup, and thus the same process.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
const char kSiteSearchSettingsPolicyDescription[] =
"Allow site search engines to be defined by the SiteSearchSettings policy.";
@@ -7387,7 +7387,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
@@ -7485,7 +7485,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -28,7 +28,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7633,7 +7633,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
@@ -7731,7 +7731,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
// Linux -----------------------------------------------------------------------
@ -37,25 +37,16 @@ Index: chrome/browser/flag_descriptions.cc
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7681,7 +7681,7 @@ const char kZeroCopyVideoCaptureDescription[] =
@@ -7779,7 +7779,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -7690,7 +7690,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7705,7 +7705,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
@@ -7794,7 +7794,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@ -64,7 +55,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7737,7 +7737,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7826,7 +7826,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -73,7 +64,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7757,7 +7757,7 @@ const char kRestartToGainAccessToKeychainDescription[]
@@ -7846,7 +7846,7 @@ const char kRestartToGainAccessToKeychainDescription[]
"to restart Chrome to gain access to computer's password manager.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -82,7 +73,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7858,7 +7858,7 @@ const char kElementCaptureDescription[] =
@@ -7947,7 +7947,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -91,8 +82,8 @@ Index: chrome/browser/flag_descriptions.cc
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7910,7 +7910,7 @@ const char kComposeName[] = "CCO Edits";
const char kComposeDescription[] = "Enables CCO editing feature";
@@ -7996,7 +7996,7 @@ const char kComposeTextSelectionDescription[] =
"Enables feature for different heuristics for selecting text for Compose";
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

41
www/chromium/patches/patch-chrome_browser_flag_descriptions_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.h
--- chrome/browser/flag_descriptions.h.orig
+++ chrome/browser/flag_descriptions.h
@@ -1665,7 +1665,7 @@ extern const char kCbdTimeframeRequiredName[];
@@ -1691,7 +1691,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,16 +10,16 @@ Index: chrome/browser/flag_descriptions.h
extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif
@@ -1847,7 +1847,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
@@ -1876,7 +1876,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[];
#endif
@@ -4242,7 +4242,7 @@ extern const char kLacrosMergeIcuDataFileName[];
@@ -4302,7 +4302,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -28,7 +28,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4382,7 +4382,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
@@ -4442,7 +4442,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux ---------------------------------------------------------------------
@ -37,24 +37,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4415,14 +4415,14 @@ extern const char kZeroCopyVideoCaptureDescription[];
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kQuickCommandsName[];
extern const char kQuickCommandsDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// defined (OS_FUCHSIA)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -4432,7 +4432,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4484,7 +4484,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,7 +46,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4443,13 +4443,13 @@ extern const char kRestartToGainAccessToKeychainName[]
@@ -4495,13 +4495,13 @@ extern const char kRestartToGainAccessToKeychainName[]
extern const char kRestartToGainAccessToKeychainDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -79,7 +62,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4460,7 +4460,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
@@ -4512,7 +4512,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -88,7 +71,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4537,7 +4537,7 @@ extern const char kElementCaptureDescription[];
@@ -4589,7 +4589,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -97,8 +80,8 @@ Index: chrome/browser/flag_descriptions.h
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4573,7 +4573,7 @@ extern const char kComposeName[];
extern const char kComposeDescription[];
@@ -4623,7 +4623,7 @@ extern const char kComposeTextSelectionName[];
extern const char kComposeTextSelectionDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

4
www/chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/headless/headless_mode_util.cc
--- chrome/browser/headless/headless_mode_util.cc.orig
+++ chrome/browser/headless/headless_mode_util.cc
@@ -18,7 +18,7 @@
@@ -19,7 +19,7 @@
#include "chrome/common/chrome_switches.h"
#include "content/public/common/content_switches.h"
@ -10,7 +10,7 @@ Index: chrome/browser/headless/headless_mode_util.cc
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
@@ -86,7 +86,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
@@ -87,7 +87,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir());
}

20
www/chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/metrics/chrome_metrics_service_client.cc
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -191,7 +191,7 @@
@@ -193,7 +193,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -208,7 +208,7 @@
@@ -210,7 +210,7 @@
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
#endif
@ -19,7 +19,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -581,7 +581,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
@@ -586,7 +586,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -28,7 +28,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
#if !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -767,7 +767,7 @@ void ChromeMetricsServiceClient::Initialize() {
@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::Initialize() {
RegisterUKMProviders();
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -37,7 +37,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
base::SequencedTaskRunner::GetCurrentDefault());
#endif
@@ -814,7 +814,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -820,7 +820,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -46,7 +46,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -899,7 +899,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -905,7 +905,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@ -55,7 +55,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -1009,7 +1009,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -1015,7 +1015,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -64,7 +64,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1174,7 +1174,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1180,7 +1180,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -73,7 +73,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
// Begin initializing the structured metrics system. Initialization must wait
// until a profile is added, because it reads keys stored within the user's
// cryptohome. We only initialize for profiles that are valid candidates
@@ -1205,7 +1205,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1211,7 +1211,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@ -82,7 +82,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
@@ -1548,7 +1548,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
@@ -1554,7 +1554,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
recorder =
std::make_unique<metrics::structured::AshStructuredMetricsRecorder>(
cros_system_profile_provider_.get());

36
www/chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/net/system_network_context_manager.cc
--- chrome/browser/net/system_network_context_manager.cc.orig
+++ chrome/browser/net/system_network_context_manager.cc
@@ -92,7 +92,7 @@
@@ -94,7 +94,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/branded_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -137,7 +137,7 @@ SystemNetworkContextManager* g_system_network_context_
@@ -139,7 +139,7 @@ SystemNetworkContextManager* g_system_network_context_
// received a failed launch for a sandboxed network service.
bool g_previously_failed_to_launch_sandboxed_service = false;
@ -19,7 +19,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
// Whether kerberos library loading will work in the network service due to the
// sandbox.
bool g_network_service_will_allow_gssapi_library_load = false;
@@ -145,7 +145,7 @@ bool g_network_service_will_allow_gssapi_library_load
@@ -147,7 +147,7 @@ bool g_network_service_will_allow_gssapi_library_load
const char* kGssapiDesiredPref =
#if BUILDFLAG(IS_CHROMEOS)
prefs::kKerberosEnabled;
@ -28,7 +28,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
prefs::kReceivedHttpAuthNegotiateHeader;
#endif
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -191,7 +191,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -193,7 +193,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -37,7 +37,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -206,7 +206,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -208,7 +208,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
#endif // BUILDFLAG(IS_ANDROID)
@ -46,7 +46,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
auth_dynamic_params->allow_gssapi_library_load =
local_state->GetBoolean(kGssapiDesiredPref);
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -216,7 +216,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -218,7 +218,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
void OnNewHttpAuthDynamicParams(
network::mojom::HttpAuthDynamicParamsPtr& params) {
@ -55,7 +55,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
// The kerberos library is incompatible with the network service sandbox, so
// if library loading is now enabled, the network service needs to be
// restarted. It will be restarted unsandboxed because is
@@ -258,11 +258,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -260,11 +260,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
@ -69,7 +69,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
// The network service sandbox and the kerberos library are incompatible.
// If kerberos is enabled by policy, disable the network service sandbox.
if (g_network_service_will_allow_gssapi_library_load ||
@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -280,7 +280,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
@ -78,7 +78,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
@@ -508,7 +508,7 @@ void SystemNetworkContextManager::DeleteInstance() {
@@ -510,7 +510,7 @@ void SystemNetworkContextManager::DeleteInstance() {
g_system_network_context_manager = nullptr;
}
@ -87,7 +87,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
SystemNetworkContextManager::GssapiLibraryLoadObserver::
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
: owner_(owner) {}
@@ -566,7 +566,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -568,7 +568,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -96,7 +96,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -582,7 +582,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
auth_pref_callback);
#endif // BUILDFLAG(IS_ANDROID)
@ -105,7 +105,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -606,7 +606,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -608,7 +608,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -114,7 +114,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -663,7 +663,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -123,7 +123,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -685,7 +685,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -687,7 +687,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -132,7 +132,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -694,11 +694,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -696,11 +696,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@ -146,7 +146,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
@@ -751,7 +751,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
@@ -753,7 +753,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@ -155,7 +155,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -954,7 +954,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}
@ -164,7 +164,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
if (!enabled) {
g_network_service_will_allow_gssapi_library_load = true;
}
@@ -1040,7 +1040,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
@@ -1062,7 +1062,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

8
www/chromium/patches/patch-chrome_browser_net_system_network_context_manager_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/net/system_network_context_manager.h
--- chrome/browser/net/system_network_context_manager.h.orig
+++ chrome/browser/net/system_network_context_manager.h
@@ -200,7 +200,7 @@ class SystemNetworkContextManager {
@@ -204,7 +204,7 @@ class SystemNetworkContextManager {
class URLLoaderFactoryForSystem;
class NetworkProcessLaunchWatcher;
@ -10,7 +10,7 @@ Index: chrome/browser/net/system_network_context_manager.h
class GssapiLibraryLoadObserver
: public network::mojom::GssapiLibraryLoadObserver {
public:
@@ -236,7 +236,7 @@ class SystemNetworkContextManager {
@@ -240,7 +240,7 @@ class SystemNetworkContextManager {
void UpdateExplicitlyAllowedNetworkPorts();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -19,9 +19,9 @@ Index: chrome/browser/net/system_network_context_manager.h
// Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
// pref to the enforcement state.
void UpdateEnforceLocalAnchorConstraintsEnabled();
@@ -284,7 +284,7 @@ class SystemNetworkContextManager {
@@ -290,7 +290,7 @@ class SystemNetworkContextManager {
static std::optional<bool> certificate_transparency_enabled_for_testing_;
std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

2
www/chromium/patches/patch-chrome_browser_password_manager_chrome_password_manager_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/password_manager/chrome_password_manager_client.cc
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -675,7 +675,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
@@ -671,7 +671,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
}
void ChromePasswordManagerClient::NotifyKeychainError() {

2
www/chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/password_manager/password_reuse_manager_factory.cc
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
@@ -136,7 +136,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

12
www/chromium/patches/patch-chrome_browser_permissions_chrome_permissions_client_cc
View File

@ -1,12 +0,0 @@
Index: chrome/browser/permissions/chrome_permissions_client.cc
--- chrome/browser/permissions/chrome_permissions_client.cc.orig
+++ chrome/browser/permissions/chrome_permissions_client.cc
@@ -225,7 +225,7 @@ void ChromePermissionsClient::AreSitesImportant(
bool ChromePermissionsClient::IsCookieDeletionDisabled(
content::BrowserContext* browser_context,
const GURL& origin) {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (!base::FeatureList::IsEnabled(
supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)) {
return false;

77
www/chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -224,19 +224,20 @@
@@ -228,19 +228,20 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -25,8 +25,8 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
@@ -247,7 +248,7 @@
#endif
@@ -255,13 +256,13 @@
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
@ -34,7 +34,14 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
#include "chrome/browser/policy/battery_saver_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -837,7 +838,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/search_engines/site_search_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -854,7 +855,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -43,7 +50,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
@@ -847,7 +848,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -864,7 +865,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) \
@ -52,8 +59,8 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1586,7 +1587,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
@@ -1637,7 +1638,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@ -61,7 +68,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1631,7 +1632,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1682,7 +1683,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@ -70,7 +77,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1657,12 +1658,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1708,12 +1709,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -85,7 +92,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
@@ -1671,7 +1672,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1722,7 +1723,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) \
@ -94,7 +101,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1684,7 +1685,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1735,7 +1736,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) \
@ -103,7 +110,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1785,7 +1786,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1836,7 +1837,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -112,7 +119,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1883,7 +1884,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1934,7 +1935,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -121,7 +128,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
// TODO(crbug.com/1454054): replace the
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
// matches the name of the new `getAllScreensMedia` API.
@@ -1892,7 +1893,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1943,7 +1944,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -130,7 +137,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1917,7 +1918,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1968,7 +1969,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -139,7 +146,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1981,7 +1982,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2029,7 +2030,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -148,7 +155,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST },
@@ -2009,7 +2010,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2057,7 +2058,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
@ -157,7 +164,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2044,7 +2045,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2083,7 +2084,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
base::Value::Type::BOOLEAN },
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -166,7 +173,16 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST},
@@ -2171,7 +2172,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2104,7 +2105,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed,
base::Value::Type::INTEGER},
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{ key::kChromeForTestingAllowed,
prefs::kChromeForTestingAllowed,
base::Value::Type::BOOLEAN },
@@ -2221,7 +2222,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -175,7 +191,16 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(
std::make_unique<performance_manager::MemorySaverPolicyHandler>());
// Note: This needs to be created after `DefaultSearchPolicyHandler`.
@@ -2370,7 +2371,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2229,7 +2230,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
handlers->AddHandler(
std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2425,7 +2426,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -184,7 +209,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2428,7 +2429,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2483,7 +2484,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -193,7 +218,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
@@ -2492,7 +2493,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2557,7 +2558,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) || \
@ -202,7 +227,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -2850,7 +2851,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2916,7 +2917,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -211,7 +236,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2858,7 +2859,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2924,7 +2925,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -220,7 +245,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2875,7 +2876,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2941,7 +2942,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
/*new_policy_handler=*/std::make_unique<
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
policy::key::kRelatedWebsiteSetsOverrides, chrome_schema)));
@ -229,7 +254,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2900,7 +2901,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2966,7 +2967,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

38
www/chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/prefs/browser_prefs.cc
--- chrome/browser/prefs/browser_prefs.cc.orig
+++ chrome/browser/prefs/browser_prefs.cc
@@ -486,18 +486,18 @@
@@ -489,18 +489,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -23,7 +23,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#endif
@@ -529,7 +529,7 @@
@@ -535,7 +535,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -32,25 +32,16 @@ Index: chrome/browser/prefs/browser_prefs.cc
#include "ui/color/system_theme.h"
#endif
@@ -567,7 +567,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
@@ -1685,7 +1685,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true);
#endif
// Deprecated 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
#endif
@@ -972,7 +972,7 @@ const char kBorealisVmTokenHash[] = "borealis.vm_token
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
// Deprecated 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1986,12 +1986,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -2031,12 +2031,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -65,12 +56,3 @@ Index: chrome/browser/prefs/browser_prefs.cc
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
enterprise_signin::RegisterProfilePrefs(registry);
#endif
@@ -2121,7 +2121,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
// Please don't delete the preceding line. It is used by PRESUBMIT.py.
// Added 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)

2
www/chromium/patches/patch-chrome_browser_prefs_pref_service_incognito_allowlist_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/prefs/pref_service_incognito_allowlist.cc
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = {
@@ -175,7 +175,7 @@ const char* const kPersistentPrefNames[] = {
prefs::kShowFullscreenToolbar,
#endif

18
www/chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -314,7 +314,7 @@
@@ -317,7 +317,7 @@
#include "chromeos/constants/chromeos_features.h"
#endif
@ -10,8 +10,8 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
#endif
@@ -409,18 +409,18 @@
#endif
@@ -408,18 +408,18 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
@ -32,7 +32,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#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"
@@ -647,7 +647,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -648,7 +648,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance();
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
@ -41,7 +41,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
@@ -765,29 +765,29 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -767,29 +767,29 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -77,7 +77,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -911,7 +911,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -913,7 +913,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -86,7 +86,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
@@ -1017,7 +1017,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1019,7 +1019,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
@ -95,7 +95,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
@@ -1058,7 +1058,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1060,7 +1060,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
ProfileStatisticsFactory::GetInstance();
#endif
@ -104,7 +104,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
ProfileTokenWebSigninInterceptorFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)
@@ -1076,7 +1076,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1078,7 +1078,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
ReduceAcceptLanguageFactory::GetInstance();
RendererUpdaterFactory::GetInstance();

6
www/chromium/patches/patch-chrome_browser_profiles_profile_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/profiles/profile_impl.cc
--- chrome/browser/profiles/profile_impl.cc.orig
+++ chrome/browser/profiles/profile_impl.cc
@@ -261,6 +261,10 @@
@@ -267,6 +267,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@ -12,7 +12,7 @@ Index: chrome/browser/profiles/profile_impl.cc
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -592,7 +596,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
@@ -598,7 +602,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else
{
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -21,7 +21,7 @@ Index: chrome/browser/profiles/profile_impl.cc
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage()
@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

6
www/chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc
View File

@ -16,10 +16,10 @@ Index: chrome/browser/safe_browsing/download_protection/file_analyzer.cc
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT &&
!base::FeatureList::IsEnabled(kMaldocaSkipCheck)) {
StartExtractDocumentFeatures();
#endif
@@ -324,7 +324,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)

15
www/chromium/patches/patch-chrome_browser_screen_ai_screen_ai_install_state_cc
View File

@ -1,16 +1,16 @@
Index: chrome/browser/screen_ai/screen_ai_install_state.cc
--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig
+++ chrome/browser/screen_ai/screen_ai_install_state.cc
@@ -23,7 +23,7 @@
#include "components/services/screen_ai/public/cpp/utilities.h"
@@ -24,7 +24,7 @@
#include "content/public/browser/browser_thread.h"
#include "ui/accessibility/accessibility_features.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/cpu.h"
#include "base/files/file_util.h"
#endif
@@ -39,7 +39,7 @@ const char kMinExpectedVersion[] = "121.1";
@@ -36,7 +36,7 @@ const char kMinExpectedVersion[] = "123.1";
bool IsDeviceCompatible() {
// Check if the CPU has the required instruction set to run the Screen AI
// library.
@ -19,12 +19,3 @@ Index: chrome/browser/screen_ai/screen_ai_install_state.cc
if (!base::CPU().has_sse41()) {
return false;
}
@@ -284,7 +284,7 @@ void ScreenAIInstallState::ResetForTesting() {
void ScreenAIInstallState::SetComponentFolderForTesting() {
CHECK_IS_TEST();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Set the path to the ScreenAI test files. For more details, see the
// `screen_ai_test_files` rule in the accessibility_common BUILD file.
base::FilePath screenai_library_path =

4
www/chromium/patches/patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig
+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
@@ -16,7 +16,7 @@
@@ -15,7 +15,7 @@
#include "components/send_tab_to_self/features.h"
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -10,7 +10,7 @@ Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
#endif
@@ -48,7 +48,7 @@ SendTabToSelfToolbarIconController*
@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController*
ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
Profile* profile) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

4
www/chromium/patches/patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig
+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
@@ -17,7 +17,7 @@
@@ -16,7 +16,7 @@
#include "components/send_tab_to_self/send_tab_to_self_model.h"
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -10,7 +10,7 @@ Index: chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
#endif
@@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
const std::vector<const SendTabToSelfEntry*>& new_entries) {
for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

8
www/chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/sync/chrome_sync_client.cc
--- chrome/browser/sync/chrome_sync_client.cc.orig
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -111,7 +111,7 @@
@@ -110,7 +110,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -10,7 +10,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -456,7 +456,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -19,7 +19,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc
if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) {
controllers.push_back(std::make_unique<syncer::ModelTypeController>(
syncer::SAVED_TAB_GROUP,
@@ -454,7 +454,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -469,7 +469,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.
@ -28,7 +28,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
@@ -610,7 +610,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
@@ -625,7 +625,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

4
www/chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/sync/sync_service_factory.cc
#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)
@@ -126,7 +126,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -130,7 +130,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.
@ -19,7 +19,7 @@ Index: chrome/browser/sync/sync_service_factory.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
@@ -260,7 +260,7 @@ SyncServiceFactory::SyncServiceFactory()
@@ -264,7 +264,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ProfilePasswordStoreFactory::GetInstance());
DependsOn(PowerBookmarkServiceFactory::GetInstance());
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

2
www/chromium/patches/patch-chrome_browser_ui_actions_chrome_action_id_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/actions/chrome_action_id.h
--- chrome/browser/ui/actions/chrome_action_id.h.orig
+++ chrome/browser/ui/actions/chrome_action_id.h
@@ -527,7 +527,7 @@
@@ -526,7 +526,7 @@
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
E(kActionContentContextQuickAnswersInlineQuery, \
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)

2
www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc
View File

@ -37,7 +37,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -1234,12 +1234,12 @@ void BrowserCommandController::InitCommandState() {
@@ -1231,12 +1231,12 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/chromium/patches/patch-chrome_browser_ui_chrome_pages_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/chrome_pages.cc
--- chrome/browser/ui/chrome_pages.cc.orig
+++ chrome/browser/ui/chrome_pages.cc
@@ -80,7 +80,7 @@
@@ -81,7 +81,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/ui/chrome_pages.cc
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -700,7 +700,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/patches/patch-chrome_browser_ui_passwords_manage_passwords_ui_controller_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig
+++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -87,7 +87,7 @@ int ManagePasswordsUIController::save_fallback_timeout
@@ -88,7 +88,7 @@ int ManagePasswordsUIController::save_fallback_timeout
namespace {
@ -10,7 +10,7 @@ Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
// Should be kept in sync with constant declared in
// bubble_controllers/relaunch_chrome_bubble_controller.cc.
constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
@@ -452,7 +452,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
@@ -478,7 +478,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
}
void ManagePasswordsUIController::OnKeychainError() {

6
www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
#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"
@@ -937,7 +937,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -941,7 +941,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@ -19,7 +19,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
@@ -1042,7 +1042,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1046,7 +1046,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -28,7 +28,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1253,7 +1253,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1257,7 +1257,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);

2
www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig
+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -256,7 +256,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
@@ -261,7 +261,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
// at the state of the MessageLoop.
Browser::CreateParams params = Browser::CreateParams(profile_, false);
params.creation_source = Browser::CreationSource::kStartupCreator;

21
www/chromium/patches/patch-chrome_browser_ui_startup_startup_tab_provider_cc Normal file
View File

@ -0,0 +1,21 @@
Index: chrome/browser/ui/startup/startup_tab_provider.cc
--- chrome/browser/ui/startup/startup_tab_provider.cc.orig
+++ chrome/browser/ui/startup/startup_tab_provider.cc
@@ -61,7 +61,7 @@
#include "extensions/browser/extension_registry.h"
#endif // !BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/headless/headless_mode_util.h"
#endif
@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) {
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// In ChromeOS, allow any URL pattern that matches chrome:// scheme.
url_scheme_is_chrome = url.SchemeIs(content::kChromeUIScheme);
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// In Headless mode, allow any URL pattern that matches chrome:// scheme if
// the user explicitly allowed it.
if (headless::IsHeadlessMode() && url.SchemeIs(content::kChromeUIScheme)) {

4
www/chromium/patches/patch-chrome_browser_ui_tab_helpers_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/tab_helpers.cc
--- chrome/browser/ui/tab_helpers.cc.orig
+++ chrome/browser/ui/tab_helpers.cc
@@ -230,7 +230,7 @@
@@ -234,7 +234,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/ui/tab_helpers.cc
#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"
@@ -668,12 +668,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -676,12 +676,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) || \

2
www/chromium/patches/patch-chrome_browser_ui_ui_features_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/ui_features.cc
--- chrome/browser/ui/ui_features.cc.orig
+++ chrome/browser/ui/ui_features.cc
@@ -348,7 +348,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
@@ -357,7 +357,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
"TopChromeWebUIUsesSpareRenderer",
base::FEATURE_ENABLED_BY_DEFAULT);

2
www/chromium/patches/patch-chrome_browser_ui_ui_features_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/ui_features.h
--- chrome/browser/ui/ui_features.h.orig
+++ chrome/browser/ui/ui_features.h
@@ -221,7 +221,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
@@ -223,7 +223,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);

2
www/chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc
View File

@ -33,7 +33,7 @@ Index: chrome/browser/ui/views/accelerator_table.cc
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
@@ -254,7 +254,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -250,7 +250,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \

4
www/chromium/patches/patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -39,7 +39,7 @@
@@ -38,7 +38,7 @@
#include "ui/wm/core/wm_state.h"
#endif // defined(USE_AURA)
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
return controller;
}));

2
www/chromium/patches/patch-chrome_browser_ui_views_compose_compose_dialog_view_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/compose/compose_dialog_view.cc
--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig
+++ chrome/browser/ui/views/compose/compose_dialog_view.cc
@@ -144,7 +144,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit(
@@ -159,7 +159,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit(
views::Widget::InitParams* params,
views::Widget* widget) const {
WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget);

2
www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/frame/browser_view.cc
--- chrome/browser/ui/views/frame/browser_view.cc.orig
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -2161,7 +2161,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -2204,7 +2204,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.

24
www/chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -58,7 +58,7 @@
@@ -59,7 +59,7 @@
#include "ui/aura/window.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
#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
@@ -90,7 +90,7 @@ constexpr int kContentSettingIconSize = 16;
@@ -86,7 +86,7 @@ constexpr int kContentSettingIconSize = 16;
// The height of the controls bar at the top of the window.
constexpr int kTopControlsHeight = 34;
@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
@@ -185,7 +185,7 @@ class WindowEventObserver : public ui::EventObserver {
@@ -181,7 +181,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
// 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()) {
@@ -575,7 +575,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
@@ -571,7 +571,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
AddChildView(std::move(auto_pip_setting_overlay));
}
@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
@@ -751,7 +751,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
@@ -774,7 +774,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
@@ -830,7 +830,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
@@ -853,7 +853,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@ -55,7 +55,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -1084,7 +1084,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
@@ -1107,7 +1107,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@ -64,7 +64,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
@@ -1208,7 +1208,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
@@ -1231,7 +1231,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@ -73,16 +73,16 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const bool tiled = frame()->tiled();
@@ -1226,7 +1226,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
@@ -1249,7 +1249,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return FrameBorderInsets();
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return gfx::Insets(chromeos::kResizeInsideBoundsSize);
@@ -1247,7 +1247,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
#elif !BUILDFLAG(IS_CHROMEOS_ASH)
return gfx::Insets(kResizeBorder);
@@ -1270,7 +1270,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
top_height + border_thickness.bottom());
}

14
www/chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h
View File

@ -1,8 +1,8 @@
Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -26,7 +26,7 @@
#include "ui/views/controls/image_view.h"
@@ -27,7 +27,7 @@
#include "ui/views/layout/flex_layout_view.h"
#include "ui/views/widget/widget_observer.h"
-#if BUILDFLAG(IS_LINUX)
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
#include "ui/linux/window_frame_provider.h"
#endif
@@ -34,7 +34,7 @@
@@ -35,7 +35,7 @@
// parent window, so to prevent cutting off important dialogs we resize the
// picture-in-picture window to fit them. While ChromeOS Ash also uses Aura, it
// does not have this issue so we do not resize on ChromeOS Ash.
@ -19,8 +19,8 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
#define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -100,7 +100,7 @@ class PictureInPictureBrowserFrameView
void Layout() override;
@@ -101,7 +101,7 @@ class PictureInPictureBrowserFrameView
void Layout(PassKey) override;
void AddedToWidget() override;
void RemovedFromWidget() override;
-#if BUILDFLAG(IS_LINUX)
@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
@@ -194,7 +194,7 @@ class PictureInPictureBrowserFrameView
@@ -192,7 +192,7 @@ class PictureInPictureBrowserFrameView
// Returns true if there's an overlay view that's currently shown.
bool IsOverlayViewVisible() const;
@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
@@ -366,7 +366,7 @@ class PictureInPictureBrowserFrameView
@@ -370,7 +370,7 @@ class PictureInPictureBrowserFrameView
// `top_bar_color_animation_`.
std::optional<SkColor> current_foreground_color_;

4
www/chromium/patches/patch-chrome_browser_ui_views_passwords_password_bubble_view_base_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/passwords/password_bubble_view_base.cc
--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig
+++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
@@ -33,7 +33,7 @@
@@ -34,7 +34,7 @@
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/views/controls/button/button.h"
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/passwords/password_bubble_view_base.cc
#include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h"
#endif
@@ -136,7 +136,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create
@@ -139,7 +139,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create
} else if (model_state ==
password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) {
view = new SharedPasswordsNotificationView(web_contents, anchor_view);

2
www/chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/profiles/profile_menu_view_base.cc
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -672,7 +672,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
@@ -703,7 +703,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

2
www/chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/tab_search_bubble_host.cc
--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig
+++ chrome/browser/ui/views/tab_search_bubble_host.cc
@@ -285,7 +285,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
@@ -296,7 +296,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
// Mac should have tabsearch on the right side. Windows >= Win10 has the
// Tab Search button as a FrameCaptionButton, but it still needs to be on the
// left if it exists.

6
www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
View File

@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
@@ -1032,7 +1032,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
@@ -1039,7 +1039,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
@@ -2071,7 +2071,7 @@ void TabDragController::CompleteDrag() {
@@ -2088,7 +2088,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
@@ -2535,7 +2535,7 @@ TabDragController::Liveness TabDragController::GetLoca
@@ -2559,7 +2559,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

2
www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig
+++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
@@ -385,7 +385,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
@@ -373,7 +373,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
// not become active. Setting this to false creates the need to explicitly
// hide the hovercard on press, touch, and keyboard events.
SetCanActivate(false);

2
www/chromium/patches/patch-chrome_browser_ui_views_user_education_browser_user_education_service_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/user_education/browser_user_education_service.cc
--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig
+++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -777,7 +777,7 @@ void MaybeRegisterChromeFeaturePromos(
@@ -771,7 +771,7 @@ void MaybeRegisterChromeFeaturePromos(
FeaturePromoSpecification::AcceleratorInfo())
.SetBubbleArrow(HelpBubbleArrow::kTopLeft)));

18
www/chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -466,7 +466,7 @@ std::string GetFileExtension(FileExtension file_extens
@@ -512,7 +512,7 @@ std::string GetFileExtension(FileExtension file_extens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
@@ -1938,7 +1938,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
@@ -2093,7 +2093,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
@@ -3257,7 +3257,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
@@ -3407,7 +3407,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()));
@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -3272,7 +3272,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -3422,7 +3422,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -3282,7 +3282,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -3432,7 +3432,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -3298,7 +3298,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
@@ -3448,7 +3448,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
@ -55,7 +55,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -4091,7 +4091,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
@@ -4271,7 +4271,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const webapps::AppId& app_id) {
@ -64,7 +64,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
@@ -4285,7 +4285,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
@@ -4471,7 +4471,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const webapps::AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@ -73,7 +73,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
@@ -4329,7 +4329,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
@@ -4515,7 +4515,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}

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