mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-29 10:18:30 +00:00
www/chromium: update to 127.0.6533.88
This update also removes the --audio-backend command line switch in favor of an actual setting in the browser that can be changed at chrome://flags/#audio-backend Security: https://vuxml.freebsd.org/freebsd/15d398ea-4f73-11ef-8a0f-a8a1599412c6.html
This commit is contained in:
parent
81352f435d
commit
acb70e0682
@ -1,6 +1,5 @@
|
||||
PORTNAME= chromium
|
||||
PORTVERSION= 126.0.6478.126
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 127.0.6533.88
|
||||
PULSEMV= 16
|
||||
PULSEV= ${PULSEMV}.1
|
||||
CATEGORIES= www wayland
|
||||
@ -23,6 +22,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386
|
||||
BUILD_DEPENDS= bash:shells/bash \
|
||||
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
|
||||
bindgen:devel/rust-bindgen-cli \
|
||||
gperf:devel/gperf \
|
||||
flock:sysutils/flock \
|
||||
node:www/node \
|
||||
@ -221,7 +221,6 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
|
||||
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
|
||||
.endif
|
||||
|
||||
.if ${COMPILER_VERSION} < 180
|
||||
LLVM_DEFAULT= 18
|
||||
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
|
||||
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
|
||||
@ -230,10 +229,6 @@ BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
|
||||
ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
|
||||
nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
|
||||
ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
|
||||
.else
|
||||
BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
|
||||
nm=/usr/bin/llvm-nm
|
||||
.endif
|
||||
|
||||
# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
|
||||
# - map ffmpeg target to ${ARCH}
|
||||
@ -297,6 +292,8 @@ pre-configure:
|
||||
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
|
||||
.endfor
|
||||
touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
|
||||
@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
|
||||
${WRKSRC}/build/rust/rust_bindgen.gni
|
||||
|
||||
do-configure:
|
||||
# GN generator bootstrapping and generating ninja files
|
||||
|
@ -1,11 +1,11 @@
|
||||
TIMESTAMP = 1719308067
|
||||
SHA256 (chromium-126.0.6478.126.tar.xz) = 5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143
|
||||
SIZE (chromium-126.0.6478.126.tar.xz) = 4166142564
|
||||
SHA256 (chrome-linux-126.0.6478.126-llvm17.profdata.tar.xz) = daa5caa2a8dd8790c46c35cd37ed7ada57ceb6e9533bccc225c64d45a60d4422
|
||||
SIZE (chrome-linux-126.0.6478.126-llvm17.profdata.tar.xz) = 30502872
|
||||
TIMESTAMP = 1722453335
|
||||
SHA256 (chromium-127.0.6533.88.tar.xz) = fd8e2bec6aee113388e2ac269538f9e621a21c449aca925ba7d709c12a9f93a5
|
||||
SIZE (chromium-127.0.6533.88.tar.xz) = 6614557448
|
||||
SHA256 (chrome-linux-127.0.6533.88-llvm17.profdata.tar.xz) = 2e4ed9d5d435891f578e81b8525f5491bbbefa2bbae05ab8394735378d36a27b
|
||||
SIZE (chrome-linux-127.0.6533.88-llvm17.profdata.tar.xz) = 30457324
|
||||
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
|
||||
SIZE (pulseaudio-16.1.tar.gz) = 2763111
|
||||
SHA256 (chromium-126.0.6478.126-testdata.tar.xz) = a25a71bff83a0185dabef2237ad09cfaf367f023a2b650f7dafc79c794cc6bd7
|
||||
SIZE (chromium-126.0.6478.126-testdata.tar.xz) = 281163232
|
||||
SHA256 (chromium-127.0.6533.88-testdata.tar.xz) = 11b9d2d629f1ca12a9ea3ce0799b51f95d482fb4a05c88459692fcaced63f6f7
|
||||
SIZE (chromium-127.0.6533.88-testdata.tar.xz) = 281486940
|
||||
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
||||
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- BUILD.gn.orig 2024-06-17 12:56:06 UTC
|
||||
--- BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -65,7 +65,7 @@ declare_args() {
|
||||
@@ -66,7 +66,7 @@ declare_args() {
|
||||
root_extra_deps = []
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# An official (maximally optimized!) component (optimized for build times)
|
||||
# build doesn't make sense and usually doesn't work.
|
||||
assert(!is_component_build)
|
||||
@@ -97,7 +97,6 @@ group("gn_all") {
|
||||
@@ -98,7 +98,6 @@ group("gn_all") {
|
||||
"//codelabs",
|
||||
"//components:components_unittests",
|
||||
"//components/gwp_asan:gwp_asan_unittests",
|
||||
@ -17,7 +17,7 @@
|
||||
"//net:net_unittests",
|
||||
"//sandbox:sandbox_unittests",
|
||||
"//services:services_unittests",
|
||||
@@ -428,7 +427,7 @@ group("gn_all") {
|
||||
@@ -433,7 +432,7 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
deps += [
|
||||
"//third_party/breakpad:breakpad_unittests",
|
||||
"//third_party/breakpad:core-2-minidump",
|
||||
@@ -624,6 +623,15 @@ group("gn_all") {
|
||||
@@ -629,6 +628,15 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
if (is_mac) {
|
||||
deps += [
|
||||
"//third_party/breakpad:dump_syms",
|
||||
@@ -670,7 +678,7 @@ group("gn_all") {
|
||||
@@ -675,7 +683,7 @@ group("gn_all") {
|
||||
host_os == "win") {
|
||||
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
|
||||
}
|
||||
@ -51,7 +51,7 @@
|
||||
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1090,7 +1098,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1101,7 +1109,7 @@ if (use_blink && !is_cronet_build) {
|
||||
]
|
||||
}
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
script_test("chrome_wpt_tests") {
|
||||
script = "//third_party/blink/tools/run_wpt_tests.py"
|
||||
args = [
|
||||
@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) {
|
||||
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1203,7 +1211,7 @@ if (use_blink && !is_cronet_build) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
|
||||
@@ -1667,7 +1675,7 @@ group("chromium_builder_perf") {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/BUILD.gn.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") {
|
||||
@@ -182,7 +182,7 @@ buildflag_header("ios_cronet_buildflags") {
|
||||
flags = [ "CRONET_BUILD=$is_cronet_build" ]
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
buildflag_header("message_pump_buildflags") {
|
||||
header = "message_pump_buildflags.h"
|
||||
header_dir = "base/message_loop"
|
||||
@@ -1142,11 +1142,23 @@ component("base") {
|
||||
@@ -1119,11 +1119,23 @@ component("base") {
|
||||
# Needed for <atomic> if using newer C++ library than sysroot, except if
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
@ -34,7 +34,7 @@
|
||||
if (use_allocator_shim) {
|
||||
if (is_apple) {
|
||||
sources += [ "allocator/early_zone_registration_apple.h" ]
|
||||
@@ -1166,7 +1178,7 @@ component("base") {
|
||||
@@ -1143,7 +1155,7 @@ component("base") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
@ -43,7 +43,7 @@
|
||||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -2126,6 +2138,22 @@ component("base") {
|
||||
@@ -2110,6 +2122,22 @@ component("base") {
|
||||
]
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
# iOS
|
||||
if (is_ios) {
|
||||
sources += [
|
||||
@@ -2271,6 +2299,33 @@ component("base") {
|
||||
@@ -2255,6 +2283,33 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -100,7 +100,7 @@
|
||||
if (use_blink) {
|
||||
sources += [
|
||||
"files/file_path_watcher.cc",
|
||||
@@ -2281,7 +2336,7 @@ component("base") {
|
||||
@@ -2265,7 +2320,7 @@ component("base") {
|
||||
}
|
||||
|
||||
if (dep_libevent) {
|
||||
@ -109,7 +109,7 @@
|
||||
}
|
||||
|
||||
if (use_libevent) {
|
||||
@@ -3094,7 +3149,7 @@ if (is_apple) {
|
||||
@@ -3062,7 +3117,7 @@ if (is_apple) {
|
||||
}
|
||||
}
|
||||
|
||||
@ -118,7 +118,7 @@
|
||||
# This test must compile with -fstack-protector-all
|
||||
source_set("stack_canary_linux_unittests") {
|
||||
testonly = true
|
||||
@@ -3743,7 +3798,7 @@ test("base_unittests") {
|
||||
@@ -3711,7 +3766,7 @@ test("base_unittests") {
|
||||
]
|
||||
}
|
||||
|
||||
@ -127,7 +127,7 @@
|
||||
sources += [
|
||||
"debug/proc_maps_linux_unittest.cc",
|
||||
"files/scoped_file_linux_unittest.cc",
|
||||
@@ -3770,7 +3825,7 @@ test("base_unittests") {
|
||||
@@ -3738,7 +3793,7 @@ test("base_unittests") {
|
||||
"posix/file_descriptor_shuffle_unittest.cc",
|
||||
"posix/unix_domain_socket_unittest.cc",
|
||||
]
|
||||
@ -136,7 +136,7 @@
|
||||
sources += [
|
||||
"profiler/stack_base_address_posix_unittest.cc",
|
||||
"profiler/stack_copier_signal_unittest.cc",
|
||||
@@ -3781,7 +3836,7 @@ test("base_unittests") {
|
||||
@@ -3749,7 +3804,7 @@ test("base_unittests") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
@ -145,7 +145,7 @@
|
||||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -4049,7 +4104,7 @@ test("base_unittests") {
|
||||
@@ -4017,7 +4072,7 @@ test("base_unittests") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc.gni
|
||||
@@ -33,7 +33,7 @@ if (is_nacl) {
|
||||
@@ -31,7 +31,7 @@ if (is_nacl) {
|
||||
use_large_empty_slot_span_ring = is_mac
|
||||
|
||||
has_memory_tagging =
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
declare_args() {
|
||||
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
|
||||
@@ -373,7 +373,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 =
|
||||
- (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build
|
||||
+ !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build
|
||||
@@ -360,7 +360,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
|
||||
# dependencies that use partition_allocator are compiled in AOSP against a
|
||||
# version of glibc that does not include pkeys syscall numbers.
|
||||
is_pkeys_available =
|
||||
- (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build
|
||||
+ !is_bsd && (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build
|
||||
declare_args() {
|
||||
enable_pkeys = is_pkeys_available
|
||||
}
|
||||
assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"),
|
||||
"Pkeys are only supported on x64 linux and ChromeOS")
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
|
||||
@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
|
||||
configs -= [ "//build/config/compiler:enable_arc" ]
|
||||
@@ -863,7 +863,7 @@ if (is_clang_or_gcc) {
|
||||
configs -= [ partition_alloc_enable_arc_config ]
|
||||
}
|
||||
}
|
||||
- if (is_chromeos || is_linux) {
|
||||
|
@ -1,20 +1,20 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-05-21 18:07:39 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
|
||||
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
|
||||
|
||||
#if defined(ARCH_CPU_64_BITS)
|
||||
#if PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)
|
||||
|
||||
- #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
||||
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD)
|
||||
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !PA_BUILDFLAG(IS_BSD)
|
||||
|
||||
// We shouldn't allocate system pages at all for sanitizer builds. However,
|
||||
// we do, and if random hint addresses interfere with address ranges
|
||||
@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) {
|
||||
return AslrAddress(0x20000000ULL);
|
||||
}
|
||||
#elif defined(ARCH_CPU_ARM64)
|
||||
- #if BUILDFLAG(IS_LINUX)
|
||||
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#elif PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
|
||||
- #if PA_BUILDFLAG(IS_LINUX)
|
||||
+ #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)
|
||||
|
||||
// Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
|
||||
// page size and number of levels of translation pages used. We use
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-04-19 13:02:56 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
|
||||
@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address,
|
||||
// recommitted. Do not assume that this will not change over time.
|
||||
constexpr PA_COMPONENT_EXPORT(
|
||||
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_APPLE)
|
||||
+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
|
||||
return false;
|
||||
#else
|
||||
return true;
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-04-19 13:02:56 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
|
||||
|
||||
#elif (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) || \
|
||||
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
|
||||
#elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \
|
||||
- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
|
||||
+ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
|
||||
// This should work for all POSIX (if needed), but currently all other
|
||||
// supported OS/architecture combinations use either hard-coded values
|
||||
// (such as x86) or have means to determine these values without needing
|
||||
|
@ -1,12 +1,12 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-02-23 21:04:38 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
|
||||
@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal(
|
||||
|
||||
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
|
||||
void* ptr = reinterpret_cast<void*>(address);
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_APPLE)
|
||||
+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
|
||||
+#if PA_BUILDFLAG(IS_BSD)
|
||||
+ int ret = madvise(ptr, length, MADV_FREE);
|
||||
+#else
|
||||
int ret = madvise(ptr, length, MADV_FREE_REUSABLE);
|
||||
|
@ -1,16 +1,16 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-02-23 21:04:38 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
|
||||
@@ -13,11 +13,11 @@
|
||||
#include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h"
|
||||
#include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h"
|
||||
|
||||
-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
|
||||
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
-#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE)
|
||||
+#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD)
|
||||
#include <link.h> // For ElfW() macro.
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_APPLE)
|
||||
+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
@ -18,17 +18,17 @@
|
||||
|
||||
namespace {
|
||||
|
||||
-#if !BUILDFLAG(IS_APPLE)
|
||||
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
-#if !PA_BUILDFLAG(IS_APPLE)
|
||||
+#if !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD)
|
||||
|
||||
// On Android the 'open' function has two versions:
|
||||
// int open(const char *pathname, int flags);
|
||||
@@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void** trace, size_
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_APPLE)
|
||||
#endif // !PA_BUILDFLAG(IS_APPLE)
|
||||
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_APPLE)
|
||||
+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
|
||||
// Since /proc/self/maps is not available, use dladdr() to obtain module
|
||||
// names and offsets inside the modules from the given addresses.
|
||||
void PrintStackTraceInternal(const void* const* trace, size_t size) {
|
||||
|
@ -1,10 +1,10 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-02-23 21:04:38 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
|
||||
@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) {
|
||||
if (getentropy(output, output_length) == 0) {
|
||||
return;
|
||||
}
|
||||
+#elif BUILDFLAG(IS_BSD)
|
||||
+#elif PA_BUILDFLAG(IS_BSD)
|
||||
+ if (getentropy(output, output_length) == 0) {
|
||||
+ return;
|
||||
+ }
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-02-23 21:04:38 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
|
||||
@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId;
|
||||
typedef zx_handle_t PlatformThreadId;
|
||||
#elif BUILDFLAG(IS_APPLE)
|
||||
#elif PA_BUILDFLAG(IS_APPLE)
|
||||
typedef mach_port_t PlatformThreadId;
|
||||
+#elif BUILDFLAG(IS_BSD)
|
||||
+#elif PA_BUILDFLAG(IS_BSD)
|
||||
+typedef uint64_t PlatformThreadId;
|
||||
#elif BUILDFLAG(IS_POSIX)
|
||||
#elif PA_BUILDFLAG(IS_POSIX)
|
||||
typedef pid_t PlatformThreadId;
|
||||
#endif
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2023-12-10 06:10:27 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
namespace partition_alloc::internal::base::internal {
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
|
||||
+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
|
||||
// Current thread id is cached in thread local storage for performance reasons.
|
||||
// In some rare cases it's important to invalidate that cache explicitly (e.g.
|
||||
// after going through clone() syscall which does not call pthread_atfork()
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-02-23 21:04:38 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "partition_alloc/partition_alloc_base/logging.h"
|
||||
#include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
|
||||
+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
|
||||
#include <sys/syscall.h>
|
||||
#include <atomic>
|
||||
#endif
|
||||
|
@ -1,20 +1,20 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
|
||||
@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
// On these platforms, lock all the partitions before fork(), and unlock after.
|
||||
@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
// This may be required on more platforms in the future.
|
||||
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
|
||||
- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
|
||||
+ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
|
||||
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
|
||||
(PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \
|
||||
- PA_BUILDFLAG(IS_CHROMEOS))
|
||||
+ PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD))
|
||||
|
||||
// PartitionAlloc uses PartitionRootEnumerator to acquire all
|
||||
// PartitionRoots at BeforeFork and to release at AfterFork.
|
||||
@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
//
|
||||
@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
// Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
|
||||
// to larger slot spans.
|
||||
-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64))
|
||||
+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
|
||||
#if PA_BUILDFLAG(IS_LINUX) || \
|
||||
- (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
|
||||
+ (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || PA_BUILDFLAG(IS_BSD)
|
||||
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1
|
||||
#else
|
||||
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
|
||||
@@ -316,7 +316,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
|
||||
@@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask);
|
||||
// 8GB for each of the glued pools).
|
||||
#if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
|
||||
#if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \
|
||||
- PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION)
|
||||
+ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
|
||||
+ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || PA_BUILDFLAG(IS_BSD)
|
||||
constexpr size_t kPoolMaxSize = 8 * kGiB;
|
||||
#else
|
||||
constexpr size_t kPoolMaxSize = 16 * kGiB;
|
||||
|
@ -1,29 +1,29 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "wow64apiset.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
|
||||
+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
|
||||
@@ -282,7 +282,7 @@ void PartitionAllocMallocInitOnce() {
|
||||
return;
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
|
||||
+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
|
||||
// When fork() is called, only the current thread continues to execute in the
|
||||
// child process. If the lock is held, but *not* by this thread when fork() is
|
||||
// called, we have a deadlock.
|
||||
@@ -957,7 +957,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
|
||||
@@ -1079,7 +1079,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
|
||||
// apple OSes.
|
||||
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
|
||||
(internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
-#elif PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
|
||||
+#elif (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
|
||||
// Check runtime pagesize. Though the code is currently the same, it is
|
||||
// not merged with the IS_APPLE case above as a 1 << 16 case needs to be
|
||||
// added here in the future, to allow 64 kiB pagesize. That is only
|
||||
|
@ -1,14 +1,14 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-05-21 18:07:39 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc
|
||||
@@ -18,6 +18,10 @@
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+#if PA_BUILDFLAG(IS_BSD)
|
||||
+#include <pthread_np.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(LIBC_GLIBC)
|
||||
#if PA_BUILDFLAG(PA_LIBC_GLIBC)
|
||||
extern "C" void* __libc_stack_end;
|
||||
#endif
|
||||
@@ -48,6 +52,36 @@ void* GetStackTop() {
|
||||
@ -17,7 +17,7 @@
|
||||
return pthread_get_stackaddr_np(pthread_self());
|
||||
+}
|
||||
+
|
||||
+#elif defined(OS_OPENBSD)
|
||||
+#elif PA_BUILDFLAG(IS_OPENBSD)
|
||||
+
|
||||
+void* GetStackTop() {
|
||||
+ stack_t ss;
|
||||
@ -26,7 +26,7 @@
|
||||
+ return reinterpret_cast<uint8_t*>(ss.ss_sp);
|
||||
+}
|
||||
+
|
||||
+#elif defined(OS_FREEBSD)
|
||||
+#elif PA_BUILDFLAG(IS_FREEBSD)
|
||||
+
|
||||
+void* GetStackTop() {
|
||||
+ pthread_attr_t attr;
|
||||
@ -47,4 +47,4 @@
|
||||
+ return nullptr;
|
||||
}
|
||||
|
||||
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
|
||||
#elif PA_BUILDFLAG(IS_POSIX) || PA_BUILDFLAG(IS_FUCHSIA)
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-02-23 21:04:38 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "partition_alloc/partition_alloc_check.h"
|
||||
#include "partition_alloc/thread_isolation/thread_isolation.h"
|
||||
|
||||
-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
|
||||
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
|
||||
-#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS)
|
||||
+#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS) && !PA_BUILDFLAG(IS_BSD)
|
||||
#error "This pkey code is currently only supported on Linux and ChromeOS"
|
||||
#endif
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/debug/stack_trace.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/debug/stack_trace.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/debug/stack_trace.cc
|
||||
@@ -254,7 +254,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
|
||||
@@ -255,7 +255,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
|
||||
// Symbols are not expected to be reliable when gn args specifies
|
||||
// symbol_level=0.
|
||||
return false;
|
||||
@ -9,7 +9,7 @@
|
||||
// StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
|
||||
// See https://crbug.com/706728
|
||||
return false;
|
||||
@@ -316,7 +316,7 @@ std::string StackTrace::ToString() const {
|
||||
@@ -317,7 +317,7 @@ std::string StackTrace::ToString() const {
|
||||
|
||||
std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
|
||||
std::stringstream stream;
|
||||
@ -18,7 +18,7 @@
|
||||
OutputToStreamWithPrefix(&stream, prefix_string);
|
||||
#endif
|
||||
return stream.str();
|
||||
@@ -340,7 +340,7 @@ bool StackTrace::ShouldSuppressOutput() {
|
||||
@@ -341,7 +341,7 @@ bool StackTrace::ShouldSuppressOutput() {
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/debug/stack_trace_posix.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/debug/stack_trace_posix.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -46,7 +46,7 @@
|
||||
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
@@ -306,7 +308,7 @@ void PrintToStderr(const char* output) {
|
||||
@@ -307,7 +309,7 @@ void PrintToStderr(const char* output) {
|
||||
std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
|
||||
// We have seen rare cases on AMD linux where the default signal handler
|
||||
// either does not run or a thread (Probably an AMD driver thread) prevents
|
||||
@@ -323,7 +325,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
|
||||
@@ -324,7 +326,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
|
||||
"Warning: Default signal handler failed to terminate process.\n");
|
||||
PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
|
||||
// See: https://man7.org/linux/man-pages/man2/exit_group.2.html
|
||||
@ -42,7 +42,7 @@
|
||||
}
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -540,7 +546,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -541,7 +547,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
// Set an alarm to trigger in case the default handler does not terminate
|
||||
// the process. See 'AlarmSignalHandler' for more details.
|
||||
struct sigaction action;
|
||||
@@ -565,6 +571,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -566,6 +572,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
// signals that do not re-raise autonomously), such as signals delivered via
|
||||
// kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
|
||||
// otherwise be lost when re-raising the signal via raise().
|
||||
@ -59,7 +59,7 @@
|
||||
long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
|
||||
info->si_signo, info);
|
||||
if (retval == 0) {
|
||||
@@ -579,6 +586,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -580,6 +587,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
if (errno != EPERM) {
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
@ -67,7 +67,7 @@
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -768,6 +776,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -769,6 +777,7 @@ class SandboxSymbolizeHelper {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
// This class is copied from
|
||||
// third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
|
||||
// It aims at ensuring the process is dumpable before opening /proc/self/mem.
|
||||
@@ -860,11 +869,15 @@ class SandboxSymbolizeHelper {
|
||||
@@ -861,11 +870,15 @@ class SandboxSymbolizeHelper {
|
||||
r.base = cur_base;
|
||||
}
|
||||
}
|
||||
@ -91,7 +91,7 @@
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -882,6 +895,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -883,6 +896,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
|
@ -1,20 +1,27 @@
|
||||
--- base/features.cc.orig 2024-05-21 18:07:39 UTC
|
||||
--- base/features.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/features.cc
|
||||
@@ -9,7 +9,7 @@
|
||||
@@ -9,8 +9,10 @@
|
||||
#include "base/threading/platform_thread.h"
|
||||
#include "build/buildflag.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
#include "base/message_loop/message_pump_epoll.h"
|
||||
+#endif
|
||||
#include "base/message_loop/message_pump_libevent.h"
|
||||
#endif
|
||||
|
||||
@@ -98,7 +98,7 @@ void Init(EmitThreadControllerProfilerMetadata
|
||||
@@ -97,9 +99,11 @@ void Init(EmitThreadControllerProfilerMetadata
|
||||
sequence_manager::internal::ThreadController::InitializeFeatures(
|
||||
emit_thread_controller_profiler_metadata);
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
MessagePumpLibevent::InitializeFeatures();
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
MessagePumpEpoll::InitializeFeatures();
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/files/file_path_watcher_unittest.cc
|
||||
@@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
@@ -902,7 +902,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
}
|
||||
delegate.RunUntilEventsMatch(event_expecter);
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
ASSERT_TRUE(WriteFile(file1, "content v2"));
|
||||
// Mac implementation does not detect files modified in a directory.
|
||||
// TODO(crbug.com/40263777): Expect that no events are fired on Mac.
|
||||
@@ -1783,7 +1783,7 @@ namespace {
|
||||
@@ -1848,7 +1848,7 @@ namespace {
|
||||
|
||||
enum Permission { Read, Write, Execute };
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
|
||||
struct stat stat_buf;
|
||||
|
||||
@@ -1817,7 +1817,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
@@ -1882,7 +1882,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
|
||||
} // namespace
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- base/files/file_util_posix.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/files/file_util_posix.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -819,33 +819,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
||||
File::Error* error) {
|
||||
@@ -889,36 +889,33 @@ bool CreateNewTempDirectory(const FilePath::StringType
|
||||
bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
|
||||
ScopedBlockingCall scoped_blocking_call(
|
||||
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
|
||||
+ const FilePath kFileSystemRoot("/");
|
||||
@ -10,11 +10,11 @@
|
||||
// Collect a list of all parent directories.
|
||||
FilePath last_path = full_path;
|
||||
- subpaths.push_back(full_path);
|
||||
- for (FilePath path = full_path.DirName(); path.value() != last_path.value();
|
||||
- path = path.DirName()) {
|
||||
+ if (full_path != kFileSystemRoot)
|
||||
+ subpaths.push_back(full_path);
|
||||
for (FilePath path = full_path.DirName();
|
||||
- path.value() != last_path.value(); path = path.DirName()) {
|
||||
+ (path.value() != last_path.value() &&
|
||||
+ for (FilePath path = full_path.DirName(); (path.value() != last_path.value() &&
|
||||
+ (path != kFileSystemRoot)); path = path.DirName()) {
|
||||
subpaths.push_back(path);
|
||||
last_path = path;
|
||||
@ -22,28 +22,30 @@
|
||||
|
||||
// Iterate through the parents and create the missing ones.
|
||||
for (const FilePath& subpath : base::Reversed(subpaths)) {
|
||||
- if (DirectoryExists(subpath))
|
||||
- if (DirectoryExists(subpath)) {
|
||||
- continue;
|
||||
- if (mkdir(subpath.value().c_str(), 0700) == 0)
|
||||
- }
|
||||
- if (mkdir(subpath.value().c_str(), 0700) == 0) {
|
||||
- continue;
|
||||
- }
|
||||
- // Mkdir failed, but it might have failed with EEXIST, or some other error
|
||||
- // due to the directory appearing out of thin air. This can occur if
|
||||
- // two processes are trying to create the same file system tree at the same
|
||||
- // time. Check to see if it exists and make sure it is a directory.
|
||||
- int saved_errno = errno;
|
||||
- if (!DirectoryExists(subpath)) {
|
||||
- if (error)
|
||||
- if (error) {
|
||||
- *error = File::OSErrorToFileError(saved_errno);
|
||||
- errno = saved_errno;
|
||||
- return false;
|
||||
+ if (!PathExists(subpath)) {
|
||||
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
|
||||
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
|
||||
+ int saved_errno = errno;
|
||||
+ int saved_errno = errno;
|
||||
+ if (error)
|
||||
+ *error = File::OSErrorToFileError(saved_errno);
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
- errno = saved_errno;
|
||||
- return false;
|
||||
+ } else if (!DirectoryExists(subpath)) {
|
||||
+ if (error)
|
||||
+ *error = File::OSErrorToFileError(ENOTDIR);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_util_unittest.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/files/file_util_unittest.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/files/file_util_unittest.cc
|
||||
@@ -3835,7 +3835,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
|
||||
@@ -3903,7 +3903,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
|
||||
}
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
|
||||
FilePath file_path("/proc/cpuinfo");
|
||||
std::string data = "temp";
|
||||
@@ -4568,7 +4568,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
|
||||
@@ -4620,7 +4620,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
|
||||
NULL);
|
||||
#else
|
||||
size_t bytes_written =
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/scoped_file.cc.orig 2022-02-28 16:54:41 UTC
|
||||
--- base/files/scoped_file.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/files/scoped_file.cc
|
||||
@@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) {
|
||||
@@ -32,7 +32,7 @@ void ScopedFDCloseTraits::Free(int fd) {
|
||||
int ret = IGNORE_EINTR(close(fd));
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/process/memory_linux.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- base/process/memory_linux.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/process/memory_linux.cc
|
||||
@@ -28,6 +28,7 @@ void __libc_free(void*);
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
// ScopedAllowBlocking() has private constructor and it can only be used in
|
||||
// friend classes/functions. Declaring a class is easier in this situation to
|
||||
// avoid adding more dependency to thread_restrictions.h because of the
|
||||
@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
|
||||
@@ -110,6 +115,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
|
||||
bool AdjustOOMScore(ProcessId process, int score) {
|
||||
return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/threading/hang_watcher.cc.orig 2024-03-22 08:19:40 UTC
|
||||
--- base/threading/hang_watcher.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ base/threading/hang_watcher.cc
|
||||
@@ -332,7 +332,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
|
||||
@@ -354,7 +354,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
|
||||
|
||||
bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/BUILD.gn.orig 2023-08-17 07:33:31 UTC
|
||||
--- build/config/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/config/BUILD.gn
|
||||
@@ -214,6 +214,10 @@ config("default_libs") {
|
||||
@@ -213,6 +213,10 @@ config("default_libs") {
|
||||
# Targets should choose to explicitly link frameworks they require. Since
|
||||
# linking can have run-time side effects, nothing should be listed here.
|
||||
libs = []
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/clang/BUILD.gn.orig 2024-06-17 12:56:06 UTC
|
||||
--- build/config/clang/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/config/clang/BUILD.gn
|
||||
@@ -214,7 +214,7 @@ template("clang_lib") {
|
||||
@@ -230,7 +230,7 @@ template("clang_lib") {
|
||||
|
||||
# Adds a dependency on the Clang runtime library clang_rt.builtins.
|
||||
clang_lib("compiler_builtins") {
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- build/config/compiler/BUILD.gn.orig 2024-06-18 16:34:35 UTC
|
||||
--- build/config/compiler/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -199,7 +199,7 @@ declare_args() {
|
||||
# This greatly reduces the size of debug builds, at the cost of
|
||||
@ -38,7 +38,7 @@
|
||||
# Linux-specific compiler flags setup.
|
||||
# ------------------------------------
|
||||
if (use_icf && (!is_apple || use_lld)) {
|
||||
@@ -545,7 +552,7 @@ config("compiler") {
|
||||
@@ -552,7 +559,7 @@ config("compiler") {
|
||||
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
|
||||
if (save_reproducers_on_lld_crash && use_lld) {
|
||||
ldflags += [
|
||||
@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") {
|
||||
]
|
||||
}
|
||||
} else if (current_cpu == "arm") {
|
||||
@ -56,7 +56,7 @@
|
||||
!(is_chromeos_lacros && is_chromeos_device)) {
|
||||
cflags += [ "--target=arm-linux-gnueabihf" ]
|
||||
ldflags += [ "--target=arm-linux-gnueabihf" ]
|
||||
@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -1210,7 +1217,7 @@ config("compiler_cpu_abi") {
|
||||
cflags += [ "-mtune=$arm_tune" ]
|
||||
}
|
||||
} else if (current_cpu == "arm64") {
|
||||
@ -65,7 +65,7 @@
|
||||
!(is_chromeos_lacros && is_chromeos_device)) {
|
||||
cflags += [ "--target=aarch64-linux-gnu" ]
|
||||
ldflags += [ "--target=aarch64-linux-gnu" ]
|
||||
@@ -1523,7 +1530,7 @@ config("compiler_deterministic") {
|
||||
@@ -1545,7 +1552,7 @@ config("compiler_deterministic") {
|
||||
# different build directory like "out/feature_a" and "out/feature_b" if
|
||||
# we build same files with same compile flag.
|
||||
# Other paths are already given in relative, no need to normalize them.
|
||||
@ -74,7 +74,7 @@
|
||||
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
|
||||
cflags += [
|
||||
"-Xclang",
|
||||
@@ -1575,7 +1582,7 @@ config("compiler_deterministic") {
|
||||
@@ -1597,7 +1604,7 @@ config("compiler_deterministic") {
|
||||
}
|
||||
|
||||
config("clang_revision") {
|
||||
@ -83,7 +83,7 @@
|
||||
update_args = [
|
||||
"--print-revision",
|
||||
"--verify-version=$clang_version",
|
||||
@@ -1889,9 +1896,6 @@ config("default_warnings") {
|
||||
@@ -1908,9 +1915,6 @@ config("default_warnings") {
|
||||
|
||||
# TODO(crbug.com/40286317): Evaluate and possibly enable.
|
||||
"-Wno-vla-extension",
|
||||
@ -93,7 +93,7 @@
|
||||
]
|
||||
|
||||
cflags_cc += [
|
||||
@@ -1899,7 +1903,7 @@ config("default_warnings") {
|
||||
@@ -1918,7 +1922,7 @@ config("default_warnings") {
|
||||
"-Wenum-compare-conditional",
|
||||
]
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
cflags_cc += [
|
||||
# TODO(crbug.com/41486292): Fix and re-enable.
|
||||
"-Wno-c++11-narrowing-const-reference",
|
||||
@@ -2616,7 +2620,7 @@ config("afdo_optimize_size") {
|
||||
@@ -2640,7 +2644,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") {
|
||||
@ -111,7 +111,7 @@
|
||||
cflags = []
|
||||
if (clang_emit_debug_info_for_profiling) {
|
||||
# Add the following flags to generate debug info for profiling.
|
||||
@@ -2643,7 +2647,7 @@ config("afdo") {
|
||||
@@ -2667,7 +2671,7 @@ config("afdo") {
|
||||
cflags += [ "-Wno-backend-plugin" ]
|
||||
inputs = [ _clang_sample_profile ]
|
||||
}
|
||||
@ -120,7 +120,7 @@
|
||||
cflags = [ "-fauto-profile=${auto_profile_path}" ]
|
||||
inputs = [ auto_profile_path ]
|
||||
}
|
||||
@@ -2808,7 +2812,8 @@ config("symbols") {
|
||||
@@ -2832,7 +2836,8 @@ config("symbols") {
|
||||
configs += [ "//build/config:compress_debug_sections" ]
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/rust.gni.orig 2024-05-21 18:07:39 UTC
|
||||
--- build/config/rust.gni.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/config/rust.gni
|
||||
@@ -272,6 +272,10 @@ if (is_linux || is_chromeos) {
|
||||
@@ -270,6 +270,10 @@ if (is_linux || is_chromeos) {
|
||||
}
|
||||
}
|
||||
|
||||
|
25
www/chromium/files/patch-build_linux_unbundle_dav1d.gn
Normal file
25
www/chromium/files/patch-build_linux_unbundle_dav1d.gn
Normal file
@ -0,0 +1,25 @@
|
||||
--- build/linux/unbundle/dav1d.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/linux/unbundle/dav1d.gn
|
||||
@@ -1,11 +1,11 @@
|
||||
import("//build/config/linux/pkg_config.gni")
|
||||
import("//build/shim_headers.gni")
|
||||
|
||||
-pkg_config("system_dav1d") {
|
||||
+pkg_config("dav1d_config") {
|
||||
packages = [ "dav1d" ]
|
||||
}
|
||||
|
||||
-shim_headers("dav1d_shim") {
|
||||
+shim_headers("dav1d_headers") {
|
||||
root_path = "libdav1d/include"
|
||||
headers = [
|
||||
"dav1d/common.h",
|
||||
@@ -18,6 +18,6 @@ shim_headers("dav1d_shim") {
|
||||
}
|
||||
|
||||
source_set("dav1d") {
|
||||
- deps = [ ":dav1d_shim" ]
|
||||
- public_configs = [ ":system_dav1d" ]
|
||||
+ deps = [ ":dav1d_headers" ]
|
||||
+ public_configs = [ ":dav1d_config" ]
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
--- build/linux/unbundle/icu.gn.orig 2023-04-13 18:16:16 UTC
|
||||
--- build/linux/unbundle/icu.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/linux/unbundle/icu.gn
|
||||
@@ -17,6 +17,15 @@ config("icu_config") {
|
||||
"USING_SYSTEM_ICU=1",
|
||||
@ -16,3 +16,14 @@
|
||||
# U_EXPORT (defined in unicode/platform.h) is used to set public visibility
|
||||
# on classes through the U_COMMON_API and U_I18N_API macros (among others).
|
||||
# When linking against the system ICU library, we want its symbols to have
|
||||
@@ -59,6 +68,10 @@ source_set("icuuc") {
|
||||
":icu_config",
|
||||
":system_icuuc",
|
||||
]
|
||||
+}
|
||||
+
|
||||
+group("icuuc_public") {
|
||||
+ public_deps = [ ":icuuc" ]
|
||||
}
|
||||
|
||||
shim_headers("icui18n_shim") {
|
||||
|
19
www/chromium/files/patch-build_rust_rust__bindgen.gni
Normal file
19
www/chromium/files/patch-build_rust_rust__bindgen.gni
Normal file
@ -0,0 +1,19 @@
|
||||
--- build/rust/rust_bindgen.gni.orig 2024-07-30 19:22:51 UTC
|
||||
+++ build/rust/rust_bindgen.gni
|
||||
@@ -11,14 +11,14 @@ if (is_win) {
|
||||
import("//build/toolchain/win/win_toolchain_data.gni")
|
||||
}
|
||||
|
||||
-_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
|
||||
+_bindgen_path = "${LOCALBASE}/bin/bindgen"
|
||||
if (host_os == "win") {
|
||||
_bindgen_path = "${_bindgen_path}.exe"
|
||||
}
|
||||
|
||||
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
|
||||
# ../lib.
|
||||
-_libclang_path = rust_bindgen_root
|
||||
+_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}"
|
||||
if (host_os == "win") {
|
||||
_libclang_path += "/bin"
|
||||
} else {
|
@ -1,6 +1,6 @@
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2024-06-17 12:56:06 UTC
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2024-07-30 11:12:21 UTC
|
||||
+++ build/toolchain/gcc_toolchain.gni
|
||||
@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) {
|
||||
@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) {
|
||||
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# This template defines a toolchain for something that works like gcc
|
||||
# (including clang).
|
||||
#
|
||||
@@ -878,22 +885,12 @@ template("gcc_toolchain") {
|
||||
@@ -864,22 +871,12 @@ template("gcc_toolchain") {
|
||||
# actually just be doing a native compile.
|
||||
template("clang_toolchain") {
|
||||
gcc_toolchain(target_name) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- cc/BUILD.gn.orig 2024-05-21 18:07:39 UTC
|
||||
--- cc/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ cc/BUILD.gn
|
||||
@@ -677,7 +677,7 @@ cc_test_static_library("test_support") {
|
||||
@@ -686,7 +686,7 @@ cc_test_static_library("test_support") {
|
||||
if (enable_vulkan) {
|
||||
deps += [ "//gpu/vulkan/init" ]
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
data_deps = [ "//third_party/mesa_headers" ]
|
||||
}
|
||||
if (skia_use_dawn) {
|
||||
@@ -936,7 +936,6 @@ cc_test("cc_unittests") {
|
||||
@@ -945,7 +945,6 @@ cc_test("cc_unittests") {
|
||||
data = [ "//components/test/data/viz/" ]
|
||||
data_deps = [
|
||||
"//testing/buildbot/filters:cc_unittests_filters",
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- cc/base/features.cc.orig 2024-01-30 07:53:34 UTC
|
||||
--- cc/base/features.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ cc/base/features.cc
|
||||
@@ -88,7 +88,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
|
||||
@@ -86,7 +86,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
|
||||
// be using a separate flag to control the launch on GL.
|
||||
BASE_FEATURE(kUseDMSAAForTiles,
|
||||
"UseDMSAAForTiles",
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -137,7 +137,7 @@
|
||||
@@ -138,7 +138,7 @@
|
||||
#include "components/about_ui/credit_utils.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "components/nacl/common/nacl_paths.h"
|
||||
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
|
||||
#endif
|
||||
@@ -180,21 +180,21 @@
|
||||
@@ -182,21 +182,21 @@
|
||||
#include "v8/include/v8.h"
|
||||
#endif
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
#include "chrome/browser/policy/policy_path_parser.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -241,7 +241,7 @@
|
||||
@@ -243,7 +243,7 @@
|
||||
#include "base/scoped_add_feature_flags.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
@ -44,7 +44,7 @@
|
||||
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
|
||||
#endif
|
||||
#endif // BUILDFLAG(IS_OZONE)
|
||||
@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
// and resources loaded.
|
||||
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
|
||||
return
|
||||
@ -53,7 +53,7 @@
|
||||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
||||
@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
@@ -428,7 +428,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -62,7 +62,7 @@
|
||||
// Show the man page if --help or -h is on the command line.
|
||||
void HandleHelpSwitches(const base::CommandLine& command_line) {
|
||||
if (command_line.HasSwitch(switches::kHelp) ||
|
||||
@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() {
|
||||
@@ -474,7 +474,7 @@ void SetCrashpadUploadConsentPostLogin() {
|
||||
}
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
void SIGTERMProfilingShutdown(int signal) {
|
||||
content::Profiling::Stop();
|
||||
struct sigaction sigact;
|
||||
@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton(
|
||||
@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton(
|
||||
// process can be exited.
|
||||
ChromeProcessSingleton::CreateInstance(user_data_dir);
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
// Read the xdg-activation token and set it in the command line for the
|
||||
// duration of the notification in order to ensure this is propagated to an
|
||||
// already running browser process if it exists.
|
||||
@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
@@ -640,7 +640,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
@ -89,7 +89,7 @@
|
||||
// On Linux, Chrome does not support running multiple copies under different
|
||||
// DISPLAYs, so the profile directory can be specified in the environment to
|
||||
// support the virtual desktop use-case.
|
||||
@@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
|
||||
@@ -767,7 +767,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -98,7 +98,7 @@
|
||||
// Record the startup process creation time on supported platforms. On Android
|
||||
// this is recorded in ChromeMainDelegateAndroid.
|
||||
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
|
||||
@@ -957,7 +957,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
|
||||
@@ -959,7 +959,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
|
||||
#if BUILDFLAG(IS_OZONE)
|
||||
// Initialize Ozone platform and add required feature flags as per platform's
|
||||
// properties.
|
||||
@ -107,7 +107,7 @@
|
||||
ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
|
||||
#endif
|
||||
ui::OzonePlatform::PreEarlyInitialization();
|
||||
@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
|
||||
@@ -1154,7 +1154,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
|
||||
const bool is_canary_dev = IsCanaryDev();
|
||||
const bool emit_crashes =
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
@ -116,7 +116,7 @@
|
||||
is_canary_dev;
|
||||
#else
|
||||
false;
|
||||
@@ -1305,7 +1305,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
@@ -1309,7 +1309,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
@ -125,7 +125,7 @@
|
||||
// This will directly exit if the user asked for help.
|
||||
HandleHelpSwitches(command_line);
|
||||
#endif
|
||||
@@ -1335,7 +1335,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
@@ -1339,7 +1339,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
chromeos::dbus_paths::RegisterPathProvider();
|
||||
#endif
|
||||
@ -134,7 +134,7 @@
|
||||
nacl::RegisterPathProvider();
|
||||
#endif
|
||||
|
||||
@@ -1722,7 +1722,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1726,7 +1726,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
||||
}
|
||||
|
||||
@ -143,12 +143,12 @@
|
||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
|
||||
@@ -1821,7 +1821,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.
|
||||
-#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
|
||||
{switches::kNaClLoaderProcess, NaClMain},
|
||||
#else
|
||||
{"<invalid>", nullptr}, // To avoid constant array of size 0
|
||||
@@ -1827,7 +1827,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
|
||||
{switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain},
|
||||
{switches::kCodeSignCloneCleanupProcess,
|
||||
code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain},
|
||||
-#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
|
||||
+#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
|
||||
// This entry is not needed on Linux, where the NaCl loader
|
||||
// process is launched via nacl_helper instead.
|
||||
{switches::kNaClLoaderProcess, NaClMain},
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/BUILD.gn.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -6708,6 +6708,13 @@ static_library("browser") {
|
||||
@@ -6672,6 +6672,13 @@ static_library("browser") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/about_flags.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/about_flags.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/about_flags.cc
|
||||
@@ -238,7 +238,7 @@
|
||||
#include "ui/ui_features.h"
|
||||
@ -9,7 +9,7 @@
|
||||
#include "base/allocator/buildflags.h"
|
||||
#endif
|
||||
|
||||
@@ -328,7 +328,7 @@
|
||||
@@ -332,7 +332,7 @@
|
||||
#include "device/vr/public/cpp/features.h"
|
||||
#endif
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
#include "ui/ozone/public/ozone_switches.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
#include "chrome/browser/win/titlebar_config.h"
|
||||
@@ -341,7 +341,7 @@
|
||||
#include "chrome/browser/win/mica_titlebar.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
@ -27,7 +27,7 @@
|
||||
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -482,7 +482,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
|
||||
@@ -476,7 +476,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
|
||||
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
|
||||
#endif
|
||||
|
||||
@ -36,7 +36,34 @@
|
||||
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
|
||||
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
|
||||
{flag_descriptions::kOzonePlatformHintChoiceAuto,
|
||||
@@ -1265,7 +1265,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
|
||||
@@ -847,6 +847,26 @@ const FeatureEntry::FeatureVariation
|
||||
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
|
||||
nullptr}};
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+const FeatureEntry::FeatureParam kAudioBackendPulseAudio[] = {
|
||||
+ { "audio-backend", "pulseaudio" }};
|
||||
+const FeatureEntry::FeatureParam kAudioBackendSndio[] = {
|
||||
+ { "audio-backend", "sndio" }};
|
||||
+const FeatureEntry::FeatureParam kAudioBackendAlsa[] = {
|
||||
+ { "audio-backend", "alsa" }};
|
||||
+const FeatureEntry::FeatureVariation
|
||||
+ kAudioBackendVariations[] = {
|
||||
+ {"using PulseAudio by default if available", kAudioBackendPulseAudio,
|
||||
+ std::size(kAudioBackendPulseAudio),
|
||||
+ nullptr},
|
||||
+ {"using sndio by default if available", kAudioBackendSndio,
|
||||
+ std::size(kAudioBackendSndio),
|
||||
+ nullptr},
|
||||
+ {"using ALSA by default if available", kAudioBackendAlsa,
|
||||
+ std::size(kAudioBackendAlsa),
|
||||
+ nullptr}};
|
||||
+#endif
|
||||
+
|
||||
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
|
||||
{"UIClipboardMaximumAge", "60"}};
|
||||
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
|
||||
@@ -1260,7 +1280,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
|
||||
};
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
@ -45,7 +72,7 @@
|
||||
const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
|
||||
{"AtKeywordAcceleration", "true"},
|
||||
};
|
||||
@@ -1328,7 +1328,7 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -1323,7 +1343,7 @@ const FeatureEntry::FeatureVariation
|
||||
};
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
@ -54,7 +81,7 @@
|
||||
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
|
||||
{"ShortcutBoostSearchScore", "0"},
|
||||
{"ShortcutBoostNonTopHitThreshold", "0"},
|
||||
@@ -3679,7 +3679,7 @@ const flags_ui::FeatureEntry::FeatureVariation
|
||||
@@ -3811,7 +3831,7 @@ const flags_ui::FeatureEntry::FeatureVariation
|
||||
std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
|
||||
};
|
||||
|
||||
@ -63,7 +90,7 @@
|
||||
const flags_ui::FeatureEntry::FeatureParam
|
||||
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
|
||||
const flags_ui::FeatureEntry::FeatureParam
|
||||
@@ -4511,7 +4511,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4784,7 +4804,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
},
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@ -72,7 +99,7 @@
|
||||
{
|
||||
"fluent-overlay-scrollbars",
|
||||
flag_descriptions::kFluentOverlayScrollbarsName,
|
||||
@@ -4947,7 +4947,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5200,7 +5220,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
@ -81,17 +108,29 @@
|
||||
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
|
||||
flag_descriptions::kShortcutsNotAppsDescription,
|
||||
kOsMac | kOsWin | kOsLinux,
|
||||
@@ -5074,7 +5074,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5332,7 +5352,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kWebShare)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
{"pulseaudio-loopback-for-cast",
|
||||
flag_descriptions::kPulseaudioLoopbackForCastName,
|
||||
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
|
||||
@@ -5090,7 +5090,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5346,9 +5366,19 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
|
||||
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
|
||||
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
|
||||
+
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ {"audio-backend",
|
||||
+ flag_descriptions::kAudioBackendName,
|
||||
+ flag_descriptions::kAudioBackendDescription, kOsLinux,
|
||||
+ FEATURE_WITH_PARAMS_VALUE_TYPE(
|
||||
+ media::kAudioBackend,
|
||||
+ kAudioBackendVariations,
|
||||
+ "AudioBackend")},
|
||||
+#endif
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
@ -99,7 +138,7 @@
|
||||
{"skip-undecryptable-passwords",
|
||||
flag_descriptions::kSkipUndecryptablePasswordsName,
|
||||
flag_descriptions::kSkipUndecryptablePasswordsDescription,
|
||||
@@ -6011,7 +6011,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6286,7 +6316,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
@ -108,7 +147,7 @@
|
||||
{"omnibox-domain-suggestions",
|
||||
flag_descriptions::kOmniboxDomainSuggestionsName,
|
||||
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
|
||||
@@ -6331,7 +6331,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6620,7 +6650,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
"OrganicRepeatableQueries")},
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
@ -117,7 +156,16 @@
|
||||
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
|
||||
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
|
||||
FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
|
||||
@@ -7949,7 +7949,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7310,7 +7340,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
{"cups-ipp-printing-backend",
|
||||
flag_descriptions::kCupsIppPrintingBackendName,
|
||||
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
|
||||
@@ -8309,7 +8339,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kCooperativeSchedulingDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kCooperativeScheduling)},
|
||||
|
||||
@ -126,7 +174,7 @@
|
||||
{"enable-network-service-sandbox",
|
||||
flag_descriptions::kEnableNetworkServiceSandboxName,
|
||||
flag_descriptions::kEnableNetworkServiceSandboxDescription,
|
||||
@@ -7973,7 +7973,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8333,7 +8363,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
|
||||
#endif
|
||||
|
||||
@ -135,7 +183,7 @@
|
||||
{"enable-family-link-extensions-permissions",
|
||||
flag_descriptions::
|
||||
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
|
||||
@@ -8810,7 +8810,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9195,7 +9225,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -144,7 +192,7 @@
|
||||
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
|
||||
flag_descriptions::kGetAllScreensMediaDescription,
|
||||
kOsCrOS | kOsLacros | kOsLinux,
|
||||
@@ -8849,7 +8849,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9234,7 +9264,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -153,7 +201,7 @@
|
||||
{
|
||||
"ui-debug-tools",
|
||||
flag_descriptions::kUIDebugToolsName,
|
||||
@@ -9086,7 +9086,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9476,7 +9506,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -162,7 +210,7 @@
|
||||
{"policy-indication-for-managed-default-search",
|
||||
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
|
||||
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
|
||||
@@ -9393,7 +9393,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9789,7 +9819,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -171,7 +219,7 @@
|
||||
{"media-session-enter-picture-in-picture",
|
||||
flag_descriptions::kMediaSessionEnterPictureInPictureName,
|
||||
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
|
||||
@@ -10303,7 +10303,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10684,7 +10714,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsDesktop | kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
|
||||
|
||||
@ -180,16 +228,16 @@
|
||||
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
|
||||
flag_descriptions::kCameraMicEffectsDescription,
|
||||
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
|
||||
@@ -10341,7 +10341,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10722,7 +10752,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
{"show-featured-enterprise-site-search",
|
||||
flag_descriptions::kShowFeaturedEnterpriseSiteSearchName,
|
||||
flag_descriptions::kShowFeaturedEnterpriseSiteSearchDescription, kOsAll,
|
||||
@@ -10456,7 +10456,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"site-search-settings-policy",
|
||||
flag_descriptions::kSiteSearchSettingsPolicyName,
|
||||
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
|
||||
@@ -10846,7 +10876,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
|
||||
|
||||
@ -198,7 +246,7 @@
|
||||
{"third-party-profile-management",
|
||||
flag_descriptions::kThirdPartyProfileManagementName,
|
||||
flag_descriptions::kThirdPartyProfileManagementDescription,
|
||||
@@ -10805,7 +10805,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11182,7 +11212,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
|
||||
#endif
|
||||
|
||||
@ -207,7 +255,7 @@
|
||||
{"restart-to-gain-access-to-keychain",
|
||||
flag_descriptions::kRestartToGainAccessToKeychainName,
|
||||
flag_descriptions::kRestartToGainAccessToKeychainDescription,
|
||||
@@ -11086,7 +11086,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11469,7 +11499,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
|
||||
// Controls the view mode for (history) sync screen.
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/after_startup_task_utils.cc.orig 2024-03-22 08:19:40 UTC
|
||||
--- chrome/browser/after_startup_task_utils.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/after_startup_task_utils.cc
|
||||
@@ -115,7 +115,7 @@ void SetBrowserStartupIsComplete() {
|
||||
@@ -117,7 +117,7 @@ void SetBrowserStartupIsComplete() {
|
||||
TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
|
||||
GetStartupCompleteFlag().Set();
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/browser_features.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/browser_features.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/browser_features.cc
|
||||
@@ -82,7 +82,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
|
||||
@@ -61,7 +61,7 @@ BASE_FEATURE(kClosedTabCache,
|
||||
BASE_FEATURE(kDestroyProfileOnBrowserClose,
|
||||
"DestroyProfileOnBrowserClose",
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
@ -9,7 +9,7 @@
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -354,7 +354,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
|
||||
@@ -330,7 +330,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
|
||||
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
|
||||
"SupportSearchSuggestionForPrerender2",
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/browser_process_impl.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/browser_process_impl.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -229,7 +229,7 @@
|
||||
@@ -228,7 +228,7 @@
|
||||
#include "chrome/browser/ui/profiles/profile_picker.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
|
||||
#endif
|
||||
|
||||
@@ -1284,7 +1284,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
@@ -1282,7 +1282,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
|
||||
ApplyMetricsReportingPolicy();
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
ChromeJsErrorReportProcessor::Create();
|
||||
#endif
|
||||
|
||||
@@ -1617,7 +1617,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
@@ -1615,7 +1615,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
// Mac is currently not supported.
|
||||
// TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/chrome_browser_interface_binders.cc
|
||||
@@ -132,12 +132,12 @@
|
||||
@@ -134,12 +134,12 @@
|
||||
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -15,7 +15,7 @@
|
||||
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
|
||||
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
|
||||
#endif
|
||||
@@ -228,7 +228,7 @@
|
||||
@@ -230,7 +230,7 @@
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -24,7 +24,16 @@
|
||||
#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"
|
||||
@@ -854,7 +854,7 @@ void BindScreen2xMainContentExtractor(
|
||||
@@ -241,7 +241,7 @@
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -865,7 +865,7 @@ void BindScreen2xMainContentExtractor(
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -33,7 +42,7 @@
|
||||
void BindVisualSuggestionsModelProvider(
|
||||
content::RenderFrameHost* frame_host,
|
||||
mojo::PendingReceiver<
|
||||
@@ -1050,7 +1050,7 @@ void PopulateChromeFrameBinders(
|
||||
@@ -1061,7 +1061,7 @@ void PopulateChromeFrameBinders(
|
||||
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -42,8 +51,8 @@
|
||||
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
|
||||
!render_frame_host->GetParentOrOuterDocument()) {
|
||||
// The service binder will reject non-primary main frames, but we still need
|
||||
@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
commerce::CommerceInternalsUI>(map);
|
||||
@@ -1152,7 +1152,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
DataSharingInternalsUI>(map);
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -51,7 +60,7 @@
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
connectors_internals::mojom::PageHandler,
|
||||
enterprise_connectors::ConnectorsInternalsUI>(map);
|
||||
@@ -1148,7 +1148,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
policy::DlpInternalsUI>(map);
|
||||
#endif
|
||||
|
||||
@ -60,7 +69,16 @@
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
|
||||
#endif
|
||||
@@ -1759,7 +1759,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1256,7 +1256,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
browser_command::mojom::CommandHandlerFactory,
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
WhatsNewUI,
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
NewTabPageUI>(map);
|
||||
@@ -1797,7 +1797,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -247,15 +247,15 @@
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
// Set the global activation token sent as a command line switch by another
|
||||
// browser process. This also removes the switch after use to prevent any side
|
||||
// effects of leaving it in the command line after this point.
|
||||
@@ -1100,7 +1100,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1101,7 +1101,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
|
||||
}
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
// Create directory for user-level Native Messaging manifest files. This
|
||||
// makes it less likely that the directory will be created by third-party
|
||||
// software with incorrect owner or permission. See crbug.com/725513 .
|
||||
@@ -1148,7 +1148,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1149,7 +1149,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -80,7 +80,7 @@
|
||||
metrics::DesktopSessionDurationTracker::Initialize();
|
||||
ProfileActivityMetricsRecorder::Initialize();
|
||||
TouchModeStatsTracker::Initialize(
|
||||
@@ -1333,7 +1333,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
@@ -1336,7 +1336,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
@ -89,7 +89,7 @@
|
||||
// Delete the media history database if it still exists.
|
||||
// TODO(crbug.com/40177301): Remove this.
|
||||
base::ThreadPool::PostTask(
|
||||
@@ -1382,7 +1382,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
@@ -1385,7 +1385,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
if (headless::IsHeadlessMode()) {
|
||||
headless::ReportHeadlessActionMetrics();
|
||||
}
|
||||
@@ -1492,7 +1492,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
@@ -1495,7 +1495,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
// In headless mode provide alternate SelectFileDialog factory overriding
|
||||
// any platform specific SelectFileDialog implementation that may have been
|
||||
// set.
|
||||
@ -107,7 +107,7 @@
|
||||
if (headless::IsHeadlessMode()) {
|
||||
headless::HeadlessSelectFileDialogFactory::SetUp();
|
||||
}
|
||||
@@ -2043,7 +2043,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
|
||||
@@ -2046,7 +2046,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
|
||||
|
||||
// Drop the request if headless mode is in effect or the request is from
|
||||
// a headless Chrome process.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -468,7 +468,7 @@
|
||||
@@ -469,7 +469,7 @@
|
||||
#include "storage/browser/file_system/external_mount_points.h"
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
@@ -578,12 +578,12 @@
|
||||
@@ -585,12 +585,12 @@
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -24,7 +24,7 @@
|
||||
#include "components/crash/core/app/crash_switches.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -594,7 +594,7 @@
|
||||
@@ -601,7 +601,7 @@
|
||||
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
|
||||
#endif
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
|
||||
#include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
|
||||
#include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
|
||||
@@ -602,7 +602,7 @@
|
||||
@@ -609,7 +609,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
@ -42,8 +42,8 @@
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -617,7 +617,7 @@
|
||||
#include "chrome/browser/ui/lens/lens_side_panel_navigation_helper.h"
|
||||
@@ -624,7 +624,7 @@
|
||||
#include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
@ -51,7 +51,7 @@
|
||||
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
|
||||
#elif BUILDFLAG(IS_OZONE)
|
||||
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
|
||||
@@ -1516,7 +1516,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
|
||||
@@ -1538,7 +1538,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
@ -60,7 +60,7 @@
|
||||
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
true);
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
|
||||
@@ -1640,7 +1640,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1669,7 +1669,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
|
||||
is_integration_test, &startup_data_);
|
||||
@ -69,7 +69,7 @@
|
||||
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
|
||||
is_integration_test, &startup_data_);
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
@@ -1674,7 +1674,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1703,7 +1703,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -78,7 +78,7 @@
|
||||
main_parts->AddParts(
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
|
||||
#else
|
||||
@@ -1695,7 +1695,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1724,7 +1724,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
|
||||
#endif
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
|
||||
#elif BUILDFLAG(IS_OZONE)
|
||||
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
|
||||
@@ -1714,7 +1714,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1743,7 +1743,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
|
||||
chrome::AddMetricsExtraParts(main_parts.get());
|
||||
|
||||
@ -96,7 +96,7 @@
|
||||
main_parts->AddParts(
|
||||
std::make_unique<
|
||||
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
|
||||
@@ -2551,7 +2551,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -2577,7 +2577,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
client_info->client_id);
|
||||
}
|
||||
#elif BUILDFLAG(IS_POSIX)
|
||||
@ -105,7 +105,7 @@
|
||||
pid_t pid;
|
||||
if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
|
||||
command_line->AppendSwitchASCII(
|
||||
@@ -2886,7 +2886,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -2923,7 +2923,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
}
|
||||
}
|
||||
|
||||
@ -114,7 +114,7 @@
|
||||
// Opt into a hardened stack canary mitigation if it hasn't already been
|
||||
// force-disabled.
|
||||
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
|
||||
@@ -4651,7 +4651,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
@@ -4698,7 +4698,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
}
|
||||
}
|
||||
|
||||
@ -123,7 +123,7 @@
|
||||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -5205,7 +5205,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5266,7 +5266,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
&throttles);
|
||||
}
|
||||
|
||||
@ -132,7 +132,7 @@
|
||||
MaybeAddThrottle(
|
||||
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -5219,7 +5219,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5280,7 +5280,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 @@
|
||||
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -5258,7 +5258,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5319,7 +5319,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
handle));
|
||||
}
|
||||
|
||||
@ -150,7 +150,7 @@
|
||||
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -7243,7 +7243,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
|
||||
@@ -7292,7 +7292,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
|
||||
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
|
||||
// This enterprise policy is supported on Android, but the feature will not be
|
||||
// launched there.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.h
|
||||
@@ -507,7 +507,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
@@ -513,7 +513,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
bool IsPluginAllowedToUseDevChannelAPIs(
|
||||
content::BrowserContext* browser_context,
|
||||
const GURL& url) override;
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
|
||||
@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
|
||||
return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
|
||||
@ -8,4 +8,4 @@
|
||||
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
|
||||
return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
|
||||
#else
|
||||
NOTREACHED();
|
||||
NOTREACHED_IN_MIGRATION();
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -1714,7 +1714,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -1729,7 +1729,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
|
||||
const base::FilePath& path) {
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
@ -9,7 +9,7 @@
|
||||
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
|
||||
return !download_prefs_->ShouldOpenPdfInSystemReader();
|
||||
}
|
||||
@@ -1860,7 +1860,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
|
||||
@@ -1875,7 +1875,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
|
||||
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
@ -18,7 +18,7 @@
|
||||
// Don't download pdf if it is a file URL, as that might cause an infinite
|
||||
// download loop if Chrome is not the system pdf viewer.
|
||||
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
|
||||
@@ -1906,7 +1906,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
|
||||
@@ -1939,7 +1939,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
|
||||
DCHECK(download_item->IsSavePackageDownload());
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/download/download_item_model.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/download/download_item_model.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/download/download_item_model.cc
|
||||
@@ -799,7 +799,7 @@ bool DownloadItemModel::IsCommandChecked(
|
||||
download_crx_util::IsExtensionDownload(*download_);
|
||||
@ -18,7 +18,7 @@
|
||||
if (download_commands->CanOpenPdfInSystemViewer()) {
|
||||
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
|
||||
SetShouldPreferOpeningInBrowser(is_checked);
|
||||
@@ -1236,7 +1236,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
|
||||
@@ -1245,7 +1245,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/enterprise/connectors/connectors_service.cc
|
||||
@@ -565,7 +565,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
|
||||
@@ -568,7 +568,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
|
||||
|
||||
Profile* profile = Profile::FromBrowserContext(context_);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2023-08-17 07:33:31 UTC
|
||||
--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h"
|
||||
@ -17,4 +17,4 @@
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
return std::make_unique<LinuxKeyPersistenceDelegate>();
|
||||
#else
|
||||
NOTREACHED();
|
||||
NOTREACHED_IN_MIGRATION();
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-04-19 13:02:56 UTC
|
||||
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
||||
@@ -58,7 +58,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
@ -7,9 +7,9 @@
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
|
||||
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
|
||||
#include "components/device_signals/core/browser/signals_aggregator.h"
|
||||
#include "components/device_signals/core/common/signals_constants.h"
|
||||
@@ -132,7 +132,7 @@ void UploadSecurityEventReport(base::Value::Dict event
|
||||
@@ -133,7 +133,7 @@ void UploadSecurityEventReport(base::Value::Dict event
|
||||
std::move(upload_callback));
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
void PopulateSignals(base::Value::Dict event,
|
||||
policy::CloudPolicyClient* client,
|
||||
std::string name,
|
||||
@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
|
||||
@@ -421,7 +421,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
|
||||
/*include_profile_user_name=*/false);
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
void AddCrowdstrikeSignalsToEvent(
|
||||
base::Value::Dict& event,
|
||||
@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
|
||||
@@ -480,7 +480,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
|
||||
if (include_profile_user_name) {
|
||||
event.Set(kKeyProfileUserName, GetProfileUserName());
|
||||
}
|
||||
@ -36,3 +36,12 @@
|
||||
Profile* profile = Profile::FromBrowserContext(context_);
|
||||
device_signals::SignalsAggregator* signals_aggregator =
|
||||
enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile);
|
||||
@@ -505,7 +505,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
|
||||
? safe_browsing::GetProfileEmail(identity_manager_)
|
||||
: std::string();
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
if (username.empty()) {
|
||||
username = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
|
||||
enterprise_signin::prefs::kProfileUserEmail);
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2023-09-13 12:11:42 UTC
|
||||
--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc
|
||||
@@ -4,12 +4,23 @@
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include <string>
|
||||
|
||||
#include "base/environment.h"
|
||||
@@ -118,6 +129,7 @@ SettingValue GetScreenlockSecured() {
|
||||
@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() {
|
||||
// Implements the logic from the native host installation script. First find the
|
||||
// root device identifier, then locate its parent and get its type.
|
||||
SettingValue GetDiskEncrypted() {
|
||||
@ -32,7 +32,7 @@
|
||||
struct stat info;
|
||||
// First figure out the device identifier. Fail fast if this fails.
|
||||
if (stat("/", &info) != 0)
|
||||
@@ -139,11 +151,35 @@ SettingValue GetDiskEncrypted() {
|
||||
@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() {
|
||||
}
|
||||
return SettingValue::UNKNOWN;
|
||||
}
|
||||
@ -68,7 +68,7 @@
|
||||
base::DirReaderPosix reader("/sys/class/net");
|
||||
if (!reader.IsValid())
|
||||
return result;
|
||||
@@ -166,6 +202,7 @@ std::vector<std::string> GetMacAddresses() {
|
||||
@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses() {
|
||||
&address);
|
||||
result.push_back(address);
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/BUILD.gn.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/BUILD.gn.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/BUILD.gn
|
||||
@@ -1391,6 +1391,10 @@ static_library("extensions") {
|
||||
@@ -1415,6 +1415,10 @@ source_set("extensions") {
|
||||
deps += [ "//chrome/services/printing/public/mojom" ]
|
||||
}
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-04-19 13:02:56 UTC
|
||||
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
||||
@@ -45,7 +45,7 @@
|
||||
@@ -44,7 +44,7 @@
|
||||
#include "pdf/buildflags.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "services/screen_ai/buildflags/buildflags.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
|
||||
#endif
|
||||
|
||||
@@ -128,7 +128,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
|
||||
@@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
|
||||
extensions::SettingsPrivateEventRouterFactory::GetInstance();
|
||||
extensions::SettingsOverridesAPI::GetFactoryInstance();
|
||||
extensions::SidePanelService::GetFactoryInstance();
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-05-21 18:07:39 UTC
|
||||
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
|
||||
@@ -405,7 +405,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
|
||||
@@ -414,7 +414,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
|
||||
apps::LaunchContainer launch_container =
|
||||
GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
|
||||
Profile* profile = Profile::FromBrowserContext(context);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
|
||||
@@ -610,7 +610,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
|
||||
@@ -611,7 +611,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
|
||||
}
|
||||
|
||||
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
|
||||
} else if (strcmp(os, "linux") == 0) {
|
||||
@ -9,5 +9,5 @@
|
||||
+ } else if (strcmp(os, "freebsd") == 0) {
|
||||
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
|
||||
} else {
|
||||
NOTREACHED() << "Platform not supported: " << os;
|
||||
NOTREACHED_IN_MIGRATION() << "Platform not supported: " << os;
|
||||
return false;
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
@@ -197,7 +197,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
|
||||
@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
@ -9,7 +9,7 @@
|
||||
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
#endif
|
||||
@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -213,7 +213,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
// Appearance settings.
|
||||
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
|
||||
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
|
||||
@@ -890,7 +890,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
|
||||
@@ -892,7 +892,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
|
||||
// minimized.
|
||||
// TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
|
||||
// TODO(crbug.com/40254339): Find a fix for wayland as well.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -897,7 +897,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
|
||||
@@ -907,7 +907,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
RequestExtensionApproval(contents);
|
||||
return;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/extensions/external_provider_impl.cc
|
||||
@@ -831,7 +831,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
@@ -834,7 +834,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -9,7 +9,7 @@
|
||||
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
|
||||
service,
|
||||
base::MakeRefCounted<ExternalPrefLoader>(
|
||||
@@ -859,7 +859,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
@@ -862,7 +862,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
bundled_extension_creation_flags));
|
||||
|
||||
// Define a per-user source of external extensions.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
@@ -315,7 +315,7 @@ const struct {
|
||||
@@ -318,7 +318,7 @@ const struct {
|
||||
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
|
||||
kDontBlockChildren},
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/flag_descriptions.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/flag_descriptions.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/flag_descriptions.cc
|
||||
@@ -2923,7 +2923,7 @@ const char kCbdTimeframeRequiredDescription[] =
|
||||
@@ -2963,7 +2963,7 @@ const char kCbdTimeframeRequiredDescription[] =
|
||||
"value to the list.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -9,7 +9,7 @@
|
||||
const char kPolicyIndicationForManagedDefaultSearchName[] =
|
||||
"Enable policy indication for managed Default Search provider";
|
||||
const char kPolicyIndicationForManagedDefaultSearchDescription[] =
|
||||
@@ -3220,7 +3220,7 @@ const char kShowAutofillTypePredictionsDescription[] =
|
||||
@@ -3281,7 +3281,7 @@ const char kShowAutofillTypePredictionsDescription[] =
|
||||
"text.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -18,7 +18,7 @@
|
||||
const char kShowFeaturedEnterpriseSiteSearchName[] =
|
||||
"Show featured Enterprise site search engines in Omnibox";
|
||||
const char kShowFeaturedEnterpriseSiteSearchDescription[] =
|
||||
@@ -3245,7 +3245,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
|
||||
@@ -3318,7 +3318,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
|
||||
"but in the same SiteInstanceGroup, and thus the same process.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -27,7 +27,7 @@
|
||||
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
|
||||
const char kSiteSearchSettingsPolicyDescription[] =
|
||||
"Allow site search engines to be defined by the SiteSearchSettings policy.";
|
||||
@@ -7485,7 +7485,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
|
||||
@@ -7719,7 +7719,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
|
||||
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
|
||||
const char kGetAllScreensMediaDescription[] =
|
||||
"When enabled, the getAllScreensMedia API for capturing multiple screens "
|
||||
@@ -7753,7 +7753,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
|
||||
@@ -7970,7 +7970,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
|
||||
|
||||
// Linux -----------------------------------------------------------------------
|
||||
|
||||
@ -45,7 +45,25 @@
|
||||
const char kOzonePlatformHintChoiceDefault[] = "Default";
|
||||
const char kOzonePlatformHintChoiceAuto[] = "Auto";
|
||||
const char kOzonePlatformHintChoiceX11[] = "X11";
|
||||
@@ -7801,14 +7801,14 @@ const char kZeroCopyVideoCaptureDescription[] =
|
||||
@@ -7992,6 +7992,17 @@ const char kPulseaudioLoopbackForScreenShareName[] =
|
||||
const char kPulseaudioLoopbackForScreenShareDescription[] =
|
||||
"Enable system audio sharing when screen sharing on Linux with pulseaudio.";
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+const char kAudioBackendName[] =
|
||||
+ "Audio Backend";
|
||||
+const char kAudioBackendDescription[] =
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+ "Select the desired audio backend to use. The default is sndio.";
|
||||
+#elif BUILDFLAG(IS_FREEBSD)
|
||||
+ "Select the desired audio backend to use. The default will automatically "
|
||||
+ "enumerate through the supported backends.";
|
||||
+#endif
|
||||
+#endif
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
// All views-based platforms --------------------------------------------------
|
||||
@@ -8018,14 +8029,14 @@ const char kZeroCopyVideoCaptureDescription[] =
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -62,7 +80,7 @@
|
||||
const char kEnableNetworkServiceSandboxName[] =
|
||||
"Enable the network service sandbox.";
|
||||
const char kEnableNetworkServiceSandboxDescription[] =
|
||||
@@ -7840,7 +7840,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
@@ -8057,7 +8068,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
"Bluetooth";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -71,7 +89,7 @@
|
||||
const char kSkipUndecryptablePasswordsName[] =
|
||||
"Skip undecryptable passwords to use the available decryptable "
|
||||
"passwords.";
|
||||
@@ -7980,7 +7980,7 @@ const char kElementCaptureDescription[] =
|
||||
@@ -8207,7 +8218,7 @@ const char kElementCaptureDescription[] =
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -80,8 +98,8 @@
|
||||
const char kUIDebugToolsName[] = "Debugging tools for UI";
|
||||
const char kUIDebugToolsDescription[] =
|
||||
"Enables additional keyboard shortcuts to help debugging.";
|
||||
@@ -8041,7 +8041,7 @@ const char kComposeNudgeAtCursorDescription[] =
|
||||
"Shows the Compose proactive nudge at the cursor location";
|
||||
@@ -8274,7 +8285,7 @@ const char kComposePoliteNudgeDescription[] =
|
||||
"available to interact with.";
|
||||
#endif // BUILDFLAG(ENABLE_COMPOSE)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/flag_descriptions.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/flag_descriptions.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/flag_descriptions.h
|
||||
@@ -1702,7 +1702,7 @@ extern const char kCbdTimeframeRequiredName[];
|
||||
@@ -1722,7 +1722,7 @@ extern const char kCbdTimeframeRequiredName[];
|
||||
extern const char kCbdTimeframeRequiredDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -9,7 +9,7 @@
|
||||
extern const char kPolicyIndicationForManagedDefaultSearchName[];
|
||||
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
|
||||
#endif
|
||||
@@ -1873,7 +1873,7 @@ extern const char kShowAutofillTypePredictionsName[];
|
||||
@@ -1906,7 +1906,7 @@ extern const char kShowAutofillTypePredictionsName[];
|
||||
extern const char kShowAutofillTypePredictionsDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -17,8 +17,8 @@
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
extern const char kShowFeaturedEnterpriseSiteSearchName[];
|
||||
extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
|
||||
#endif
|
||||
@@ -1888,7 +1888,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
|
||||
|
||||
@@ -1928,7 +1928,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
|
||||
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -27,7 +27,7 @@
|
||||
extern const char kSiteSearchSettingsPolicyName[];
|
||||
extern const char kSiteSearchSettingsPolicyDescription[];
|
||||
#endif
|
||||
@@ -4347,7 +4347,7 @@ extern const char kLacrosMergeIcuDataFileName[];
|
||||
@@ -4484,7 +4484,7 @@ extern const char kLacrosMergeIcuDataFileName[];
|
||||
extern const char kLacrosMergeIcuDataFileDescription[];
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
extern const char kGetAllScreensMediaName[];
|
||||
extern const char kGetAllScreensMediaDescription[];
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
@@ -4502,7 +4502,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
|
||||
@@ -4630,7 +4630,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
|
||||
|
||||
// Linux ---------------------------------------------------------------------
|
||||
|
||||
@ -45,7 +45,17 @@
|
||||
extern const char kOzonePlatformHintChoiceDefault[];
|
||||
extern const char kOzonePlatformHintChoiceAuto[];
|
||||
extern const char kOzonePlatformHintChoiceX11[];
|
||||
@@ -4544,7 +4544,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
||||
@@ -4643,6 +4643,9 @@ extern const char kPulseaudioLoopbackForCastName[];
|
||||
extern const char kPulseaudioLoopbackForCastDescription[];
|
||||
extern const char kPulseaudioLoopbackForScreenShareName[];
|
||||
extern const char kPulseaudioLoopbackForScreenShareDescription[];
|
||||
+
|
||||
+extern const char kAudioBackendName[];
|
||||
+extern const char kAudioBackendDescription[];
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
// All views-based platforms --------------------------------------------------
|
||||
@@ -4672,7 +4675,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
||||
extern const char kWebBluetoothConfirmPairingSupportDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -54,8 +64,8 @@
|
||||
extern const char kSkipUndecryptablePasswordsName[];
|
||||
extern const char kSkipUndecryptablePasswordsDescription[];
|
||||
|
||||
@@ -4556,13 +4556,13 @@ extern const char kRestartToGainAccessToKeychainDescri
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
@@ -4691,13 +4694,13 @@ extern const char kScreenlockReauthPromoCardDescriptio
|
||||
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
@ -70,7 +80,7 @@
|
||||
extern const char kEnableNetworkServiceSandboxName[];
|
||||
extern const char kEnableNetworkServiceSandboxDescription[];
|
||||
|
||||
@@ -4658,7 +4658,7 @@ extern const char kElementCaptureDescription[];
|
||||
@@ -4793,7 +4796,7 @@ extern const char kElementCaptureDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -78,9 +88,9 @@
|
||||
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
extern const char kUIDebugToolsName[];
|
||||
extern const char kUIDebugToolsDescription[];
|
||||
|
||||
@@ -4701,7 +4701,7 @@ extern const char kComposeNudgeAtCursorName[];
|
||||
extern const char kComposeNudgeAtCursorDescription[];
|
||||
#endif
|
||||
@@ -4841,7 +4844,7 @@ extern const char kComposePoliteNudgeName[];
|
||||
extern const char kComposePoliteNudgeDescription[];
|
||||
#endif // BUILDFLAG(ENABLE_COMPOSE)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
@@ -81,8 +81,10 @@
|
||||
@@ -83,8 +83,10 @@
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
#include "base/linux_util.h"
|
||||
#include "base/strings/string_split.h"
|
||||
@@ -106,7 +108,7 @@
|
||||
@@ -108,7 +110,7 @@
|
||||
#include "chromeos/crosapi/cpp/crosapi_constants.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -115,7 +117,7 @@
|
||||
@@ -117,7 +119,7 @@
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include "components/power_metrics/system_power_monitor.h"
|
||||
#endif
|
||||
|
||||
@@ -862,7 +864,7 @@ void RecordStartupMetrics() {
|
||||
@@ -864,7 +866,7 @@ void RecordStartupMetrics() {
|
||||
|
||||
// Record whether Chrome is the default browser or not.
|
||||
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
|
||||
@ -39,7 +39,7 @@
|
||||
shell_integration::DefaultWebClientState default_state =
|
||||
shell_integration::GetDefaultBrowser();
|
||||
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
|
||||
@@ -1154,11 +1156,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
|
||||
@@ -1163,11 +1165,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-02-23 21:04:38 UTC
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
|
||||
@@ -28,7 +28,7 @@ class PowerMetricsReporter;
|
||||
@@ -29,7 +29,7 @@ class PowerMetricsReporter;
|
||||
class ProcessMonitor;
|
||||
#endif
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
class PressureMetricsReporter;
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -115,7 +115,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
|
||||
std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
|
||||
@@ -119,7 +119,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
|
||||
performance_intervention_metrics_reporter_;
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -195,7 +195,7 @@
|
||||
@@ -195,11 +195,11 @@
|
||||
#include "chrome/notification_helper/notification_helper_constants.h"
|
||||
#endif
|
||||
|
||||
@ -9,6 +9,11 @@
|
||||
#include "components/metrics/motherboard_metrics_provider.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h"
|
||||
#endif
|
||||
|
||||
@@ -212,7 +212,7 @@
|
||||
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-05-21 18:07:39 UTC
|
||||
--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/metrics/perf/cpu_identity.cc
|
||||
@@ -142,7 +142,7 @@ CPUIdentity GetCPUIdentity() {
|
||||
@@ -147,7 +147,7 @@ CPUIdentity GetCPUIdentity() {
|
||||
result.release =
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
base::SysInfo::KernelVersion();
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
@ -154,7 +154,7 @@
|
||||
gssapi_library_loader_observer_.Install(network_service);
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -972,7 +972,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
|
||||
@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
|
||||
break;
|
||||
}
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
if (!enabled) {
|
||||
g_network_service_will_allow_gssapi_library_load = true;
|
||||
}
|
||||
@@ -1059,7 +1059,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
|
||||
@@ -1057,7 +1057,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
|
||||
@@ -488,7 +488,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin
|
||||
@@ -560,7 +560,7 @@ void ChromePasswordManagerClient::
|
||||
|
||||
bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling(
|
||||
device_reauth::DeviceAuthenticator* authenticator) {
|
||||
@ -9,7 +9,7 @@
|
||||
if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
|
||||
return false;
|
||||
}
|
||||
@@ -712,7 +712,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
|
||||
@@ -786,7 +786,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
|
||||
}
|
||||
|
||||
void ChromePasswordManagerClient::NotifyKeychainError() {
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
|
||||
@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
|
||||
@@ -138,7 +138,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
|
||||
std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
|
||||
IdentityManagerFactory::GetForProfile(profile));
|
||||
std::unique_ptr<password_manager::PasswordReuseManagerSigninNotifier>
|
||||
notifier = std::make_unique<
|
||||
password_manager::PasswordReuseManagerSigninNotifierImpl>(
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -234,19 +234,19 @@
|
||||
@@ -235,19 +235,19 @@
|
||||
#include "components/spellcheck/browser/pref_names.h"
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
#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_ANDROID)
|
||||
@@ -260,13 +260,13 @@
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
@@ -261,13 +261,13 @@
|
||||
#endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -39,7 +39,7 @@
|
||||
#include "components/search_engines/site_search_policy_handler.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -871,7 +871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -872,7 +872,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kManagedDefaultGeolocationSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
|
||||
@ -48,7 +48,7 @@
|
||||
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
|
||||
prefs::kCertRevocationCheckingRequiredLocalAnchors,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -880,7 +880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -881,7 +881,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
@ -57,8 +57,8 @@
|
||||
{ key::kFullscreenAllowed,
|
||||
prefs::kFullscreenAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1664,7 +1664,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1692,7 +1692,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::STRING },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
@ -66,7 +66,7 @@
|
||||
{ key::kGSSAPILibraryName,
|
||||
prefs::kGSSAPILibraryName,
|
||||
base::Value::Type::STRING },
|
||||
@@ -1715,7 +1715,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1746,7 +1746,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
{ key::kNetworkServiceSandboxEnabled,
|
||||
prefs::kNetworkServiceSandboxEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1741,12 +1741,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1772,12 +1772,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kTotalMemoryLimitMb,
|
||||
base::Value::Type::INTEGER },
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
@ -90,7 +90,7 @@
|
||||
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
|
||||
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1754,7 +1754,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1785,7 +1785,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kProfileSeparationDomainExceptionList,
|
||||
base::Value::Type::LIST },
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
@ -99,7 +99,7 @@
|
||||
{ key::kDefaultBrowserSettingEnabled,
|
||||
prefs::kDefaultBrowserSettingEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1766,7 +1766,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1797,7 +1797,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
|
||||
@ -108,7 +108,7 @@
|
||||
{ key::kAutoplayAllowed,
|
||||
prefs::kAutoplayAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1867,7 +1867,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1898,7 +1898,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@ -117,7 +117,7 @@
|
||||
{ key::kAlternativeBrowserPath,
|
||||
browser_switcher::prefs::kAlternativeBrowserPath,
|
||||
base::Value::Type::STRING },
|
||||
@@ -1972,7 +1972,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2003,7 +2003,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::LIST },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -126,7 +126,7 @@
|
||||
{ key::kAuthNegotiateDelegateByKdcPolicy,
|
||||
prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1997,7 +1997,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2028,7 +2028,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -135,7 +135,7 @@
|
||||
{ key::kEnforceLocalAnchorConstraintsEnabled,
|
||||
prefs::kEnforceLocalAnchorConstraintsEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2055,7 +2055,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2086,7 +2086,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
ash::prefs::kUrlParameterToAutofillSAMLUsername,
|
||||
base::Value::Type::STRING },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -144,7 +144,7 @@
|
||||
{ key::kTabDiscardingExceptions,
|
||||
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
|
||||
base::Value::Type::LIST },
|
||||
@@ -2084,7 +2084,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2115,7 +2115,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kUiAutomationProviderEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
@ -153,7 +153,7 @@
|
||||
{ key::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
prefs::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2118,7 +2118,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::INTEGER },
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
@ -162,7 +162,7 @@
|
||||
{ key::kExtensionInstallTypeBlocklist,
|
||||
extensions::pref_names::kExtensionInstallTypeBlocklist,
|
||||
base::Value::Type::LIST},
|
||||
@@ -2139,7 +2139,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2176,7 +2176,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed,
|
||||
base::Value::Type::INTEGER},
|
||||
#endif
|
||||
@ -171,7 +171,7 @@
|
||||
{ key::kChromeForTestingAllowed,
|
||||
prefs::kChromeForTestingAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2267,7 +2267,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2304,7 +2304,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
// Policies for all platforms - End
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -180,7 +180,7 @@
|
||||
handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
|
||||
key::kMemorySaverModeSavings,
|
||||
performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
|
||||
@@ -2283,7 +2283,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2320,7 +2320,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -189,7 +189,7 @@
|
||||
handlers->AddHandler(
|
||||
std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
|
||||
|
||||
@@ -2489,7 +2489,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2526,7 +2526,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -198,7 +198,7 @@
|
||||
handlers->AddHandler(
|
||||
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
@@ -2547,7 +2547,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2584,7 +2584,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
|
||||
chrome_schema));
|
||||
|
||||
@ -207,7 +207,7 @@
|
||||
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
|
||||
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
@@ -2661,7 +2661,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2698,7 +2698,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) || \
|
||||
@ -216,7 +216,7 @@
|
||||
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
|
||||
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
|
||||
base::Value::Type::BOOLEAN));
|
||||
@@ -3018,7 +3018,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3055,7 +3055,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
@ -225,7 +225,7 @@
|
||||
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
|
||||
@@ -3026,7 +3026,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3063,7 +3063,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
@ -234,7 +234,7 @@
|
||||
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
|
||||
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
|
||||
base::Value::Type::BOOLEAN));
|
||||
@@ -3044,7 +3044,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3081,7 +3081,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
|
||||
key::kRelatedWebsiteSetsOverrides, chrome_schema)));
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -243,7 +243,7 @@
|
||||
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
@@ -3067,7 +3067,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3104,7 +3104,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
base::Value::Type::BOOLEAN)));
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -489,18 +489,18 @@
|
||||
#endif
|
||||
@ -31,7 +31,7 @@
|
||||
#include "ui/color/system_theme.h"
|
||||
#endif
|
||||
|
||||
@@ -1861,7 +1861,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
@@ -1953,7 +1953,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
true);
|
||||
#endif // BUILDFLAG(ENABLE_PDF)
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
|
||||
#endif
|
||||
|
||||
@@ -2213,12 +2213,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
@@ -2309,12 +2309,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
|
||||
@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = {
|
||||
@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = {
|
||||
prefs::kShowFullscreenToolbar,
|
||||
#endif
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -329,7 +329,7 @@
|
||||
@@ -335,7 +335,7 @@
|
||||
#include "chromeos/constants/chromeos_features.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
|
||||
#endif
|
||||
|
||||
@@ -413,18 +413,18 @@
|
||||
@@ -420,18 +420,18 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -31,7 +31,7 @@
|
||||
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
|
||||
#include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
|
||||
#include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
|
||||
@@ -660,7 +660,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -671,7 +671,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
DiceBoundSessionCookieServiceFactory::GetInstance();
|
||||
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
|
||||
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
|
||||
@ -40,8 +40,8 @@
|
||||
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
|
||||
#endif
|
||||
browser_sync::UserEventServiceFactory::GetInstance();
|
||||
@@ -785,29 +785,29 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
|
||||
@@ -799,32 +799,32 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -49,6 +49,9 @@
|
||||
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
|
||||
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
||||
enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance();
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
|
||||
@ -76,7 +79,7 @@
|
||||
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
|
||||
@@ -933,7 +933,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -952,7 +952,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#endif
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -85,7 +88,7 @@
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -1038,7 +1038,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -1058,7 +1058,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
policy::PolicyCertServiceFactory::GetInstance();
|
||||
#endif
|
||||
@ -94,7 +97,7 @@
|
||||
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
|
||||
policy::UserPolicyOidcSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -1080,7 +1080,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -1101,7 +1101,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
|
||||
ProfileStatisticsFactory::GetInstance();
|
||||
#endif
|
||||
@ -103,7 +106,7 @@
|
||||
ProfileTokenWebSigninInterceptorFactory::GetInstance();
|
||||
OidcAuthenticationSigninInterceptorFactory::GetInstance();
|
||||
#endif
|
||||
@@ -1099,7 +1099,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -1120,7 +1120,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#endif
|
||||
ReduceAcceptLanguageFactory::GetInstance();
|
||||
RendererUpdaterFactory::GetInstance();
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/profiles/profile_impl.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/profiles/profile_impl.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/profiles/profile_impl.cc
|
||||
@@ -262,6 +262,10 @@
|
||||
@@ -265,6 +265,10 @@
|
||||
#include "chrome/browser/spellchecker/spellcheck_service.h"
|
||||
#endif
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
using bookmarks::BookmarkModel;
|
||||
using content::BrowserThread;
|
||||
using content::DownloadManagerDelegate;
|
||||
@@ -596,7 +600,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
|
||||
@@ -600,7 +604,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
|
||||
#else
|
||||
{
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@ -20,7 +20,7 @@
|
||||
ProfileManager* profile_manager = g_browser_process->profile_manager();
|
||||
ProfileAttributesEntry* entry =
|
||||
profile_manager->GetProfileAttributesStorage()
|
||||
@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
|
||||
@@ -901,7 +905,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
|
||||
}
|
||||
|
||||
base::FilePath ProfileImpl::last_selected_directory() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/profiles/profiles_state.cc.orig 2024-02-23 21:04:38 UTC
|
||||
--- chrome/browser/profiles/profiles_state.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/profiles/profiles_state.cc
|
||||
@@ -195,7 +195,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
|
||||
@@ -196,7 +196,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
|
||||
PrefService* local_state,
|
||||
bool show_warning) {
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
|
||||
@ -9,3 +9,21 @@
|
||||
DCHECK(local_state);
|
||||
|
||||
// Check if guest mode enforcement commandline switch or policy are provided.
|
||||
@@ -243,7 +243,7 @@ bool IsGuestModeEnabled() {
|
||||
return false;
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
// If there are any supervised profiles, disable guest mode.
|
||||
if (base::FeatureList::IsEnabled(
|
||||
supervised_user::kHideGuestModeForSupervisedUsers) &&
|
||||
@@ -259,7 +259,7 @@ bool IsGuestModeEnabled() {
|
||||
}
|
||||
|
||||
bool IsGuestModeEnabled(const Profile& profile) {
|
||||
-#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::kHideGuestModeForSupervisedUsers)) {
|
||||
ProfileAttributesEntry* profile_attributes =
|
||||
|
@ -0,0 +1,20 @@
|
||||
--- chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "components/crash/core/common/crash_key.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#endif
|
||||
@@ -416,7 +416,7 @@ std::string GetProfileEmail(Profile* profile) {
|
||||
std::string email =
|
||||
GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
if (email.empty()) {
|
||||
email = profile->GetPrefs()->GetString(
|
||||
enterprise_signin::prefs::kProfileUserEmail);
|
@ -1,29 +0,0 @@
|
||||
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-03-22 08:19:40 UTC
|
||||
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h"
|
||||
#endif
|
||||
|
||||
@@ -85,7 +85,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
|
||||
} else if (inspection_type == DownloadFileType::DMG) {
|
||||
StartExtractDmgFeatures();
|
||||
#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 &&
|
||||
!base::FeatureList::IsEnabled(kMaldocaSkipCheck)) {
|
||||
StartExtractDocumentFeatures();
|
||||
@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
|
||||
}
|
||||
#endif // BUILDFLAG(IS_MAC)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
void FileAnalyzer::StartExtractDocumentFeatures() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
@ -1,29 +0,0 @@
|
||||
--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-12-10 06:10:27 UTC
|
||||
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "components/safe_browsing/core/common/proto/csd.pb.h"
|
||||
#include "third_party/protobuf/src/google/protobuf/repeated_field.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
|
||||
#endif
|
||||
|
||||
@@ -110,7 +110,7 @@ class FileAnalyzer {
|
||||
const safe_browsing::ArchiveAnalyzerResults& archive_results);
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
void StartExtractDocumentFeatures();
|
||||
void OnDocumentAnalysisFinished(
|
||||
const DocumentAnalyzerResults& document_results);
|
||||
@@ -141,7 +141,7 @@ class FileAnalyzer {
|
||||
dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
std::unique_ptr<SandboxedDocumentAnalyzer, base::OnTaskRunnerDeleter>
|
||||
document_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
|
||||
base::TimeTicks document_analysis_start_time_;
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/screen_ai/screen_ai_install_state.cc
|
||||
@@ -22,7 +22,7 @@
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "services/screen_ai/public/cpp/utilities.h"
|
||||
#include "ui/accessibility/accessibility_features.h"
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
#include "base/cpu.h"
|
||||
#include "base/files/file_util.h"
|
||||
#endif
|
||||
@@ -32,7 +32,7 @@ const int kScreenAICleanUpDelayInDays = 30;
|
||||
const char kMinExpectedVersion[] = "123.1";
|
||||
@@ -27,7 +27,7 @@ const int kScreenAICleanUpDelayInDays = 30;
|
||||
const char kMinExpectedVersion[] = "124.2";
|
||||
|
||||
bool IsDeviceCompatible() {
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/screen_ai/screen_ai_service_router.cc
|
||||
@@ -280,7 +280,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
|
||||
@@ -284,7 +284,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
|
||||
base::FilePath binary_path = state_instance->get_component_binary_path();
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
std::vector<base::FilePath> preload_libraries = {binary_path};
|
||||
@ -9,7 +9,7 @@
|
||||
std::vector<std::string> extra_switches = {
|
||||
base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
|
||||
binary_path.MaybeAsASCII().c_str())};
|
||||
@@ -294,7 +294,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
|
||||
@@ -298,7 +298,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
|
||||
.WithPreloadedLibraries(
|
||||
preload_libraries,
|
||||
content::ServiceProcessHostPreloadLibraries::GetPassKey())
|
||||
|
@ -0,0 +1,20 @@
|
||||
--- chrome/browser/sessions/session_restore.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/sessions/session_restore.cc
|
||||
@@ -99,7 +99,7 @@
|
||||
#include "chrome/browser/web_applications/web_app_registrar.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -1040,7 +1040,7 @@ class SessionRestoreImpl : public BrowserListObserver
|
||||
bool is_first_tab = true;
|
||||
for (const auto& startup_tab : startup_tabs) {
|
||||
const GURL& url = startup_tab.url;
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
if (url == whats_new::GetWebUIStartupURL()) {
|
||||
whats_new::StartWhatsNewFetch(browser);
|
||||
continue;
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-02-23 21:04:38 UTC
|
||||
--- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/sharing/sharing_device_registration.cc
|
||||
@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
|
||||
@@ -331,7 +331,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
|
||||
|
||||
bool SharingDeviceRegistration::IsRemoteCopySupported() const {
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/signin/signin_util.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/signin/signin_util.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/signin/signin_util.cc
|
||||
@@ -80,7 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
|
||||
@@ -81,7 +81,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
|
||||
CookiesMover::~CookiesMover() = default;
|
||||
|
||||
void CookiesMover::StartMovingCookies() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
|
||||
@@ -185,7 +185,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
|
||||
@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
|
||||
@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager::
|
||||
@@ -359,7 +359,7 @@ void SupervisedUserExtensionsManager::
|
||||
ActivateManagementPolicyAndUpdateRegistration() {
|
||||
SetActiveForSupervisedUsers();
|
||||
UpdateManagementPolicyRegistration();
|
||||
@ -9,7 +9,7 @@
|
||||
MaybeMarkExtensionsLocallyParentApproved();
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
}
|
||||
@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
|
||||
@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_extensions_manager.h
|
||||
@@ -147,7 +147,7 @@ class SupervisedUserExtensionsManager : public Extensi
|
||||
@@ -154,7 +154,7 @@ class SupervisedUserExtensionsManager : public Extensi
|
||||
// launched.
|
||||
bool ShouldBlockExtension(const std::string& extension_id) const;
|
||||
|
||||
|
@ -0,0 +1,20 @@
|
||||
--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "components/supervised_user/core/browser/supervised_user_service.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h"
|
||||
#endif
|
||||
|
||||
@@ -55,7 +55,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui
|
||||
std::unique_ptr<supervised_user::SupervisedUserMetricsService ::
|
||||
SupervisedUserMetricsServiceExtensionDelegate>
|
||||
extensions_metrics_delegate = nullptr;
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
extensions_metrics_delegate =
|
||||
std::make_unique<SupervisedUserExtensionsMetricsDelegateImpl>(
|
||||
extensions::ExtensionRegistry::Get(profile), *profile->GetPrefs());
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/sync/chrome_sync_client.cc
|
||||
@@ -116,7 +116,7 @@
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
|
||||
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
@@ -474,7 +474,7 @@ ChromeSyncClient::CreateModelTypeControllers(
|
||||
@@ -475,7 +475,7 @@ ChromeSyncClient::CreateModelTypeControllers(
|
||||
// platforms.
|
||||
bool enable_tab_group_sync = false;
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -17,8 +17,8 @@
|
||||
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
enable_tab_group_sync = true;
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
enable_tab_group_sync = tab_groups::IsTabGroupSyncEnabled(GetPrefService());
|
||||
@@ -506,7 +506,7 @@ ChromeSyncClient::CreateModelTypeControllers(
|
||||
enable_tab_group_sync =
|
||||
@@ -514,7 +514,7 @@ ChromeSyncClient::CreateModelTypeControllers(
|
||||
|
||||
// Chrome prefers OS provided spell checkers where they exist. So only sync the
|
||||
// custom dictionary on platforms that typically don't provide one.
|
||||
@ -27,7 +27,7 @@
|
||||
// Dictionary sync is enabled by default.
|
||||
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
|
||||
controllers.push_back(
|
||||
@@ -663,7 +663,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy
|
||||
@@ -671,7 +671,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy
|
||||
switch (type) {
|
||||
case syncer::SAVED_TAB_GROUP: {
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/sync/sync_service_factory.cc
|
||||
@@ -82,7 +82,7 @@
|
||||
@@ -84,7 +84,7 @@
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h"
|
||||
@@ -133,7 +133,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
@@ -135,7 +135,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
// TODO(crbug.com/40118868): Reassess whether the following block needs to be
|
||||
// included in lacros-chrome once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
@ -18,7 +18,7 @@
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
syncer::SyncPrefs prefs(profile->GetPrefs());
|
||||
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
|
||||
@@ -269,7 +269,7 @@ SyncServiceFactory::SyncServiceFactory()
|
||||
@@ -274,7 +274,7 @@ SyncServiceFactory::SyncServiceFactory()
|
||||
DependsOn(ProfilePasswordStoreFactory::GetInstance());
|
||||
DependsOn(PowerBookmarkServiceFactory::GetInstance());
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
@ -1,15 +1,15 @@
|
||||
--- chrome/browser/themes/theme_service.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/themes/theme_service.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/themes/theme_service.cc
|
||||
@@ -73,7 +73,7 @@
|
||||
@@ -70,7 +70,7 @@
|
||||
#include "extensions/browser/extension_registry_observer.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "ui/linux/linux_ui.h"
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#include "ui/ozone/public/ozone_platform.h" // nogncheck
|
||||
#endif
|
||||
@@ -329,7 +329,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
|
||||
@@ -326,7 +326,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
|
||||
}
|
||||
|
||||
bool ThemeService::ShouldUseCustomFrame() const {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/ui/actions/chrome_action_id.h
|
||||
@@ -518,7 +518,7 @@
|
||||
@@ -515,7 +515,7 @@
|
||||
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
|
||||
E(kActionContentContextQuickAnswersInlineQuery, \
|
||||
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
|
||||
@@ -47,7 +47,7 @@ gfx::Rect GetPopupSizeForVcn3ds() {
|
||||
@@ -49,7 +49,7 @@ gfx::Rect GetPopupSizeForVcn3ds() {
|
||||
DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
|
||||
ContentAutofillClient* client)
|
||||
: client_(CHECK_DEREF(client)) {
|
||||
@ -9,7 +9,7 @@
|
||||
scoped_observation_.Observe(BrowserList::GetInstance());
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
}
|
||||
@@ -90,7 +90,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
|
||||
@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "components/autofill/core/browser/payments/payments_window_manager.h"
|
||||
@ -27,7 +27,7 @@
|
||||
// BrowserListObserver:
|
||||
void OnBrowserSetLastActive(Browser* browser) override;
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@@ -132,7 +132,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
|
||||
@@ -136,7 +136,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
|
||||
std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl>
|
||||
payments_window_user_consent_dialog_controller_;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/browser.h.orig 2024-06-17 12:56:06 UTC
|
||||
--- chrome/browser/ui/browser.h.orig 2024-07-30 11:12:21 UTC
|
||||
+++ chrome/browser/ui/browser.h
|
||||
@@ -329,7 +329,7 @@ class Browser : public TabStripModelObserver,
|
||||
@@ -339,7 +339,7 @@ class Browser : public TabStripModelObserver,
|
||||
std::optional<int64_t> display_id;
|
||||
#endif
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user