forked from Lainports/freebsd-ports
www/ungoogled-chromium: update to 131.0.6778.69
Security: https://vuxml.freebsd.org/freebsd/8fe4f296-a3ec-11ef-8c1c-a8a1599412c6.html
This commit is contained in:
parent
95a2d7d0e4
commit
01b71207ce
337 changed files with 2165 additions and 1727 deletions
|
|
@ -1,6 +1,5 @@
|
|||
PORTNAME= ungoogled-chromium
|
||||
PORTVERSION= 130.0.6723.91
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 131.0.6778.69
|
||||
PULSEMV= 16
|
||||
PULSEV= ${PULSEMV}.1
|
||||
UGVERSION= ${DISTVERSION}-1
|
||||
|
|
@ -8,10 +7,13 @@ CATEGORIES= www wayland
|
|||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
||||
https://nerd.hu/distfiles/:external \
|
||||
https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
|
||||
DISTFILES= chromium-${DISTVERSION}${EXTRACT_SUFX} \
|
||||
DISTFILES= chromium-${DISTVERSION}${EXTRACT_SUFX}:external \
|
||||
ungoogled-chromium-${UGVERSION}.tar.gz:external \
|
||||
pulseaudio-${PULSEV}.tar.gz:pulseaudio
|
||||
|
||||
# unofficial distfiles
|
||||
DISTFILES+= chrome-gn-${PORTVERSION}-src.tar.xz:external
|
||||
|
||||
MAINTAINER= chromium@FreeBSD.org
|
||||
COMMENT= Google web browser based on WebKit sans integration with Google
|
||||
WWW= https://github.com/ungoogled-software/ungoogled-chromium
|
||||
|
|
@ -92,7 +94,7 @@ USE_PERL5= build
|
|||
USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \
|
||||
xorgproto xrandr xrender xscrnsaver xtst
|
||||
USE_QT= buildtools:build
|
||||
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
|
||||
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper
|
||||
|
||||
MAKE_ARGS= -C out/${BUILDTYPE}
|
||||
ALL_TARGET= chrome
|
||||
|
|
@ -234,7 +236,7 @@ WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content
|
|||
WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm
|
||||
|
||||
.include "Makefile.tests"
|
||||
TEST_DISTFILES= chromium-${DISTVERSION}-testdata${EXTRACT_SUFX}
|
||||
TEST_DISTFILES= chromium-${DISTVERSION}-testdata${EXTRACT_SUFX}:external
|
||||
TEST_ALL_TARGET= ${TEST_TARGETS}
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
|
@ -310,7 +312,7 @@ pre-configure:
|
|||
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
|
||||
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
|
||||
./build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
|
||||
dav1d flac fontconfig harfbuzz-ng icu libdrm libevent libpng \
|
||||
libusb libwebp libxml libxslt openh264 opus || ${FALSE}
|
||||
# Chromium uses an unreleased version of FFmpeg, so configure it
|
||||
cd ${WRKSRC}/media/ffmpeg && \
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
TIMESTAMP = 1730535656
|
||||
SHA256 (chromium-130.0.6723.91.tar.xz) = c2f13de70f2dcf61c930dcfe54ee118e584962afd03ecde19e3be48b3d86bec0
|
||||
SIZE (chromium-130.0.6723.91.tar.xz) = 6624503880
|
||||
SHA256 (ungoogled-chromium-130.0.6723.91-1.tar.gz) = 381af49c15f3afdf6373b8ee0309e3df5d5062e52cc647c6346e4c224b7223cf
|
||||
SIZE (ungoogled-chromium-130.0.6723.91-1.tar.gz) = 1247258
|
||||
TIMESTAMP = 1731759520
|
||||
SHA256 (chromium-131.0.6778.69.tar.xz) = 9a3454710aacb495275da698e4d9efe785ed8a492713faa2d5dd90d58e111875
|
||||
SIZE (chromium-131.0.6778.69.tar.xz) = 4507189692
|
||||
SHA256 (ungoogled-chromium-131.0.6778.69-1.tar.gz) = 84820f9d9167d0d3ef440d1ca32890ab3af9e0723b28b3151f7ce2d71d826dbe
|
||||
SIZE (ungoogled-chromium-131.0.6778.69-1.tar.gz) = 1251967
|
||||
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
|
||||
SIZE (pulseaudio-16.1.tar.gz) = 2763111
|
||||
SHA256 (chromium-130.0.6723.91-testdata.tar.xz) = 66b4b339da273c53416165112d385a171fe6af79c87174a1f7951ba31c507cef
|
||||
SIZE (chromium-130.0.6723.91-testdata.tar.xz) = 281380152
|
||||
SHA256 (chrome-gn-131.0.6778.69-src.tar.xz) = b8c2afac409532ada5aa8d42e12762bdb284865bb2af49551a12e75ccccee0ab
|
||||
SIZE (chrome-gn-131.0.6778.69-src.tar.xz) = 762288
|
||||
SHA256 (chromium-131.0.6778.69-testdata.tar.xz) = f2c0320296f022cd92f6c3b00e8b710f3b5fa13aca38968da338cfdce209e25c
|
||||
SIZE (chromium-131.0.6778.69-testdata.tar.xz) = 282547888
|
||||
|
|
|
|||
9
www/ungoogled-chromium/files/patch-.gn
Normal file
9
www/ungoogled-chromium/files/patch-.gn
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
--- .gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ .gn
|
||||
@@ -172,4 +172,6 @@ exec_script_whitelist =
|
||||
|
||||
"//tools/grit/grit_rule.gni",
|
||||
"//tools/gritsettings/BUILD.gn",
|
||||
+
|
||||
+ "//third_party/icu/BUILD.gn",
|
||||
]
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
--- BUILD.gn.orig 2024-10-27 06:40:35 UTC
|
||||
--- BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -66,7 +66,7 @@ declare_args() {
|
||||
root_extra_deps = []
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
"//net:net_unittests",
|
||||
"//sandbox:sandbox_unittests",
|
||||
"//services:services_unittests",
|
||||
@@ -437,7 +436,7 @@ group("gn_all") {
|
||||
@@ -444,7 +443,7 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
deps += [
|
||||
"//third_party/breakpad:breakpad_unittests",
|
||||
"//third_party/breakpad:core-2-minidump",
|
||||
@@ -620,6 +619,15 @@ group("gn_all") {
|
||||
@@ -626,6 +625,15 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
if (is_mac) {
|
||||
deps += [
|
||||
"//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
|
||||
@@ -668,7 +676,7 @@ group("gn_all") {
|
||||
@@ -674,7 +682,7 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
# The official builders use this binary from the default toolchain's
|
||||
# output directory after building in order to upload the symbols of that
|
||||
# binary. They build the binary like `ninja symupload` which requires the
|
||||
@@ -1150,7 +1158,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1160,7 +1168,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 = _common_web_test_options + [ "--product=chrome" ]
|
||||
@@ -1243,7 +1251,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1253,7 +1261,7 @@ if (use_blink && !is_cronet_build) {
|
||||
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
|
||||
}
|
||||
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
# Using the default toolchain for this tool, as it's run during tests not
|
||||
# during the build. This places a symlink in the root_build_dir for scrips
|
||||
# to use.
|
||||
@@ -1257,7 +1265,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1267,7 +1275,7 @@ if (use_blink && !is_cronet_build) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms" ]
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
# Using the default toolchain for this tool, as it's run during tests not
|
||||
# during the build. This places a symlink in the root_build_dir for scrips
|
||||
# to use.
|
||||
@@ -1721,7 +1729,7 @@ group("chromium_builder_perf") {
|
||||
@@ -1731,7 +1739,7 @@ group("chromium_builder_perf") {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- ash/display/mirror_window_controller.cc.orig 2023-09-17 07:59:53 UTC
|
||||
--- ash/display/mirror_window_controller.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ ash/display/mirror_window_controller.cc
|
||||
@@ -294,7 +294,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
if (!base::Contains(display_info_list, iter->first,
|
||||
&display::ManagedDisplayInfo::id)) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/BUILD.gn.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -1101,11 +1101,26 @@ component("base") {
|
||||
@@ -1097,11 +1097,26 @@ 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.
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
if (use_allocator_shim) {
|
||||
if (is_apple) {
|
||||
sources += [ "allocator/early_zone_registration_apple.h" ]
|
||||
@@ -1125,7 +1140,7 @@ component("base") {
|
||||
@@ -1121,7 +1136,7 @@ component("base") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -2102,6 +2117,22 @@ component("base") {
|
||||
@@ -2113,6 +2128,22 @@ component("base") {
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
# iOS
|
||||
if (is_ios) {
|
||||
sources += [
|
||||
@@ -2246,6 +2277,33 @@ component("base") {
|
||||
@@ -2257,6 +2288,33 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
if (use_blink) {
|
||||
sources += [
|
||||
"files/file_path_watcher.cc",
|
||||
@@ -2572,7 +2630,7 @@ buildflag_header("protected_memory_buildflags") {
|
||||
@@ -2583,7 +2641,7 @@ buildflag_header("protected_memory_buildflags") {
|
||||
header = "protected_memory_buildflags.h"
|
||||
header_dir = "base/memory"
|
||||
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
(is_win || is_linux || is_android || is_mac)
|
||||
|
||||
flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
|
||||
@@ -3055,7 +3113,7 @@ if (is_apple) {
|
||||
@@ -3068,7 +3126,7 @@ if (is_apple) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
# This test must compile with -fstack-protector-all
|
||||
source_set("stack_canary_linux_unittests") {
|
||||
testonly = true
|
||||
@@ -3717,7 +3775,7 @@ test("base_unittests") {
|
||||
@@ -3744,7 +3802,7 @@ test("base_unittests") {
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
sources += [
|
||||
"debug/proc_maps_linux_unittest.cc",
|
||||
"files/scoped_file_linux_unittest.cc",
|
||||
@@ -3744,7 +3802,7 @@ test("base_unittests") {
|
||||
@@ -3771,7 +3829,7 @@ test("base_unittests") {
|
||||
"posix/file_descriptor_shuffle_unittest.cc",
|
||||
"posix/unix_domain_socket_unittest.cc",
|
||||
]
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
sources += [
|
||||
"profiler/stack_base_address_posix_unittest.cc",
|
||||
"profiler/stack_copier_signal_unittest.cc",
|
||||
@@ -3755,7 +3813,7 @@ test("base_unittests") {
|
||||
@@ -3782,7 +3840,7 @@ test("base_unittests") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -3942,7 +4000,7 @@ test("base_unittests") {
|
||||
@@ -3972,7 +4030,7 @@ test("base_unittests") {
|
||||
deps += [ ":base_profiler_test_support_library" ]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc.gni
|
||||
@@ -31,7 +31,7 @@ if (is_nacl) {
|
||||
use_large_empty_slot_span_ring = is_mac
|
||||
@@ -38,7 +38,7 @@ if (is_nacl) {
|
||||
use_large_empty_slot_span_ring = true
|
||||
|
||||
has_memory_tagging =
|
||||
- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
declare_args() {
|
||||
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
|
||||
@@ -391,7 +391,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
|
||||
@@ -429,7 +429,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 =
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
|
||||
@@ -858,7 +858,7 @@ if (is_clang_or_gcc) {
|
||||
@@ -863,7 +863,7 @@ if (is_clang_or_gcc) {
|
||||
configs -= [ partition_alloc_enable_arc_config ]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "partition_alloc/page_allocator.h"
|
||||
@@ -38,7 +38,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API
|
||||
#endif // PA_BUILDFLAG(IS_MAC)
|
||||
|
||||
#if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \
|
||||
- (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
|
||||
@@ -412,8 +412,12 @@ bool TryRecommitSystemPagesInternal(
|
||||
@@ -302,8 +302,12 @@ bool TryRecommitSystemPagesInternal(
|
||||
|
||||
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
|
||||
void* ptr = reinterpret_cast<void*>(address);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
|
||||
@@ -168,7 +168,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
@@ -170,7 +170,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
// This may be required on more platforms in the future.
|
||||
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
|
||||
(PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
// Enable shadow metadata.
|
||||
//
|
||||
@@ -231,7 +231,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
@@ -233,7 +233,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 PA_BUILDFLAG(IS_LINUX) || \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
|
||||
@@ -44,7 +44,7 @@
|
||||
#include "wow64apiset.h"
|
||||
|
|
@ -7,9 +7,9 @@
|
|||
-#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
|
||||
|
||||
@@ -290,7 +290,7 @@ void PartitionAllocMallocInitOnce() {
|
||||
#if PA_CONFIG(ENABLE_SHADOW_METADATA)
|
||||
#include <sys/mman.h>
|
||||
@@ -293,7 +293,7 @@ void PartitionAllocMallocInitOnce() {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
// When fork() is called, only the current thread continues to execute in the
|
||||
// child process. If the lock is held, but *not* by this thread when fork() is
|
||||
// called, we have a deadlock.
|
||||
@@ -1110,7 +1110,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
|
||||
@@ -1113,7 +1113,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
|
||||
// apple OSes.
|
||||
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
|
||||
(internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
|
|
|
|||
|
|
@ -1,20 +1,11 @@
|
|||
--- base/compiler_specific.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/compiler_specific.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/compiler_specific.h
|
||||
@@ -257,7 +257,7 @@
|
||||
//
|
||||
// In some cases it's desirable to remove this, e.g. on hot functions, or if
|
||||
// we have purposely changed the reference canary.
|
||||
-#if defined(COMPILER_GCC) || defined(__clang__)
|
||||
+#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
|
||||
#if HAS_ATTRIBUTE(__no_stack_protector__)
|
||||
#define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__))
|
||||
@@ -683,7 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
|
||||
#if __has_cpp_attribute(clang::preserve_most) && \
|
||||
(defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \
|
||||
!defined(COMPONENT_BUILD) && \
|
||||
- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64))
|
||||
+ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64))
|
||||
#define PRESERVE_MOST [[clang::preserve_most]]
|
||||
#else
|
||||
@@ -388,7 +388,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
|
||||
// See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for
|
||||
// more details.
|
||||
#if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \
|
||||
- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) && \
|
||||
+ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) && \
|
||||
!defined(COMPONENT_BUILD) && defined(__clang__) && \
|
||||
__clang_major__ >= 17 && HAS_ATTRIBUTE(preserve_most)
|
||||
#define PRESERVE_MOST __attribute__((preserve_most))
|
||||
#define PRESERVE_MOST
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- base/debug/stack_trace_posix.cc.orig 2024-07-31 14:19:23 UTC
|
||||
--- base/debug/stack_trace_posix.cc.orig 2024-11-16 12:20:41 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
|
||||
@@ -307,7 +309,7 @@ void PrintToStderr(const char* output) {
|
||||
@@ -322,7 +324,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
|
||||
@@ -324,7 +326,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
|
||||
@@ -339,7 +341,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)
|
||||
@@ -541,7 +547,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -537,7 +543,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;
|
||||
@@ -566,6 +572,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -562,6 +568,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) {
|
||||
@@ -580,6 +587,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -576,6 +583,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)
|
||||
|
||||
@@ -769,6 +777,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -772,6 +780,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.
|
||||
@@ -861,11 +870,15 @@ class SandboxSymbolizeHelper {
|
||||
@@ -864,11 +873,15 @@ class SandboxSymbolizeHelper {
|
||||
r.base = cur_base;
|
||||
}
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -883,6 +896,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -886,6 +899,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
|
|
|
|||
11
www/ungoogled-chromium/files/patch-base_files_drive__info.h
Normal file
11
www/ungoogled-chromium/files/patch-base_files_drive__info.h
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- base/files/drive_info.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/files/drive_info.h
|
||||
@@ -40,7 +40,7 @@ class BASE_EXPORT DriveInfo {
|
||||
std::optional<bool> has_seek_penalty;
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// Whether the drive is a removable drive.
|
||||
//
|
||||
// Note on macOS: that SSDs that are connected over USB that you can eject
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- base/files/drive_info_posix.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/files/drive_info_posix.cc
|
||||
@@ -28,7 +28,7 @@ DriveInfo& DriveInfo::operator=(DriveInfo&&) = default
|
||||
|
||||
std::optional<DriveInfo> GetFileDriveInfo(const FilePath& file_path) {
|
||||
DriveInfo drive_info;
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
drive_info.has_seek_penalty = false;
|
||||
return drive_info;
|
||||
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/files/file_util_posix.cc.orig 2024-07-31 14:19:23 UTC
|
||||
--- base/files/file_util_posix.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -889,36 +889,33 @@ bool CreateNewTempDirectory(const FilePath::StringType
|
||||
@@ -897,36 +897,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().
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/files/file_util_unittest.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/files/file_util_unittest.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/files/file_util_unittest.cc
|
||||
@@ -3886,7 +3886,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
|
||||
@@ -3928,7 +3928,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";
|
||||
@@ -4608,7 +4608,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
|
||||
@@ -4665,7 +4665,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
|
||||
NULL);
|
||||
#else
|
||||
size_t bytes_written =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- base/logging_unittest.cc.orig 2024-06-22 08:49:42 UTC
|
||||
--- base/logging_unittest.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/logging_unittest.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "base/posix/eintr_wrapper.h"
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include <ucontext.h>
|
||||
#endif
|
||||
|
||||
@@ -579,14 +579,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
|
||||
@@ -585,14 +585,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
|
||||
// need the arch-specific boilerplate below, which is inspired by breakpad.
|
||||
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
|
||||
uintptr_t crash_addr = 0;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/process/launch.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- base/process/launch.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/process/launch.h
|
||||
@@ -237,7 +237,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
@@ -241,7 +241,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
bool clear_environment = false;
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/system/sys_info.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- base/system/sys_info.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/system/sys_info.cc
|
||||
@@ -223,7 +223,7 @@ std::string SysInfo::HardwareModelName() {
|
||||
@@ -229,7 +229,7 @@ std::string SysInfo::SocManufacturer() {
|
||||
#endif
|
||||
|
||||
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/system/sys_info.h.orig 2024-05-23 20:04:36 UTC
|
||||
--- base/system/sys_info.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/system/sys_info.h
|
||||
@@ -325,6 +325,8 @@ class BASE_EXPORT SysInfo {
|
||||
@@ -331,6 +331,8 @@ class BASE_EXPORT SysInfo {
|
||||
static void ResetCpuSecurityMitigationsEnabledForTesting();
|
||||
#endif
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
private:
|
||||
friend class test::ScopedAmountOfPhysicalMemoryOverride;
|
||||
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
|
||||
@@ -337,7 +339,7 @@ class BASE_EXPORT SysInfo {
|
||||
@@ -343,7 +345,7 @@ class BASE_EXPORT SysInfo {
|
||||
static HardwareInfo GetHardwareInfoSync();
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- base/threading/hang_watcher.cc.orig 2024-07-31 14:19:23 UTC
|
||||
--- base/threading/hang_watcher.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ base/threading/hang_watcher.cc
|
||||
@@ -354,7 +354,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
|
||||
@@ -352,7 +352,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
|
||||
|
||||
bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/clang/BUILD.gn.orig 2024-10-27 06:40:35 UTC
|
||||
--- build/config/clang/BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ build/config/clang/BUILD.gn
|
||||
@@ -236,7 +236,12 @@ template("clang_lib") {
|
||||
@@ -210,7 +210,12 @@ 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-10-27 06:40:35 UTC
|
||||
--- build/config/compiler/BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -199,7 +199,7 @@ declare_args() {
|
||||
# This greatly reduces the size of debug builds, at the cost of
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
|
||||
if (save_reproducers_on_lld_crash && use_lld) {
|
||||
ldflags += [
|
||||
@@ -1217,7 +1224,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -1220,7 +1227,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" ]
|
||||
@@ -1232,7 +1239,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -1235,7 +1242,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" ]
|
||||
@@ -1567,7 +1574,7 @@ config("compiler_deterministic") {
|
||||
@@ -1570,7 +1577,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",
|
||||
@@ -1625,7 +1632,7 @@ config("compiler_deterministic") {
|
||||
@@ -1628,7 +1635,7 @@ config("compiler_deterministic") {
|
||||
}
|
||||
|
||||
config("clang_revision") {
|
||||
|
|
@ -83,17 +83,17 @@
|
|||
current_os != "zos") {
|
||||
update_args = [
|
||||
"--print-revision",
|
||||
@@ -1955,9 +1962,6 @@ config("default_warnings") {
|
||||
|
||||
# TODO(crbug.com/40286317): Evaluate and possibly enable.
|
||||
"-Wno-vla-extension",
|
||||
@@ -1952,9 +1959,6 @@ config("default_warnings") {
|
||||
cflags += [
|
||||
# TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
|
||||
"-Wno-cast-function-type",
|
||||
-
|
||||
- # TODO(crbug.com/40284799): Fix and re-enable.
|
||||
- "-Wno-thread-safety-reference-return",
|
||||
]
|
||||
|
||||
cflags_cc += [
|
||||
@@ -1965,17 +1969,11 @@ config("default_warnings") {
|
||||
@@ -1962,18 +1966,12 @@ config("default_warnings") {
|
||||
"-Wenum-compare-conditional",
|
||||
]
|
||||
|
||||
|
|
@ -103,16 +103,17 @@
|
|||
# TODO(crbug.com/41486292): Fix and re-enable.
|
||||
"-Wno-c++11-narrowing-const-reference",
|
||||
]
|
||||
-
|
||||
|
||||
- # TODO(crbug.com/344680447): Fix and re-enable.
|
||||
- cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
|
||||
-
|
||||
- # TODO(crbug.com/356172342): Fix and re-enable.
|
||||
- cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2709,7 +2707,7 @@ config("afdo_optimize_size") {
|
||||
-
|
||||
if (llvm_force_head_revision) {
|
||||
# TODO(crbug.com/373130005): Fix and re-enable.
|
||||
cflags_cc += [ "-Wno-deprecated-literal-operator" ]
|
||||
@@ -2711,7 +2709,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") {
|
||||
|
|
@ -121,7 +122,7 @@
|
|||
cflags = []
|
||||
if (clang_emit_debug_info_for_profiling) {
|
||||
# Add the following flags to generate debug info for profiling.
|
||||
@@ -2736,7 +2734,7 @@ config("afdo") {
|
||||
@@ -2738,7 +2736,7 @@ config("afdo") {
|
||||
cflags += [ "-Wno-backend-plugin" ]
|
||||
inputs = [ _clang_sample_profile ]
|
||||
}
|
||||
|
|
@ -130,7 +131,7 @@
|
|||
cflags = [ "-fauto-profile=${auto_profile_path}" ]
|
||||
inputs = [ auto_profile_path ]
|
||||
}
|
||||
@@ -2913,7 +2911,7 @@ config("symbols") {
|
||||
@@ -2915,7 +2913,7 @@ config("symbols") {
|
||||
cflags += [ "-gomit-unreferenced-methods" ]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/rust.gni.orig 2024-10-27 06:40:35 UTC
|
||||
--- build/config/rust.gni.orig 2024-11-16 12:20:41 UTC
|
||||
+++ build/config/rust.gni
|
||||
@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) {
|
||||
@@ -321,6 +321,10 @@ if (is_linux || is_chromeos) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- build/linux/unbundle/icu.gn.orig 2024-08-26 14:40:28 UTC
|
||||
--- build/linux/unbundle/icu.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ build/linux/unbundle/icu.gn
|
||||
@@ -17,6 +17,15 @@ config("icu_config") {
|
||||
"USING_SYSTEM_ICU=1",
|
||||
|
|
@ -16,3 +16,37 @@
|
|||
# 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
|
||||
@@ -35,6 +44,18 @@ config("icu_config") {
|
||||
# please see: https://crbug.com/822820
|
||||
"U_IMPORT=U_EXPORT",
|
||||
]
|
||||
+
|
||||
+ _icu_version = exec_script(pkg_config_script,
|
||||
+ common_pkg_config_args + pkg_config_args + [
|
||||
+ "icu-i18n",
|
||||
+ "--version-as-components",
|
||||
+ ],
|
||||
+ "value")
|
||||
+
|
||||
+ # Unbreak with icu 76 where private symbols are picked up
|
||||
+ if (_icu_version[0] >= 76) {
|
||||
+ defines += [ "U_HIDE_DRAFT_API" ]
|
||||
+ }
|
||||
}
|
||||
|
||||
pkg_config("system_icui18n") {
|
||||
@@ -46,6 +67,14 @@ pkg_config("system_icuuc") {
|
||||
}
|
||||
|
||||
source_set("icui18n") {
|
||||
+ deps = [ ":icui18n_shim" ]
|
||||
+ public_configs = [
|
||||
+ ":icu_config",
|
||||
+ ":system_icui18n",
|
||||
+ ]
|
||||
+}
|
||||
+
|
||||
+source_set("icui18n_hidden_visibility") {
|
||||
deps = [ ":icui18n_shim" ]
|
||||
public_configs = [
|
||||
":icu_config",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- cc/base/features.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- cc/base/features.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ cc/base/features.cc
|
||||
@@ -78,7 +78,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
|
||||
@@ -85,7 +85,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
|
||||
// be using a separate flag to control the launch on GL.
|
||||
BASE_FEATURE(kUseDMSAAForTiles,
|
||||
"UseDMSAAForTiles",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/app/chrome_main_delegate.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -145,7 +145,7 @@
|
||||
#include "components/about_ui/credit_utils.h"
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
#include "chrome/browser/policy/policy_path_parser.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
@@ -342,7 +342,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
// and resources loaded.
|
||||
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
|
||||
return
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
||||
@@ -428,7 +428,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
@@ -427,7 +427,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
@ -48,16 +48,16 @@
|
|||
// 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) ||
|
||||
@@ -474,7 +474,7 @@ void SetCrashpadUploadConsentPostLogin() {
|
||||
@@ -439,7 +439,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
}
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
|
||||
+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
|
||||
void SIGTERMProfilingShutdown(int signal) {
|
||||
content::Profiling::Stop();
|
||||
struct sigaction sigact;
|
||||
@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton(
|
||||
@@ -521,7 +521,7 @@ std::optional<int> AcquireProcessSingleton(
|
||||
// process can be exited.
|
||||
ChromeProcessSingleton::CreateInstance(user_data_dir);
|
||||
|
||||
|
|
@ -66,7 +66,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.
|
||||
@@ -640,7 +640,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
@@ -605,7 +605,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
|
|
@ -75,7 +75,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.
|
||||
@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(const StartupTimestamps&
|
||||
@@ -698,7 +698,7 @@ void RecordMainStartupMetrics(const StartupTimestamps&
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
// Record the startup process creation time on supported platforms. On Android
|
||||
// this is recorded in ChromeMainDelegateAndroid.
|
||||
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
|
||||
@@ -964,7 +964,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
|
||||
@@ -887,7 +887,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
|
||||
#if BUILDFLAG(IS_OZONE)
|
||||
// Initialize Ozone platform and add required feature flags as per platform's
|
||||
// properties.
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
|
||||
#endif
|
||||
ui::OzonePlatform::PreEarlyInitialization();
|
||||
@@ -1168,7 +1168,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
|
||||
@@ -1091,7 +1091,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) || \
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
is_canary_dev;
|
||||
#else
|
||||
false;
|
||||
@@ -1318,7 +1318,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
@@ -1241,7 +1241,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
// This will directly exit if the user asked for help.
|
||||
HandleHelpSwitches(command_line);
|
||||
#endif
|
||||
@@ -1348,7 +1348,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
@@ -1271,7 +1271,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
chromeos::dbus_paths::RegisterPathProvider();
|
||||
#endif
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
nacl::RegisterPathProvider();
|
||||
#endif
|
||||
|
||||
@@ -1725,7 +1725,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1634,7 +1634,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess &&
|
||||
!command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
|
||||
@@ -1821,13 +1821,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
|
||||
@@ -1723,13 +1723,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
|
||||
#else
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/BUILD.gn.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -6869,6 +6869,13 @@ static_library("browser") {
|
||||
@@ -6948,6 +6948,13 @@ static_library("browser") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/about_flags.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/about_flags.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/about_flags.cc
|
||||
@@ -245,7 +245,7 @@
|
||||
@@ -247,7 +247,7 @@
|
||||
#include "ui/ui_features.h"
|
||||
#include "url/url_features.h"
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "base/allocator/buildflags.h"
|
||||
#endif
|
||||
|
||||
@@ -338,7 +338,7 @@
|
||||
@@ -342,7 +342,7 @@
|
||||
#include "device/vr/public/cpp/features.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
#include "ui/ozone/public/ozone_switches.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@@ -347,7 +347,7 @@
|
||||
@@ -351,7 +351,7 @@
|
||||
#include "chrome/browser/win/mica_titlebar.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -357,7 +357,7 @@
|
||||
@@ -361,7 +361,7 @@
|
||||
#include "components/user_education/common/user_education_features.h" // nogncheck
|
||||
#endif
|
||||
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
#include "chrome/browser/ui/ui_features.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#endif
|
||||
@@ -499,7 +499,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
|
||||
@@ -507,7 +507,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
|
||||
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
|
||||
#endif
|
||||
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
|
||||
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
|
||||
{flag_descriptions::kOzonePlatformHintChoiceAuto,
|
||||
@@ -776,6 +776,26 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -784,6 +784,26 @@ const FeatureEntry::FeatureVariation
|
||||
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
|
||||
nullptr}};
|
||||
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
|
||||
{"UIClipboardMaximumAge", "60"}};
|
||||
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
|
||||
@@ -1189,7 +1209,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
|
||||
@@ -1225,7 +1245,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
|
||||
};
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
|
||||
{"AtKeywordAcceleration", "true"},
|
||||
};
|
||||
@@ -1233,7 +1253,7 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -1269,7 +1289,7 @@ const FeatureEntry::FeatureVariation
|
||||
};
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -90,7 +90,16 @@
|
|||
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
|
||||
{"ShortcutBoostSearchScore", "0"},
|
||||
{"ShortcutBoostNonTopHitThreshold", "0"},
|
||||
@@ -3679,7 +3699,7 @@ const flags_ui::FeatureEntry::FeatureVariation
|
||||
@@ -1887,7 +1907,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = {
|
||||
{"stale_threshold_duration", "10s"},
|
||||
{"declutter_timer_interval", "10s"},
|
||||
@@ -3636,7 +3656,7 @@ const flags_ui::FeatureEntry::FeatureVariation
|
||||
};
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
|
|
@ -99,7 +108,16 @@
|
|||
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
|
||||
{{"link_capturing_state", "on_by_default"}};
|
||||
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
|
||||
@@ -4929,7 +4949,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4160,7 +4180,7 @@ const FeatureEntry::FeatureVariation
|
||||
std::size(kSecurePaymentConfirmationNetworkAndIssuerIcons_Rows),
|
||||
nullptr}};
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
|
||||
{"TranslationAPIAcceptLanguagesCheck", "false"},
|
||||
{"TranslationAPILimitLanguagePackCount", "false"}};
|
||||
@@ -4914,7 +4934,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
},
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
|
|
@ -108,16 +126,16 @@
|
|||
{
|
||||
"fluent-overlay-scrollbars",
|
||||
flag_descriptions::kFluentOverlayScrollbarsName,
|
||||
@@ -5341,7 +5361,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
|
||||
@@ -5323,7 +5343,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDesktopPWAsSyncChangesDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kWebAppDontAddExistingAppsToSync)},
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
|
||||
flag_descriptions::kShortcutsNotAppsDescription,
|
||||
kOsMac | kOsWin | kOsLinux,
|
||||
@@ -5496,7 +5516,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5478,7 +5498,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kWebShare)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
|
||||
|
|
@ -126,10 +144,10 @@
|
|||
{"pulseaudio-loopback-for-cast",
|
||||
flag_descriptions::kPulseaudioLoopbackForCastName,
|
||||
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
|
||||
@@ -5523,9 +5543,18 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"wayland-text-input-v3", flag_descriptions::kWaylandTextInputV3Name,
|
||||
flag_descriptions::kWaylandTextInputV3Description, kOsLinux,
|
||||
FEATURE_VALUE_TYPE(features::kWaylandTextInputV3)},
|
||||
@@ -5509,9 +5529,18 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"wayland-ui-scaling", flag_descriptions::kWaylandUiScalingName,
|
||||
flag_descriptions::kWaylandUiScalingDescription, kOsLinux,
|
||||
FEATURE_VALUE_TYPE(features::kWaylandUiScale)},
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ {"audio-backend",
|
||||
+ flag_descriptions::kAudioBackendName,
|
||||
|
|
@ -146,7 +164,7 @@
|
|||
{"skip-undecryptable-passwords",
|
||||
flag_descriptions::kSkipUndecryptablePasswordsName,
|
||||
flag_descriptions::kSkipUndecryptablePasswordsDescription,
|
||||
@@ -6474,7 +6503,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6423,7 +6452,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
"MlUrlScoring")},
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -155,7 +173,7 @@
|
|||
{"omnibox-domain-suggestions",
|
||||
flag_descriptions::kOmniboxDomainSuggestionsName,
|
||||
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
|
||||
@@ -6761,7 +6790,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6629,7 +6658,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
"OrganicRepeatableQueries")},
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -164,7 +182,7 @@
|
|||
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
|
||||
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
|
||||
FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
|
||||
@@ -7350,7 +7379,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7244,7 +7273,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
|
|
@ -173,7 +191,7 @@
|
|||
{"cups-ipp-printing-backend",
|
||||
flag_descriptions::kCupsIppPrintingBackendName,
|
||||
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
|
||||
@@ -8335,7 +8364,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8248,7 +8277,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kCooperativeSchedulingDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kCooperativeScheduling)},
|
||||
|
||||
|
|
@ -182,17 +200,17 @@
|
|||
{"enable-network-service-sandbox",
|
||||
flag_descriptions::kEnableNetworkServiceSandboxName,
|
||||
flag_descriptions::kEnableNetworkServiceSandboxDescription,
|
||||
@@ -8359,7 +8388,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
|
||||
#endif
|
||||
@@ -8264,7 +8293,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(media::kUseOutOfProcessVideoDecoding)},
|
||||
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
|
||||
|
||||
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
{"enable-family-link-extensions-permissions",
|
||||
flag_descriptions::
|
||||
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
|
||||
@@ -9193,7 +9222,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
|
||||
@@ -9078,7 +9107,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -200,7 +218,7 @@
|
|||
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
|
||||
flag_descriptions::kGetAllScreensMediaDescription,
|
||||
kOsCrOS | kOsLacros | kOsLinux,
|
||||
@@ -9226,7 +9255,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9111,7 +9140,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
|
@ -209,7 +227,7 @@
|
|||
{
|
||||
"ui-debug-tools",
|
||||
flag_descriptions::kUIDebugToolsName,
|
||||
@@ -9754,7 +9783,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9612,7 +9641,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -218,7 +236,7 @@
|
|||
{"media-session-enter-picture-in-picture",
|
||||
flag_descriptions::kMediaSessionEnterPictureInPictureName,
|
||||
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
|
||||
@@ -10601,7 +10630,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10399,7 +10428,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsDesktop | kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
|
||||
|
||||
|
|
@ -227,7 +245,7 @@
|
|||
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
|
||||
flag_descriptions::kCameraMicEffectsDescription,
|
||||
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
|
||||
@@ -10639,7 +10668,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10430,7 +10459,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -236,7 +254,7 @@
|
|||
{"site-search-settings-policy",
|
||||
flag_descriptions::kSiteSearchSettingsPolicyName,
|
||||
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
|
||||
@@ -10768,7 +10797,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10555,7 +10584,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
|
||||
|
||||
|
|
@ -245,7 +263,7 @@
|
|||
{"third-party-profile-management",
|
||||
flag_descriptions::kThirdPartyProfileManagementName,
|
||||
flag_descriptions::kThirdPartyProfileManagementDescription,
|
||||
@@ -10810,7 +10839,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10597,7 +10626,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
|
|
@ -254,7 +272,7 @@
|
|||
{"enable-user-navigation-capturing-pwa",
|
||||
flag_descriptions::kPwaNavigationCapturingName,
|
||||
flag_descriptions::kPwaNavigationCapturingDescription,
|
||||
@@ -11735,7 +11764,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11485,7 +11514,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kAuthenticateUsingUserConsentVerifierInteropApi)},
|
||||
#endif
|
||||
|
||||
|
|
@ -263,7 +281,7 @@
|
|||
{"sync-enable-bookmarks-in-transport-mode",
|
||||
flag_descriptions::kSyncEnableBookmarksInTransportModeName,
|
||||
flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
|
||||
@@ -11825,7 +11854,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11584,7 +11613,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -272,7 +290,7 @@
|
|||
{"classify-url-on-process-response-event",
|
||||
flag_descriptions::kClassifyUrlOnProcessResponseEventName,
|
||||
flag_descriptions::kClassifyUrlOnProcessResponseEventDescription,
|
||||
@@ -11834,7 +11863,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11593,7 +11622,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -281,7 +299,7 @@
|
|||
{"tab-organization", flag_descriptions::kTabOrganizationName,
|
||||
flag_descriptions::kTabOrganizationDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kTabOrganization)},
|
||||
@@ -11873,7 +11902,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11638,7 +11667,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kLanguageDetectionAPIDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)},
|
||||
|
||||
|
|
@ -290,3 +308,21 @@
|
|||
{"supervised-profile-hide-guest",
|
||||
flag_descriptions::kSupervisedProfileHideGuestName,
|
||||
flag_descriptions::kSupervisedProfileHideGuestDescription,
|
||||
@@ -11891,7 +11920,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
segmentation_platform::features::kSegmentationSurveyPage)},
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
{"autofill-enable-buy-now-pay-later-for-affirm",
|
||||
flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName,
|
||||
flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription,
|
||||
@@ -12026,7 +12055,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(
|
||||
autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
{"translation-api", flag_descriptions::kTranslationAPIName,
|
||||
flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
|
||||
FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kEnableTranslationAPI,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/browser_features.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/browser_features.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/browser_features.cc
|
||||
@@ -71,7 +71,7 @@ BASE_FEATURE(kClosedTabCache,
|
||||
"ClosedTabCache",
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -347,7 +347,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
|
||||
@@ -268,7 +268,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
|
||||
"SandboxExternalProtocolBlockedWarning",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
|
|
@ -27,12 +27,3 @@
|
|||
// If true, encrypt new data with the key provided by SecretPortalKeyProvider.
|
||||
// Otherwise, it will only decrypt existing data.
|
||||
BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption,
|
||||
@@ -360,7 +360,7 @@ BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption,
|
||||
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
|
||||
"SupportSearchSuggestionForPrerender2",
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
|
||||
- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/browser_features.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/browser_features.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/browser_features.h
|
||||
@@ -29,7 +29,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore
|
||||
@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore
|
||||
BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
|
||||
BASE_DECLARE_FEATURE(kClosedTabCache);
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
BASE_DECLARE_FEATURE(kDbusSecretPortal);
|
||||
#endif
|
||||
|
||||
@@ -143,7 +143,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
|
||||
@@ -117,7 +117,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
|
||||
BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
|
||||
BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/browser_process_impl.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/browser_process_impl.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -238,7 +238,7 @@
|
||||
@@ -239,7 +239,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
|
||||
|
||||
@@ -257,7 +257,7 @@
|
||||
@@ -258,7 +258,7 @@
|
||||
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
#include "chrome/browser/browser_features.h"
|
||||
#include "components/os_crypt/async/browser/secret_portal_key_provider.h"
|
||||
#endif
|
||||
@@ -1135,7 +1135,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
|
||||
@@ -1136,7 +1136,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
|
||||
GoogleUpdateSettings::GetCollectStatsConsent());
|
||||
registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
|
||||
#endif
|
||||
}
|
||||
@@ -1310,7 +1310,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
@@ -1311,7 +1311,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
|
||||
ApplyMetricsReportingPolicy();
|
||||
|
||||
|
|
@ -36,8 +36,8 @@
|
|||
ChromeJsErrorReportProcessor::Create();
|
||||
#endif
|
||||
|
||||
@@ -1404,7 +1404,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
}
|
||||
@@ -1398,7 +1398,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
features::kUseAppBoundEncryptionProviderForEncryption))));
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) {
|
||||
providers.emplace_back(
|
||||
/*precedence=*/10u,
|
||||
@@ -1635,7 +1635,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
@@ -1628,7 +1628,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_field_trials.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- chrome/browser/chrome_browser_field_trials.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_browser_field_trials.cc
|
||||
@@ -48,7 +48,7 @@
|
||||
@@ -49,7 +49,7 @@
|
||||
#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "base/nix/xdg_util.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
@@ -155,7 +155,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials
|
||||
@@ -135,7 +135,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_browser_field_trials.h.orig 2024-08-26 14:40:28 UTC
|
||||
--- chrome/browser/chrome_browser_field_trials.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_browser_field_trials.h
|
||||
@@ -34,7 +34,7 @@ class ChromeBrowserFieldTrials : public variations::Pl
|
||||
@@ -33,7 +33,7 @@ class ChromeBrowserFieldTrials : public variations::Pl
|
||||
const variations::EntropyProviders& entropy_providers,
|
||||
base::FeatureList* feature_list) override;
|
||||
void RegisterSyntheticTrials() override;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_browser_interface_binders.cc
|
||||
@@ -128,12 +128,12 @@
|
||||
@@ -129,12 +129,12 @@
|
||||
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -13,17 +13,17 @@
|
|||
-#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/app_settings/web_app_settings_ui.h"
|
||||
#include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
|
||||
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
|
||||
#endif
|
||||
@@ -221,7 +221,7 @@
|
||||
@@ -224,7 +224,7 @@
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/companion/visual_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"
|
||||
#include "chrome/browser/ui/webui/discards/discards_ui.h"
|
||||
@@ -232,7 +232,7 @@
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -1049,7 +1049,7 @@ void PopulateChromeFrameBinders(
|
||||
@@ -1055,7 +1055,7 @@ void PopulateChromeFrameBinders(
|
||||
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
|
||||
!render_frame_host->GetParentOrOuterDocument()) {
|
||||
// The service binder will reject non-primary main frames, but we still need
|
||||
@@ -1130,7 +1130,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1136,7 +1136,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
DataSharingInternalsUI>(map);
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
RegisterWebUIControllerInterfaceBinder<
|
||||
connectors_internals::mojom::PageHandler,
|
||||
enterprise_connectors::ConnectorsInternalsUI>(map);
|
||||
@@ -1141,7 +1141,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1147,7 +1147,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
policy::DlpInternalsUI>(map);
|
||||
#endif
|
||||
|
||||
|
|
@ -59,8 +59,8 @@
|
|||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
|
||||
#endif
|
||||
@@ -1227,14 +1227,14 @@ void PopulateChromeWebUIFrameBinders(
|
||||
|
||||
@@ -1246,14 +1246,14 @@ void PopulateChromeWebUIFrameBinders(
|
||||
page_image_service::mojom::PageImageServiceHandler, HistoryUI,
|
||||
HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
|
||||
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
WhatsNewUI,
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
NewTabPageUI>(map);
|
||||
@@ -1730,7 +1730,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1762,7 +1762,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-10-27 06:40:35 UTC
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -249,15 +249,15 @@
|
||||
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
|
||||
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
|
||||
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
|
||||
@@ -369,14 +369,14 @@
|
||||
@@ -365,14 +365,14 @@
|
||||
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
|
||||
FILE_PATH_LITERAL("Media History");
|
||||
|
||||
@@ -541,7 +541,7 @@ void ProcessSingletonNotificationCallbackImpl(
|
||||
@@ -537,7 +537,7 @@ void ProcessSingletonNotificationCallbackImpl(
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -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.
|
||||
@@ -1119,7 +1119,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1115,7 +1115,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 .
|
||||
@@ -1167,7 +1167,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1163,7 +1163,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(
|
||||
@@ -1363,7 +1363,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
@@ -1359,7 +1359,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(
|
||||
@@ -1412,7 +1412,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
@@ -1408,7 +1408,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
if (headless::IsHeadlessMode()) {
|
||||
headless::ReportHeadlessActionMetrics();
|
||||
}
|
||||
@@ -1524,7 +1524,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
@@ -1517,7 +1517,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();
|
||||
}
|
||||
@@ -2068,7 +2068,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
|
||||
@@ -2069,7 +2069,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
|
||||
|
||||
// Drop the request if headless mode is in effect or the request is from
|
||||
// a headless Chrome process.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_browser_main_linux.cc
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#endif
|
||||
|
||||
@@ -84,7 +84,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
|
||||
@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
#if !BUILDFLAG(IS_CHROMEOS)
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
// Set up crypt config. This needs to be done before anything starts the
|
||||
// network service, as the raw encryption key needs to be shared with the
|
||||
@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
|
||||
@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
|
||||
ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
|
||||
}
|
||||
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
|
||||
ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
|
||||
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
|
||||
@@ -170,7 +172,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -136,7 +138,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
|
||||
#endif // (defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS))
|
||||
|
||||
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -490,7 +490,7 @@
|
||||
@@ -497,7 +497,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)
|
||||
@@ -607,12 +607,12 @@
|
||||
@@ -614,12 +614,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
|
||||
@@ -623,7 +623,7 @@
|
||||
@@ -630,7 +630,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"
|
||||
@@ -631,7 +631,7 @@
|
||||
@@ -639,7 +639,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -646,7 +646,7 @@
|
||||
@@ -654,7 +654,7 @@
|
||||
#include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -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"
|
||||
@@ -1606,7 +1606,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
|
||||
@@ -1575,7 +1575,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)
|
||||
@@ -1806,7 +1806,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1777,7 +1777,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)
|
||||
@@ -1840,7 +1840,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1811,7 +1811,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
|
||||
@@ -1861,7 +1861,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1832,7 +1832,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>());
|
||||
@@ -1880,7 +1880,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1851,7 +1851,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
|
||||
chrome::AddMetricsExtraParts(main_parts.get());
|
||||
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
main_parts->AddParts(
|
||||
std::make_unique<
|
||||
enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
|
||||
@@ -2752,7 +2752,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
|
||||
@@ -2724,7 +2724,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
|
||||
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
|
||||
base::CommandLine* command_line,
|
||||
int child_process_id) {
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
#if BUILDFLAG(IS_MAC)
|
||||
std::unique_ptr<metrics::ClientInfo> client_info =
|
||||
GoogleUpdateSettings::LoadMetricsClientInfo();
|
||||
@@ -3102,7 +3104,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
// Opt into a hardened stack canary mitigation if it hasn't already been
|
||||
// force-disabled.
|
||||
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
|
||||
@@ -4926,7 +4928,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
@@ -4931,7 +4933,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -124,7 +124,25 @@
|
|||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -5511,7 +5513,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5052,7 +5054,7 @@ std::wstring ChromeContentBrowserClient::GetAppContain
|
||||
case sandbox::mojom::Sandbox::kPrintCompositor:
|
||||
case sandbox::mojom::Sandbox::kAudio:
|
||||
case sandbox::mojom::Sandbox::kScreenAI:
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
case sandbox::mojom::Sandbox::kVideoEffects:
|
||||
#endif
|
||||
case sandbox::mojom::Sandbox::kSpeechRecognition:
|
||||
@@ -5157,7 +5159,7 @@ bool ChromeContentBrowserClient::PreSpawnChild(
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
case sandbox::mojom::Sandbox::kScreenAI:
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
case sandbox::mojom::Sandbox::kVideoEffects:
|
||||
#endif
|
||||
case sandbox::mojom::Sandbox::kAudio:
|
||||
@@ -5512,7 +5514,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
&throttles);
|
||||
}
|
||||
|
||||
|
|
@ -133,7 +151,7 @@
|
|||
MaybeAddThrottle(
|
||||
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -5525,7 +5527,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5529,7 +5531,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
|
|
@ -142,7 +160,7 @@
|
|||
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -5556,7 +5558,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5560,7 +5562,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -151,7 +169,7 @@
|
|||
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -7463,7 +7465,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
|
||||
@@ -7472,7 +7474,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-10-01 07:26:23 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.h
|
||||
@@ -525,7 +525,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
@@ -531,7 +531,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
bool IsPluginAllowedToUseDevChannelAPIs(
|
||||
content::BrowserContext* browser_context,
|
||||
const GURL& url) override;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
--- chrome/browser/component_updater/registration.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/component_updater/registration.cc
|
||||
@@ -80,7 +80,7 @@
|
||||
#include "media/base/media_switches.h"
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
-#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/component_updater/translate_kit_component_installer.h"
|
||||
#include "chrome/browser/component_updater/translate_kit_language_pack_component_installer.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
@@ -227,7 +227,7 @@ void RegisterComponentsForUpdate() {
|
||||
|
||||
RegisterPlusAddressBlocklistComponent(cus);
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// TODO(crbug.com/364795294): Support other platforms.
|
||||
RegisterTranslateKitComponent(cus, g_browser_process->local_state(),
|
||||
/*force_install=*/false,
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -1767,7 +1767,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -1782,7 +1782,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();
|
||||
}
|
||||
@@ -1884,7 +1884,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
|
||||
@@ -1896,7 +1896,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) || \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/download/download_item_model.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/download/download_item_model.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/download/download_item_model.cc
|
||||
@@ -787,7 +787,7 @@ bool DownloadItemModel::IsCommandChecked(
|
||||
@@ -757,7 +757,7 @@ bool DownloadItemModel::IsCommandChecked(
|
||||
download_crx_util::IsExtensionDownload(*download_);
|
||||
case DownloadCommands::ALWAYS_OPEN_TYPE:
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
if (download_commands->CanOpenPdfInSystemViewer()) {
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
|
||||
return prefs->ShouldOpenPdfInSystemReader();
|
||||
@@ -835,7 +835,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
|
||||
@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
|
||||
DownloadCommands::ALWAYS_OPEN_TYPE);
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
if (download_commands->CanOpenPdfInSystemViewer()) {
|
||||
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
|
||||
SetShouldPreferOpeningInBrowser(is_checked);
|
||||
@@ -1174,7 +1174,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
|
||||
@@ -1142,7 +1142,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/enterprise/connectors/connectors_service.cc
|
||||
@@ -512,7 +512,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
|
||||
@@ -494,7 +494,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
|
||||
|
||||
Profile* profile = Profile::FromBrowserContext(context_);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-10-01 07:26:23 UTC
|
||||
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
||||
@@ -59,7 +59,7 @@
|
||||
@@ -58,7 +58,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -9,8 +9,8 @@
|
|||
#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"
|
||||
@@ -144,7 +144,7 @@ void UploadSecurityEventReport(base::Value::Dict event
|
||||
std::move(report), std::move(upload_callback));
|
||||
@@ -143,7 +143,7 @@ void UploadSecurityEventReport(base::Value::Dict event
|
||||
std::move(upload_callback));
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
void PopulateSignals(base::Value::Dict event,
|
||||
policy::CloudPolicyClient* client,
|
||||
std::string name,
|
||||
@@ -421,7 +421,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
|
||||
@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
|
||||
/*include_profile_user_name=*/false);
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
void AddCrowdstrikeSignalsToEvent(
|
||||
base::Value::Dict& event,
|
||||
@@ -480,7 +480,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
|
||||
@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
|
||||
if (include_profile_user_name) {
|
||||
event.Set(kKeyProfileUserName, GetProfileUserName());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/BUILD.gn.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/BUILD.gn.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/BUILD.gn
|
||||
@@ -1494,6 +1494,10 @@ source_set("extensions") {
|
||||
@@ -1434,6 +1434,10 @@ source_set("extensions") {
|
||||
deps += [ "//chrome/services/printing/public/mojom" ]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "pdf/buildflags.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
|
||||
#endif
|
||||
|
||||
@@ -116,7 +116,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
|
||||
@@ -107,7 +107,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
|
||||
extensions::SettingsPrivateEventRouterFactory::GetInstance();
|
||||
extensions::SettingsOverridesAPI::GetFactoryInstance();
|
||||
extensions::SidePanelService::GetFactoryInstance();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "components/reporting/util/statusor.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -9,8 +9,17 @@
|
|||
#include <optional>
|
||||
|
||||
#include "base/strings/string_util.h"
|
||||
@@ -115,7 +115,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
|
||||
return info;
|
||||
@@ -117,7 +117,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
|
||||
}
|
||||
|
||||
bool AllowClientCertificateReportingForUsers() {
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
return base::FeatureList::IsEnabled(
|
||||
enterprise_signals::features::kAllowClientCertificateReportingForUsers);
|
||||
#else
|
||||
@@ -130,7 +130,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin
|
||||
return pref && pref->IsManaged();
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -18,7 +27,7 @@
|
|||
|
||||
device_signals::SignalsAggregationRequest CreateAggregationRequest(
|
||||
device_signals::SignalName signal_name) {
|
||||
@@ -177,7 +177,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
|
||||
@@ -192,7 +192,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
|
||||
|
||||
// getPersistentSecret
|
||||
|
||||
|
|
@ -27,7 +36,7 @@
|
|||
|
||||
EnterpriseReportingPrivateGetPersistentSecretFunction::
|
||||
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
|
||||
@@ -603,7 +603,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
|
||||
@@ -630,7 +630,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
--- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/messaging/launch_context_posix.cc
|
||||
@@ -86,7 +86,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte
|
||||
@@ -84,7 +84,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
options.current_directory = command_line.GetProgram().DirName();
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// Don't use no_new_privs mode, e.g. in case the host needs to use sudo.
|
||||
options.allow_new_privs = true;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
|
||||
@@ -636,7 +636,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
|
||||
@@ -652,7 +652,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
|
||||
}
|
||||
|
||||
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -186,7 +186,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
(*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
@@ -209,7 +209,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
|
||||
settings_api::PrefType::kBoolean;
|
||||
#endif
|
||||
@@ -221,7 +221,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -216,7 +216,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
|
||||
(*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
|
||||
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
|
||||
@@ -862,7 +862,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
|
||||
// minimized.
|
||||
@@ -872,7 +872,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
|
||||
// created as minimized.
|
||||
// TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
|
||||
// TODO(crbug.com/40254339): Find a fix for wayland as well.
|
||||
-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
|
||||
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
|
||||
if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) {
|
||||
if (new_window->initial_show_state() ==
|
||||
ui::mojom::WindowShowState::kMinimized) {
|
||||
new_window->window()->Minimize();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-02-03 15:42:55 UTC
|
||||
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "extensions/browser/process_manager.h"
|
||||
#include "extensions/common/error_utils.h"
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "extensions/common/permissions/permissions_data.h"
|
||||
#endif
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace {
|
||||
@@ -37,7 +37,7 @@ namespace {
|
||||
bool CanEnableAudioDebugRecordingsFromExtension(
|
||||
const extensions::Extension* extension) {
|
||||
bool enabled_by_permissions = false;
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
if (extension) {
|
||||
enabled_by_permissions =
|
||||
extension->permissions_data()->active_permissions().HasAPIPermission(
|
||||
@@ -576,7 +576,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
|
||||
@@ -575,7 +575,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
|
||||
|
||||
ExtensionFunction::ResponseAction
|
||||
WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-10-01 07:26:23 UTC
|
||||
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -903,7 +903,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
|
||||
@@ -902,7 +902,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
RequestExtensionApproval(contents);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/extensions/external_provider_impl.cc
|
||||
@@ -816,7 +816,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
|
||||
service,
|
||||
base::MakeRefCounted<ExternalPrefLoader>(
|
||||
@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
@@ -820,7 +820,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-10-27 06:40:35 UTC
|
||||
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
@@ -323,7 +323,7 @@ const struct {
|
||||
@@ -335,7 +335,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-10-27 06:40:35 UTC
|
||||
--- chrome/browser/flag_descriptions.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/flag_descriptions.cc
|
||||
@@ -458,7 +458,7 @@ const char kIsolatedSandboxedIframesDescription[] =
|
||||
@@ -475,7 +475,7 @@ const char kIsolatedSandboxedIframesDescription[] =
|
||||
"grouping when enabled is per-site.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -9,7 +9,16 @@
|
|||
const char kAutofillEnableAmountExtractionDesktopName[] =
|
||||
"Enable checkout amount extraction on Chrome desktop";
|
||||
const char kAutofillEnableAmountExtractionDesktopDescription[] =
|
||||
@@ -939,7 +939,7 @@ const char kDevicePostureDescription[] =
|
||||
@@ -490,7 +490,7 @@ const char kAutofillEnableAndroidNKeyForFidoAuthentica
|
||||
"authentication when autofilling server credit cards.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
const char kAutofillEnableBuyNowPayLaterForAffirmName[] =
|
||||
"Enable buy now pay later on Autofill for Affirm";
|
||||
const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] =
|
||||
@@ -997,7 +997,7 @@ const char kDevicePostureDescription[] =
|
||||
"Enables Device Posture API (foldable devices)";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -18,7 +27,7 @@
|
|||
const char kDocumentPictureInPictureAnimateResizeName[] =
|
||||
"Document Picture-in-Picture Animate Resize";
|
||||
const char kDocumentPictureInPictureAnimateResizeDescription[] =
|
||||
@@ -3523,7 +3523,7 @@ const char kShowAutofillTypePredictionsDescription[] =
|
||||
@@ -3519,7 +3519,7 @@ const char kShowAutofillTypePredictionsDescription[] =
|
||||
"text.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -27,7 +36,7 @@
|
|||
const char kShowFeaturedEnterpriseSiteSearchName[] =
|
||||
"Show featured Enterprise site search engines in Omnibox";
|
||||
const char kShowFeaturedEnterpriseSiteSearchDescription[] =
|
||||
@@ -3555,7 +3555,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
|
||||
@@ -3551,7 +3551,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
|
||||
"but in the same SiteInstanceGroup, and thus the same process.";
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -36,7 +45,16 @@
|
|||
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
|
||||
const char kSiteSearchSettingsPolicyDescription[] =
|
||||
"Allow site search engines to be defined by the SiteSearchSettings policy.";
|
||||
@@ -7916,7 +7916,7 @@ const char kBlinkExtensionDiagnosticsDescription[] =
|
||||
@@ -3767,7 +3767,7 @@ const char kTranslateForceTriggerOnEnglishDescription[
|
||||
"Force the Translate Triggering on English pages experiment to be enabled "
|
||||
"with the selected language model active.";
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
const char kTranslationAPIName[] = "Experimental translation API";
|
||||
const char kTranslationAPIDescription[] =
|
||||
"Eables the on-device language translation API. "
|
||||
@@ -7828,7 +7828,7 @@ const char kBlinkExtensionDiagnosticsDescription[] =
|
||||
"Enable the experimental Diagnostics Blink Extension.";
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
|
|
@ -45,7 +63,7 @@
|
|||
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
|
||||
const char kGetAllScreensMediaDescription[] =
|
||||
"When enabled, the getAllScreensMedia API for capturing multiple screens "
|
||||
@@ -8152,7 +8152,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
|
||||
@@ -8062,7 +8062,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b
|
||||
|
||||
// Linux -----------------------------------------------------------------------
|
||||
|
||||
|
|
@ -54,10 +72,10 @@
|
|||
const char kOzonePlatformHintChoiceDefault[] = "Default";
|
||||
const char kOzonePlatformHintChoiceAuto[] = "Auto";
|
||||
const char kOzonePlatformHintChoiceX11[] = "X11";
|
||||
@@ -8185,6 +8185,18 @@ const char kWaylandPerWindowScalingDescription[] =
|
||||
const char kWaylandTextInputV3Name[] = "Wayland text-input-v3";
|
||||
const char kWaylandTextInputV3Description[] =
|
||||
"Enable Wayland's text-input-v3 experimental support.";
|
||||
@@ -8102,6 +8102,18 @@ const char kWaylandUiScalingDescription[] =
|
||||
"Enable experimental support for text scaling in the Wayland backend "
|
||||
"backed by full UI scaling. Requires #wayland-per-window-scaling to be "
|
||||
"enabled too.";
|
||||
+
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+const char kAudioBackendName[] =
|
||||
|
|
@ -72,8 +90,8 @@
|
|||
+#endif
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
// All views-based platforms --------------------------------------------------
|
||||
@@ -8211,7 +8223,7 @@ const char kZeroCopyVideoCaptureDescription[] =
|
||||
// Random platform combinations -----------------------------------------------
|
||||
@@ -8114,7 +8126,7 @@ const char kZeroCopyVideoCaptureDescription[] =
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -82,7 +100,7 @@
|
|||
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
|
||||
const char kFollowingFeedSidepanelDescription[] =
|
||||
"Enables the following feed in the sidepanel.";
|
||||
@@ -8224,7 +8236,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
|
||||
@@ -8131,7 +8143,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
|
||||
"Enables a refreshed design for the Task Manager on Desktop platforms.";
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
|
@ -91,7 +109,7 @@
|
|||
const char kEnableNetworkServiceSandboxName[] =
|
||||
"Enable the network service sandbox.";
|
||||
const char kEnableNetworkServiceSandboxDescription[] =
|
||||
@@ -8256,7 +8268,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
@@ -8163,7 +8175,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
"Bluetooth";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
|
|
@ -100,7 +118,7 @@
|
|||
const char kSkipUndecryptablePasswordsName[] =
|
||||
"Skip undecryptable passwords to use the available decryptable "
|
||||
"passwords.";
|
||||
@@ -8402,7 +8414,7 @@ const char kElementCaptureDescription[] =
|
||||
@@ -8318,7 +8330,7 @@ const char kElementCaptureDescription[] =
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
|
@ -109,8 +127,8 @@
|
|||
const char kUIDebugToolsName[] = "Debugging tools for UI";
|
||||
const char kUIDebugToolsDescription[] =
|
||||
"Enables additional keyboard shortcuts to help debugging.";
|
||||
@@ -8476,7 +8488,7 @@ const char kAutofillCaretExtractionDescription[] =
|
||||
"Enables passing caret position via Autofill";
|
||||
@@ -8390,7 +8402,7 @@ const char kComposeUpfrontInputModesDescription[] =
|
||||
"Enables upfront input modes in the Compose dialog";
|
||||
#endif // BUILDFLAG(ENABLE_COMPOSE)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
|
@ -118,9 +136,9 @@
|
|||
const char kThirdPartyProfileManagementName[] =
|
||||
"Third party profile management";
|
||||
const char kThirdPartyProfileManagementDescription[] =
|
||||
@@ -8565,7 +8577,7 @@ const char kEnableCertManagementV2UIDescription[] =
|
||||
"chrome://settings/certificates";
|
||||
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
|
||||
@@ -8493,7 +8505,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] =
|
||||
"Enable the os settings for overlay scrollbars on ChromeOS.";
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/flag_descriptions.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/flag_descriptions.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/flag_descriptions.h
|
||||
@@ -297,7 +297,7 @@ extern const char kImprovedSigninUIOnDesktopName[];
|
||||
@@ -293,7 +293,7 @@ extern const char kImprovedSigninUIOnDesktopName[];
|
||||
extern const char kImprovedSigninUIOnDesktopDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -9,7 +9,16 @@
|
|||
extern const char kAutofillEnableAmountExtractionDesktopName[];
|
||||
extern const char kAutofillEnableAmountExtractionDesktopDescription[];
|
||||
#endif
|
||||
@@ -715,7 +715,7 @@ extern const char kDevicePostureName[];
|
||||
@@ -302,7 +302,7 @@ extern const char kAutofillEnableAndroidNKeyForFidoAut
|
||||
extern const char kAutofillEnableAndroidNKeyForFidoAuthenticationDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
extern const char kAutofillEnableBuyNowPayLaterForAffirmName[];
|
||||
extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[];
|
||||
|
||||
@@ -737,7 +737,7 @@ extern const char kDevicePostureName[];
|
||||
extern const char kDevicePostureDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -18,7 +27,7 @@
|
|||
extern const char kDocumentPictureInPictureAnimateResizeName[];
|
||||
extern const char kDocumentPictureInPictureAnimateResizeDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
|
||||
@@ -2025,7 +2025,7 @@ extern const char kShowAutofillTypePredictionsName[];
|
||||
@@ -2001,7 +2001,7 @@ extern const char kShowAutofillTypePredictionsName[];
|
||||
extern const char kShowAutofillTypePredictionsDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -27,7 +36,7 @@
|
|||
extern const char kShowFeaturedEnterpriseSiteSearchName[];
|
||||
extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
|
||||
|
||||
@@ -2047,7 +2047,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
|
||||
@@ -2023,7 +2023,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
|
||||
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -36,7 +45,16 @@
|
|||
extern const char kSiteSearchSettingsPolicyName[];
|
||||
extern const char kSiteSearchSettingsPolicyDescription[];
|
||||
|
||||
@@ -4579,7 +4579,7 @@ extern const char kBlinkExtensionDiagnosticsName[];
|
||||
@@ -2185,7 +2185,7 @@ extern const char kTouchTextEditingRedesignDescription
|
||||
extern const char kTranslateForceTriggerOnEnglishName[];
|
||||
extern const char kTranslateForceTriggerOnEnglishDescription[];
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
extern const char kTranslationAPIName[];
|
||||
extern const char kTranslationAPIDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
@@ -4517,7 +4517,7 @@ extern const char kBlinkExtensionDiagnosticsName[];
|
||||
extern const char kBlinkExtensionDiagnosticsDescription[];
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
|
|
@ -45,7 +63,7 @@
|
|||
extern const char kGetAllScreensMediaName[];
|
||||
extern const char kGetAllScreensMediaDescription[];
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
@@ -4716,7 +4716,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
|
||||
@@ -4655,7 +4655,7 @@ extern const char kEnableArmHwdrmDescription[];
|
||||
|
||||
// Linux ---------------------------------------------------------------------
|
||||
|
||||
|
|
@ -54,17 +72,17 @@
|
|||
extern const char kOzonePlatformHintChoiceDefault[];
|
||||
extern const char kOzonePlatformHintChoiceAuto[];
|
||||
extern const char kOzonePlatformHintChoiceX11[];
|
||||
@@ -4738,6 +4738,9 @@ extern const char kWaylandPerWindowScalingDescription[
|
||||
@@ -4680,6 +4680,9 @@ extern const char kWaylandTextInputV3Description[];
|
||||
|
||||
extern const char kWaylandTextInputV3Name[];
|
||||
extern const char kWaylandTextInputV3Description[];
|
||||
extern const char kWaylandUiScalingName[];
|
||||
extern const char kWaylandUiScalingDescription[];
|
||||
+
|
||||
+extern const char kAudioBackendName[];
|
||||
+extern const char kAudioBackendDescription[];
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
// All views-based platforms --------------------------------------------------
|
||||
@@ -4767,7 +4770,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
||||
// Random platform combinations -----------------------------------------------
|
||||
@@ -4699,7 +4702,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
||||
extern const char kWebBluetoothConfirmPairingSupportDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
|
|
@ -73,8 +91,8 @@
|
|||
extern const char kSkipUndecryptablePasswordsName[];
|
||||
extern const char kSkipUndecryptablePasswordsDescription[];
|
||||
|
||||
@@ -4783,7 +4786,7 @@ extern const char kScreenlockReauthPromoCardDescriptio
|
||||
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
@@ -4721,7 +4724,7 @@ extern const char kScreenlockReauthPromoCardDescriptio
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
|
|
@ -82,7 +100,7 @@
|
|||
extern const char kFollowingFeedSidepanelName[];
|
||||
extern const char kFollowingFeedSidepanelDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
@@ -4794,7 +4797,7 @@ extern const char kTaskManagerDesktopRefreshName[];
|
||||
@@ -4735,7 +4738,7 @@ extern const char kTaskManagerDesktopRefreshName[];
|
||||
extern const char kTaskManagerDesktopRefreshDescription[];
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
|
@ -91,7 +109,7 @@
|
|||
extern const char kEnableNetworkServiceSandboxName[];
|
||||
extern const char kEnableNetworkServiceSandboxDescription[];
|
||||
|
||||
@@ -4891,7 +4894,7 @@ extern const char kElementCaptureDescription[];
|
||||
@@ -4832,7 +4835,7 @@ extern const char kElementCaptureDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
|
@ -100,8 +118,8 @@
|
|||
extern const char kUIDebugToolsName[];
|
||||
extern const char kUIDebugToolsDescription[];
|
||||
#endif
|
||||
@@ -4945,7 +4948,7 @@ extern const char kAutofillCaretExtractionName[];
|
||||
extern const char kAutofillCaretExtractionDescription[];
|
||||
@@ -4883,7 +4886,7 @@ extern const char kComposeUpfrontInputModesName[];
|
||||
extern const char kComposeUpfrontInputModesDescription[];
|
||||
#endif // BUILDFLAG(ENABLE_COMPOSE)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
|
@ -109,9 +127,9 @@
|
|||
extern const char kThirdPartyProfileManagementName[];
|
||||
extern const char kThirdPartyProfileManagementDescription[];
|
||||
|
||||
@@ -5001,7 +5004,7 @@ extern const char kEnableCertManagementV2UIName[];
|
||||
extern const char kEnableCertManagementV2UIDescription[];
|
||||
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
|
||||
@@ -4949,7 +4952,7 @@ extern const char kOverlayScrollbarsOSSettingsName[];
|
||||
extern const char kOverlayScrollbarsOSSettingsDescription[];
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
--- chrome/browser/headless/headless_mode_util.cc.orig 2024-03-22 14:16:19 UTC
|
||||
--- chrome/browser/headless/headless_mode_util.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/headless/headless_mode_util.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
// New headless mode is available on Linux, Windows and Mac platforms.
|
||||
// More platforms will be added later, so avoid function level clutter
|
||||
// by providing stub implementations at the end of the file.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
|
||||
#include "base/base_switches.h"
|
||||
#include "base/files/file_path.h"
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
|
|
@ -9,8 +18,8 @@
|
|||
#include "ui/gl/gl_switches.h" // nogncheck
|
||||
#include "ui/ozone/public/ozone_switches.h" // nogncheck
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
@@ -87,7 +87,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
|
||||
command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir());
|
||||
@@ -94,7 +94,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
|
||||
}
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-10-01 07:26:23 UTC
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
@@ -88,8 +88,10 @@
|
||||
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
#include "components/power_metrics/system_power_monitor.h"
|
||||
#endif
|
||||
|
||||
@@ -869,7 +871,7 @@ void RecordStartupMetrics() {
|
||||
@@ -870,7 +872,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,
|
||||
@@ -1177,11 +1179,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
|
||||
@@ -1182,11 +1184,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -195,11 +195,11 @@
|
||||
@@ -196,11 +196,11 @@
|
||||
#include "chrome/notification_helper/notification_helper_constants.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
#include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h"
|
||||
#endif
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
@@ -214,7 +214,7 @@
|
||||
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -535,7 +535,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
|
||||
@@ -536,7 +536,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
|
||||
|
||||
#if !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -707,7 +707,7 @@ void ChromeMetricsServiceClient::Initialize() {
|
||||
@@ -708,7 +708,7 @@ void ChromeMetricsServiceClient::Initialize() {
|
||||
RegisterUKMProviders();
|
||||
}
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
|
||||
base::SequencedTaskRunner::GetCurrentDefault());
|
||||
#endif
|
||||
@@ -758,7 +758,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -759,7 +759,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<metrics::CPUMetricsProvider>());
|
||||
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<metrics::MotherboardMetricsProvider>());
|
||||
#endif
|
||||
@@ -843,7 +843,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -846,7 +846,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
|
||||
@@ -951,7 +951,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -954,7 +954,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
std::make_unique<PowerMetricsProvider>());
|
||||
#endif
|
||||
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
metrics_service_->RegisterMetricsProvider(
|
||||
metrics::CreateDesktopSessionMetricsProvider());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
|
||||
@@ -1138,7 +1138,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
@@ -1141,7 +1141,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
|
||||
// already.
|
||||
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
|
||||
@@ -1472,7 +1472,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
|
||||
@@ -1475,7 +1475,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
|
||||
recorder =
|
||||
base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>(
|
||||
cros_system_profile_provider_.get());
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/net/profile_network_context_service.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/net/profile_network_context_service.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -139,7 +139,7 @@
|
||||
@@ -141,7 +141,7 @@
|
||||
#include "chromeos/startup/browser_params_proxy.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
|
||||
#include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
|
||||
#include "components/enterprise/client_certificates/core/client_certificates_service.h"
|
||||
@@ -259,7 +259,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
|
||||
@@ -268,7 +268,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
|
||||
Profile* profile,
|
||||
std::unique_ptr<net::ClientCertStore> platform_store) {
|
||||
@@ -985,7 +985,7 @@ ProfileNetworkContextService::CreateClientCertStore()
|
||||
@@ -1140,7 +1140,7 @@ ProfileNetworkContextService::CreateClientCertStore()
|
||||
store = std::make_unique<ClientCertStoreLacros>(
|
||||
std::move(certificate_provider), cert_db_initializer, std::move(store));
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -102,7 +102,7 @@
|
||||
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
gssapi_library_loader_observer_.Install(network_service);
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -969,7 +969,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
|
||||
@@ -965,7 +965,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
|
||||
@@ -589,7 +589,7 @@ void ChromePasswordManagerClient::
|
||||
@@ -600,7 +600,7 @@ void ChromePasswordManagerClient::
|
||||
bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
|
||||
device_reauth::DeviceAuthenticator* authenticator) {
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
|
||||
return false;
|
||||
}
|
||||
@@ -827,7 +827,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
|
||||
@@ -845,7 +845,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
|
||||
}
|
||||
|
||||
void ChromePasswordManagerClient::NotifyKeychainError() {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -245,19 +245,19 @@
|
||||
#include "components/spellcheck/browser/pref_names.h"
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#include "components/search_engines/enterprise/site_search_policy_handler.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -545,7 +545,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -551,7 +551,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
{ key::kDefaultDirectSocketsSetting,
|
||||
prefs::kManagedDefaultDirectSocketsSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
{ key::kDeletingUndecryptablePasswordsEnabled,
|
||||
password_manager::prefs::kDeletingUndecryptablePasswordsEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -872,13 +872,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -881,13 +881,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kManagedDefaultGeolocationSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
|
||||
|
|
@ -64,8 +64,8 @@
|
|||
{ key::kFullscreenAllowed,
|
||||
prefs::kFullscreenAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1706,7 +1706,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::INTEGER},
|
||||
@@ -1721,7 +1721,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
{ key::kGSSAPILibraryName,
|
||||
prefs::kGSSAPILibraryName,
|
||||
base::Value::Type::STRING },
|
||||
@@ -1765,7 +1765,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1780,7 +1780,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
{ key::kNetworkServiceSandboxEnabled,
|
||||
prefs::kNetworkServiceSandboxEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1791,17 +1791,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1806,17 +1806,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kTotalMemoryLimitMb,
|
||||
base::Value::Type::INTEGER },
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
{ key::kDefaultBrowserSettingEnabled,
|
||||
prefs::kDefaultBrowserSettingEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1813,7 +1813,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1828,7 +1828,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) \
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
{ key::kAutoplayAllowed,
|
||||
prefs::kAutoplayAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1911,7 +1911,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1926,7 +1926,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
{ key::kAlternativeBrowserPath,
|
||||
browser_switcher::prefs::kAlternativeBrowserPath,
|
||||
base::Value::Type::STRING },
|
||||
@@ -2028,7 +2028,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2037,7 +2037,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::LIST },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
{ key::kAuthNegotiateDelegateByKdcPolicy,
|
||||
prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2107,7 +2107,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2116,7 +2116,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
ash::prefs::kUrlParameterToAutofillSAMLUsername,
|
||||
base::Value::Type::STRING },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
{ key::kTabDiscardingExceptions,
|
||||
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
|
||||
base::Value::Type::LIST },
|
||||
@@ -2136,7 +2136,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2145,7 +2145,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kUiAutomationProviderEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
{ key::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
prefs::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2176,7 +2176,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2185,7 +2185,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::INTEGER },
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
{ key::kExtensionInstallTypeBlocklist,
|
||||
extensions::pref_names::kExtensionInstallTypeBlocklist,
|
||||
base::Value::Type::LIST},
|
||||
@@ -2199,7 +2199,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -2211,7 +2211,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
{ key::kTabCompareSettings,
|
||||
optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
|
||||
base::Value::Type::INTEGER},
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
{ key::kChromeForTestingAllowed,
|
||||
prefs::kChromeForTestingAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2335,7 +2335,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2351,7 +2351,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
// Policies for all platforms - End
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
|
||||
key::kMemorySaverModeSavings,
|
||||
performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
|
||||
@@ -2351,7 +2351,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2367,7 +2367,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -184,7 +184,7 @@
|
|||
handlers->AddHandler(
|
||||
std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
|
||||
|
||||
@@ -2550,7 +2550,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2566,7 +2566,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
handlers->AddHandler(
|
||||
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
@@ -2603,7 +2603,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2619,7 +2619,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
|
||||
chrome_schema));
|
||||
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
|
||||
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
@@ -3027,7 +3027,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3050,7 +3050,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
|
||||
@@ -3035,7 +3035,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3058,7 +3058,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
|
|
@ -220,7 +220,7 @@
|
|||
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
|
||||
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
|
||||
base::Value::Type::BOOLEAN));
|
||||
@@ -3053,7 +3053,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3076,7 +3076,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
|
||||
key::kRelatedWebsiteSetsOverrides, chrome_schema)));
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
@@ -3076,7 +3076,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3099,7 +3099,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
base::Value::Type::BOOLEAN)));
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -238,12 +238,12 @@
|
|||
handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -3100,7 +3100,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -3123,7 +3123,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
|
||||
gen_ai_default_policies;
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
||||
gen_ai_default_policies.emplace_back(
|
||||
key::kHelpMeWriteSettings,
|
||||
optimization_guide::prefs::kComposeEnterprisePolicyAllowed);
|
||||
key::kAutofillPredictionSettings,
|
||||
optimization_guide::prefs::
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-04-23 07:42:17 UTC
|
||||
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/policy/device_management_service_configuration.cc
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
|
||||
|
|
@ -9,12 +9,3 @@
|
|||
#include "chrome/browser/enterprise/connectors/common.h"
|
||||
#include "chrome/browser/enterprise/connectors/connectors_service.h"
|
||||
#endif
|
||||
@@ -102,7 +102,7 @@ DeviceManagementServiceConfiguration::GetReportingConn
|
||||
content::BrowserContext* context) const {
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
|
||||
- !BUILDFLAG(IS_ANDROID))
|
||||
+ !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD)
|
||||
auto* service =
|
||||
enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
|
||||
context);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -310,7 +310,7 @@
|
||||
#include "components/user_notes/user_notes_prefs.h"
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -488,18 +488,18 @@
|
||||
@@ -485,18 +485,18 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
|
||||
#endif
|
||||
|
||||
@@ -534,7 +534,7 @@
|
||||
@@ -531,7 +531,7 @@
|
||||
#include "chrome/browser/sessions/session_service_log.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
#include "ui/color/system_theme.h"
|
||||
#endif
|
||||
|
||||
@@ -1674,7 +1674,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
@@ -1749,7 +1749,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
on_device_translation::RegisterLocalStatePrefs(registry);
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
WhatsNewUI::RegisterLocalStatePrefs(registry);
|
||||
#endif
|
||||
|
||||
@@ -1847,7 +1847,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
@@ -1922,7 +1922,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
#endif // BUILDFLAG(ENABLE_PDF)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
|
||||
#endif
|
||||
|
||||
@@ -2203,12 +2203,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
@@ -2276,12 +2276,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-10-27 06:40:35 UTC
|
||||
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
|
||||
@@ -198,7 +198,7 @@ const char* const kPersistentPrefNames[] = {
|
||||
@@ -199,7 +199,7 @@ const char* const kPersistentPrefNames[] = {
|
||||
prefs::kShowFullscreenToolbar,
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/printing/print_backend_service_manager.cc
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "printing/printing_context.h"
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "content/public/common/content_switches.h"
|
||||
#endif
|
||||
|
||||
@@ -877,7 +877,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
|
||||
@@ -884,7 +884,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
|
||||
host.BindNewPipeAndPassReceiver(),
|
||||
content::ServiceProcessHost::Options()
|
||||
.WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
.WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
|
||||
#endif
|
||||
.Pass());
|
||||
@@ -1054,7 +1054,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
|
||||
@@ -1061,7 +1061,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
|
||||
return kNoClientsRegisteredResetOnIdleTimeout;
|
||||
|
||||
case ClientType::kQueryWithUi:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -346,7 +346,7 @@
|
||||
#include "chromeos/constants/chromeos_features.h"
|
||||
@@ -348,7 +348,7 @@
|
||||
#include "chrome/browser/profiles/gaia_info_update_service_factory.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
|
|
@ -9,12 +9,12 @@
|
|||
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
|
||||
#endif
|
||||
|
||||
@@ -439,18 +439,18 @@
|
||||
@@ -428,18 +428,18 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
|
||||
#include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
|
||||
|
|
@ -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"
|
||||
@@ -704,7 +704,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -698,7 +698,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
DiceBoundSessionCookieServiceFactory::GetInstance();
|
||||
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
|
||||
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
|
||||
|
|
@ -40,16 +40,16 @@
|
|||
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
|
||||
#endif
|
||||
browser_sync::UserEventServiceFactory::GetInstance();
|
||||
@@ -837,7 +837,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -807,7 +807,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
|
||||
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -846,21 +846,21 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -816,21 +816,21 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
enterprise_idle::IdleServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#if !BUILDFLAG(IS_CHROMEOS)
|
||||
enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance();
|
||||
#endif
|
||||
enterprise_reporting::LegacyTechServiceFactory::GetInstance();
|
||||
|
|
@ -66,8 +66,8 @@
|
|||
enterprise_signals::SignalsAggregatorFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
enterprise_signals::UserPermissionServiceFactory::GetInstance();
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -75,16 +75,16 @@
|
|||
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
|
||||
@@ -990,7 +990,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -953,7 +953,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
MerchantViewerDataManagerFactory::GetInstance();
|
||||
#endif
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -1091,7 +1091,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
NavigationPredictorKeyedServiceFactory::GetInstance();
|
||||
@@ -1051,7 +1051,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
policy::PolicyCertServiceFactory::GetInstance();
|
||||
#endif
|
||||
|
|
@ -93,8 +93,8 @@
|
|||
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
|
||||
policy::UserPolicyOidcSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -1140,7 +1140,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
|
||||
@@ -1099,7 +1099,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
|
||||
ProfileStatisticsFactory::GetInstance();
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
ProfileTokenWebSigninInterceptorFactory::GetInstance();
|
||||
OidcAuthenticationSigninInterceptorFactory::GetInstance();
|
||||
#endif
|
||||
@@ -1159,7 +1159,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -1118,7 +1118,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#endif
|
||||
ReduceAcceptLanguageFactory::GetInstance();
|
||||
RendererUpdaterFactory::GetInstance();
|
||||
|
|
@ -110,4 +110,4 @@
|
|||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
reporting::ManualTestHeartbeatEventFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/profiles/profile_impl.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/profiles/profile_impl.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/profiles/profile_impl.cc
|
||||
@@ -265,6 +265,10 @@
|
||||
@@ -261,6 +261,10 @@
|
||||
#include "chrome/browser/spellchecker/spellcheck_service.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
using bookmarks::BookmarkModel;
|
||||
using content::BrowserThread;
|
||||
using content::DownloadManagerDelegate;
|
||||
@@ -601,7 +605,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
|
||||
#else
|
||||
@@ -571,7 +575,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
|
||||
policy_provider = GetUserCloudPolicyManagerAsh();
|
||||
#else // !BUILDFLAG(IS_CHROMEOS)
|
||||
{
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
ProfileManager* profile_manager = g_browser_process->profile_manager();
|
||||
ProfileAttributesEntry* entry =
|
||||
profile_manager->GetProfileAttributesStorage()
|
||||
@@ -883,7 +887,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
|
||||
@@ -853,7 +857,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-07-31 14:19:23 UTC
|
||||
--- chrome/browser/profiles/profiles_state.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/profiles/profiles_state.cc
|
||||
@@ -195,7 +195,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
|
||||
@@ -189,7 +189,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
|
||||
PrefService* local_state,
|
||||
bool show_warning) {
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
DCHECK(local_state);
|
||||
|
||||
// Check if guest mode enforcement commandline switch or policy are provided.
|
||||
@@ -242,7 +242,7 @@ bool IsGuestModeEnabled() {
|
||||
@@ -225,7 +225,7 @@ bool IsGuestModeEnabled() {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
// If there are any supervised profiles, disable guest mode.
|
||||
if (base::FeatureList::IsEnabled(
|
||||
supervised_user::kHideGuestModeForSupervisedUsers) &&
|
||||
@@ -258,7 +258,7 @@ bool IsGuestModeEnabled() {
|
||||
@@ -244,7 +244,7 @@ bool IsGuestModeEnabled() {
|
||||
}
|
||||
|
||||
bool IsGuestModeEnabled(const Profile& profile) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
|
||||
@@ -1249,7 +1249,7 @@ std::string ChromePasswordProtectionService::GetOrgani
|
||||
ReusedPasswordAccountType password_type) const {
|
||||
if (base::FeatureList::IsEnabled(
|
||||
safe_browsing::kEnterprisePasswordReuseUiRefresh)) {
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
return GetPrefs()->GetString(prefs::kEnterpriseCustomLabel);
|
||||
#else
|
||||
return std::string();
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-07-31 14:19:23 UTC
|
||||
--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/screen_ai/screen_ai_install_state.cc
|
||||
@@ -17,7 +17,7 @@
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "services/screen_ai/public/cpp/utilities.h"
|
||||
#include "ui/accessibility/accessibility_features.h"
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "base/cpu.h"
|
||||
#include "base/files/file_util.h"
|
||||
#endif
|
||||
@@ -27,7 +27,7 @@ const int kScreenAICleanUpDelayInDays = 30;
|
||||
@@ -26,7 +26,7 @@ const int kScreenAICleanUpDelayInDays = 30;
|
||||
const char kMinExpectedVersion[] = "124.2";
|
||||
|
||||
bool IsDeviceCompatible() {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
diff --git chrome/browser/sessions/session_restore.cc chrome/browser/sessions/session_restore.cc 2024-11-02 08:11:27 UTC
|
||||
index 04610ad2c0..175c381644 100644
|
||||
--- chrome/browser/sessions/session_restore.cc
|
||||
--- chrome/browser/sessions/session_restore.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/sessions/session_restore.cc
|
||||
@@ -103,7 +103,7 @@
|
||||
@@ -102,7 +102,7 @@
|
||||
#include "chrome/browser/web_applications/web_app_registrar.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
|
|
@ -11,7 +9,7 @@ index 04610ad2c0..175c381644 100644
|
|||
#include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -1081,7 +1081,7 @@ class SessionRestoreImpl : public BrowserListObserver {
|
||||
@@ -1093,7 +1093,7 @@ class SessionRestoreImpl : public BrowserListObserver
|
||||
bool is_first_tab = true;
|
||||
for (const auto& startup_tab : startup_tabs) {
|
||||
const GURL& url = startup_tab.url;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc
|
||||
@@ -219,7 +219,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu
|
||||
case SupervisedUserNavigationThrottle::kCancelWithInterstitial: {
|
||||
CHECK(navigation_handle());
|
||||
// LINT.IfChange(cancel_with_interstitial)
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
if (ShouldShowReAuthInterstitial(*navigation_handle(), is_main_frame)) {
|
||||
// Show the re-authentication interstitial if the user signed out of
|
||||
// the content area, as parent's approval requires authentication.
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_browser_utils.cc
|
||||
@@ -42,7 +42,7 @@
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "components/user_manager/user.h"
|
||||
#include "components/user_manager/user_type.h"
|
||||
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
#include "chromeos/startup/browser_params_proxy.h"
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
|
||||
#include "chrome/browser/supervised_user/supervised_user_verification_page.h"
|
||||
#endif
|
||||
@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool
|
||||
#include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
|
||||
#include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
|
||||
@@ -158,7 +158,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool
|
||||
#endif
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
std::string CreateReauthenticationInterstitial(
|
||||
content::NavigationHandle& navigation_handle,
|
||||
SupervisedUserVerificationPage::VerificationPurpose verification_purpose) {
|
||||
std::string CreateReauthenticationInterstitialForYouTube(
|
||||
content::NavigationHandle& navigation_handle) {
|
||||
content::WebContents* web_contents = navigation_handle.GetWebContents();
|
||||
|
|
|
|||
|
|
@ -1,15 +1,6 @@
|
|||
--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_browser_utils.h
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "url/gurl.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/supervised_user/supervised_user_verification_page.h"
|
||||
#endif
|
||||
|
||||
@@ -55,7 +55,7 @@ std::string GetAccountGivenName(Profile& profile);
|
||||
@@ -52,7 +52,7 @@ std::string GetAccountGivenName(Profile& profile);
|
||||
// of the user.
|
||||
void AssertChildStatusOfTheUser(Profile* profile, bool is_child);
|
||||
|
||||
|
|
@ -17,4 +8,4 @@
|
|||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
// Returns the html content of the reauthentication interstitial for blocked
|
||||
// sites. This interstitial is associated with the given NavigationHandle.
|
||||
std::string CreateReauthenticationInterstitial(
|
||||
std::string CreateReauthenticationInterstitialForBlockedSites(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-10-01 07:26:23 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
|
||||
@@ -359,7 +359,7 @@ void SupervisedUserExtensionsManager::
|
||||
@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
|
||||
ActivateManagementPolicyAndUpdateRegistration() {
|
||||
SetActiveForSupervisedUsers();
|
||||
UpdateManagementPolicyRegistration();
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
MaybeMarkExtensionsLocallyParentApproved();
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
}
|
||||
@@ -477,7 +477,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
|
||||
@@ -475,7 +475,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
#include "ui/android/view_android.h"
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
|
||||
#include "chrome/browser/supervised_user/supervised_user_verification_page.h"
|
||||
#endif
|
||||
@@ -145,7 +145,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
|
||||
@@ -148,7 +148,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
|
||||
return content::NavigationThrottle::DEFER;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
|
||||
@@ -201,7 +201,7 @@ void SupervisedUserNavigationThrottle::OnCheckDone(
|
||||
}
|
||||
@@ -213,7 +213,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR
|
||||
case kCancelWithInterstitial: {
|
||||
CHECK(navigation_handle());
|
||||
// LINT.IfChange(cancel_with_interstitial)
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
if (supervised_user::ShouldShowReAuthInterstitial(*navigation_handle(),
|
||||
is_main_frame)) {
|
||||
// Show the re-authentication interstitial if the user signed out of
|
||||
@@ -244,7 +244,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR
|
||||
}
|
||||
|
||||
namespace supervised_user {
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
SupervisedUserVerificationPage::VerificationPurpose
|
||||
GetVerificationPurposeFromFilteringReason(
|
||||
supervised_user::FilteringBehaviorReason reason) {
|
||||
@@ -235,7 +235,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR
|
||||
Profile* profile = Profile::FromBrowserContext(
|
||||
navigation_handle()->GetWebContents()->GetBrowserContext());
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
supervised_user::ChildAccountService* child_account_service =
|
||||
ChildAccountServiceFactory::GetForProfile(profile);
|
||||
if (base::FeatureList::IsEnabled(
|
||||
bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle,
|
||||
bool is_main_frame) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/supervised_user/supervised_user_navigation_throttle.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.h
|
||||
@@ -22,7 +22,7 @@
|
||||
class Profile;
|
||||
|
||||
namespace supervised_user {
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle,
|
||||
bool is_main_frame);
|
||||
#endif
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/sync/sync_service_factory.cc
|
||||
@@ -105,7 +105,7 @@
|
||||
@@ -109,7 +109,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_keyed_service.h"
|
||||
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
|
||||
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
|
||||
@@ -153,7 +153,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() {
|
||||
@@ -157,7 +157,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() {
|
||||
tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) {
|
||||
CHECK(profile);
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
tab_groups::TabGroupSyncService* service =
|
||||
tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile);
|
||||
CHECK(service);
|
||||
@@ -381,7 +381,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
@@ -395,7 +395,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
// included in lacros-chrome once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
syncer::SyncPrefs prefs(profile->GetPrefs());
|
||||
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
|
||||
base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled);
|
||||
@@ -517,7 +517,7 @@ SyncServiceFactory::SyncServiceFactory()
|
||||
@@ -531,7 +531,7 @@ SyncServiceFactory::SyncServiceFactory()
|
||||
DependsOn(ProfilePasswordStoreFactory::GetInstance());
|
||||
DependsOn(PowerBookmarkServiceFactory::GetInstance());
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc
|
||||
@@ -30,7 +30,7 @@
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "components/sync_device_info/device_info_sync_service.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_desktop.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
|
||||
// BUILDFLAG(IS_WIN)
|
||||
@@ -110,7 +110,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro
|
||||
@@ -89,7 +89,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro
|
||||
|
||||
std::unique_ptr<TabGroupSyncDelegate> delegate;
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/actions/chrome_action_id.h
|
||||
@@ -511,7 +511,7 @@
|
||||
@@ -513,7 +513,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-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
|
||||
@@ -48,7 +48,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)
|
||||
}
|
||||
@@ -108,7 +108,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
|
||||
@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/browser.h.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/browser.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/browser.h
|
||||
@@ -300,7 +300,7 @@ class Browser : public TabStripModelObserver,
|
||||
@@ -303,7 +303,7 @@ class Browser : public TabStripModelObserver,
|
||||
std::optional<int64_t> display_id;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/browser_command_controller.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -128,7 +128,7 @@
|
||||
@@ -126,7 +126,7 @@
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "ui/base/ime/text_input_flags.h"
|
||||
#include "ui/linux/linux_ui.h"
|
||||
#endif
|
||||
@@ -137,7 +137,7 @@
|
||||
@@ -135,7 +135,7 @@
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
#include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
|
||||
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -318,7 +318,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
@@ -316,7 +316,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
// If this key was registered by the user as a content editing hotkey, then
|
||||
// it is not reserved.
|
||||
auto* linux_ui = ui::LinuxUi::instance();
|
||||
@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -571,7 +571,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
case IDC_MINIMIZE_WINDOW:
|
||||
browser_->window()->Minimize();
|
||||
break;
|
||||
@@ -585,7 +585,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -583,7 +583,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
case IDC_USE_SYSTEM_TITLE_BAR: {
|
||||
PrefService* prefs = profile()->GetPrefs();
|
||||
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
|
||||
@@ -786,7 +786,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -787,7 +787,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
break;
|
||||
case IDC_CREATE_SHORTCUT:
|
||||
base::RecordAction(base::UserMetricsAction("CreateShortcut"));
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) {
|
||||
chrome::CreateDesktopShortcutForActiveWebContents(browser_);
|
||||
} else {
|
||||
@@ -1264,12 +1264,12 @@ void BrowserCommandController::InitCommandState() {
|
||||
@@ -1266,12 +1266,12 @@ void BrowserCommandController::InitCommandState() {
|
||||
#endif
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
bool use_system_title_bar = true;
|
||||
#if BUILDFLAG(IS_OZONE)
|
||||
use_system_title_bar = ui::OzonePlatform::GetInstance()
|
||||
@@ -1601,7 +1601,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
|
||||
@@ -1603,7 +1603,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
|
||||
bool can_create_web_app = web_app::CanCreateWebApp(browser_);
|
||||
command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/browser_commands.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/browser_commands.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/browser_commands.cc
|
||||
@@ -2031,7 +2031,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
|
||||
@@ -2030,7 +2030,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
|
||||
} else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
|
||||
UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-10-01 07:26:23 UTC
|
||||
--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -74,7 +74,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
|
||||
@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry
|
||||
registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
|
||||
registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime,
|
||||
base::Time());
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string());
|
||||
registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string());
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
|
||||
@@ -182,7 +182,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
|
||||
registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
|
||||
registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
|
||||
registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
|
||||
|
|
@ -17,4 +17,4 @@
|
|||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string());
|
||||
registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string());
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForProfile,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/ui/chrome_pages.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- chrome/browser/ui/chrome_pages.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/chrome_pages.cc
|
||||
@@ -86,7 +86,7 @@
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
void ShowChromeWhatsNew(Browser* browser) {
|
||||
ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL));
|
||||
}
|
||||
@@ -721,7 +721,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
@@ -725,7 +725,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/ui/chrome_pages.h.orig 2024-10-01 07:26:23 UTC
|
||||
--- chrome/browser/ui/chrome_pages.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/chrome_pages.h
|
||||
@@ -39,7 +39,7 @@ namespace signin {
|
||||
enum class ConsentLevel;
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
namespace web_app {
|
||||
enum class AppSettingsPageEntryPoint;
|
||||
} // namespace web_app
|
||||
@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
@@ -176,7 +176,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
const std::string& category);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
--- chrome/browser/ui/managed_ui.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/managed_ui.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/managed_ui.cc
|
||||
@@ -435,7 +435,7 @@ std::optional<std::string> GetDeviceManagerIdentity()
|
||||
@@ -439,7 +439,7 @@ std::optional<std::string> GetDeviceManagerIdentity()
|
||||
g_browser_process->platform_part()->browser_policy_connector_ash();
|
||||
return connector->GetEnterpriseDomainManager();
|
||||
#else
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
std::string custom_management_label =
|
||||
g_browser_process->local_state()
|
||||
? g_browser_process->local_state()->GetString(
|
||||
@@ -469,7 +469,7 @@ std::optional<std::string> GetAccountManagerIdentity(P
|
||||
if (base::FeatureList::IsEnabled(
|
||||
features::kEnterpriseManagementDisclaimerUsesCustomLabel)) {
|
||||
std::string custom_management_label =
|
||||
@@ -476,7 +476,7 @@ std::optional<std::string> GetAccountManagerIdentity(P
|
||||
policy::EnterpriseManagementAuthority::CLOUD))
|
||||
return std::nullopt;
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
std::string custom_management_label =
|
||||
profile->GetPrefs()->GetString(prefs::kEnterpriseCustomLabel);
|
||||
if (!custom_management_label.empty()) {
|
||||
if (base::FeatureList::IsEnabled(
|
||||
features::kEnterpriseManagementDisclaimerUsesCustomLabel)) {
|
||||
std::string custom_management_label =
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
|
||||
@@ -93,7 +93,7 @@ namespace {
|
||||
@@ -97,7 +97,7 @@ namespace {
|
||||
|
||||
using Logger = autofill::SavePasswordProgressLogger;
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// Should be kept in sync with constant declared in
|
||||
// bubble_controllers/relaunch_chrome_bubble_controller.cc.
|
||||
constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
|
||||
@@ -513,7 +513,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
|
||||
@@ -517,7 +517,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
|
||||
}
|
||||
|
||||
void ManagePasswordsUIController::OnKeychainError() {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-08-26 14:40:28 UTC
|
||||
--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/signin/signin_view_controller.cc
|
||||
@@ -482,7 +482,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
|
||||
signin::SigninChoiceCallbackVariant process_user_choice_callback,
|
||||
base::OnceClosure done_callback) {
|
||||
@@ -479,7 +479,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
|
||||
std::unique_ptr<signin::EnterpriseProfileCreationDialogParams>
|
||||
create_param) {
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-07-31 14:19:23 UTC
|
||||
--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/signin/signin_view_controller_delegate.h
|
||||
@@ -83,7 +83,7 @@ class SigninViewControllerDelegate {
|
||||
@@ -85,7 +85,7 @@ class SigninViewControllerDelegate {
|
||||
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-06-22 08:49:42 UTC
|
||||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -106,7 +106,7 @@ const char* const kBadFlags[] = {
|
||||
@@ -104,7 +104,7 @@ const char* const kBadFlags[] = {
|
||||
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
@@ -138,7 +138,7 @@
|
||||
@@ -139,7 +139,7 @@
|
||||
#include "chrome/credential_provider/common/gcp_strings.h"
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/headless/headless_mode_util.h"
|
||||
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
|
||||
#include "components/headless/policy/headless_mode_policy.h"
|
||||
@@ -963,7 +963,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -968,7 +968,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
|
||||
ComputeAndRecordLaunchMode(command_line);
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
if (headless::IsHeadlessMode() &&
|
||||
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
|
||||
g_browser_process->local_state())) {
|
||||
@@ -1080,7 +1080,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -1069,7 +1069,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
silent_launch = true;
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
// Writes open and installed web apps to the specified file without
|
||||
// launching a new browser window or tab.
|
||||
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
|
||||
@@ -1295,7 +1295,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -1284,7 +1284,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
|
||||
<< "Failed launch with app: couldn't pick a profile";
|
||||
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/tab_helpers.cc.orig 2024-10-27 06:40:35 UTC
|
||||
--- chrome/browser/ui/tab_helpers.cc.orig 2024-11-16 12:20:41 UTC
|
||||
+++ chrome/browser/ui/tab_helpers.cc
|
||||
@@ -241,7 +241,7 @@
|
||||
@@ -240,7 +240,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
#include "chrome/browser/ui/hats/hats_helper.h"
|
||||
@@ -691,12 +691,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
@@ -690,12 +690,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue