Robert Nagy
2024-10-26 15:10:27 +02:00
parent 25bdcace01
commit fbddcce7d6
339 changed files with 1894 additions and 1475 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
PORTNAME= chromium
PORTVERSION= 129.0.6668.100
PORTVERSION= 130.0.6723.69
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
@@ -127,7 +127,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libffi=true \
use_system_libjpeg=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS} ${PINCLUDES}" \
extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
extra_ldflags="${LDFLAGS}" \
ffmpeg_branding="${FFMPEG_BRAND}"
+7 -7
View File
@@ -1,9 +1,9 @@
TIMESTAMP = 1728496324
SHA256 (chromium-129.0.6668.100.tar.xz) = 281daed29a5cb546f6273130035d9980666d2232f356ad95fc06af3c90121bc2
SIZE (chromium-129.0.6668.100.tar.xz) = 6677334468
SHA256 (chrome-linux-129.0.6668.100-llvm17.profdata.tar.xz) = eb7417c1317b1293e1d40cb9e2f3513dc476d00a9d3c96bf06f4ad2ff9561d7e
SIZE (chrome-linux-129.0.6668.100-llvm17.profdata.tar.xz) = 30461292
TIMESTAMP = 1729947948
SHA256 (chromium-130.0.6723.69.tar.xz) = b7e4d6a2154c61e558659bbc5b8b05c9f6f317d1420bf8624f5ffac097df565d
SIZE (chromium-130.0.6723.69.tar.xz) = 6620926572
SHA256 (chrome-linux-130.0.6723.69-llvm17.profdata.tar.xz) = 7a3a0cc32a28f1153e7acbf36771d095b4dfa97f85a2ed593384c31ba8271711
SIZE (chrome-linux-130.0.6723.69-llvm17.profdata.tar.xz) = 30526644
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
SHA256 (chromium-129.0.6668.100-testdata.tar.xz) = 5935eb364363dc05c90e92380d62e79c2f1e05f28c2a2961a8a78826fc889d00
SIZE (chromium-129.0.6668.100-testdata.tar.xz) = 275931720
SHA256 (chromium-130.0.6723.69-testdata.tar.xz) = df5093c3a832bd04c4ac477057d8d9417e995ebc4f6f97b8444dd5bdf426def7
SIZE (chromium-130.0.6723.69-testdata.tar.xz) = 281900320
+9 -9
View File
@@ -1,4 +1,4 @@
--- BUILD.gn.orig 2024-09-30 07:45:04 UTC
--- BUILD.gn.orig 2024-10-22 08:31:56 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",
@@ -428,7 +427,7 @@ group("gn_all") {
@@ -437,7 +436,7 @@ group("gn_all") {
}
}
@@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -623,6 +622,15 @@ group("gn_all") {
@@ -628,6 +627,15 @@ group("gn_all") {
}
}
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
@@ -671,7 +679,7 @@ group("gn_all") {
@@ -676,7 +684,7 @@ group("gn_all") {
}
}
@@ -51,16 +51,16 @@
# 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
@@ -1111,7 +1119,7 @@ if (use_blink && !is_cronet_build) {
@@ -1158,7 +1166,7 @@ if (use_blink && !is_cronet_build) {
]
}
- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
+ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
out_dir = get_path_info(root_build_dir, "name")
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
@@ -1209,7 +1217,7 @@ if (use_blink && !is_cronet_build) {
args = _common_web_test_options + [ "--product=chrome" ]
@@ -1251,7 +1259,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.
@@ -1223,7 +1231,7 @@ if (use_blink && !is_cronet_build) {
@@ -1265,7 +1273,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.
@@ -1693,7 +1701,7 @@ group("chromium_builder_perf") {
@@ -1729,7 +1737,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
+21 -27
View File
@@ -1,15 +1,6 @@
--- base/BUILD.gn.orig 2024-09-30 07:45:04 UTC
--- base/BUILD.gn.orig 2024-10-23 07:00:35 UTC
+++ base/BUILD.gn
@@ -176,7 +176,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
-enable_message_pump_epoll = is_linux || is_chromeos || is_android
+enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1117,11 +1117,23 @@ component("base") {
@@ -1101,11 +1101,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.
@@ -21,7 +12,10 @@
+ # *BSD needs libkvm
+ if (is_bsd) {
+ libs += [ "kvm" ]
+ libs += [
+ "kvm",
+ "epoll-shim",
+ ]
+ }
+
+ if (is_freebsd) {
@@ -34,7 +28,7 @@
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1141,7 +1153,7 @@ component("base") {
@@ -1125,7 +1140,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -43,7 +37,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2112,6 +2124,22 @@ component("base") {
@@ -2102,6 +2117,22 @@ component("base") {
]
}
@@ -66,7 +60,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2257,6 +2285,33 @@ component("base") {
@@ -2246,6 +2277,33 @@ component("base") {
}
}
@@ -100,16 +94,16 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2267,7 +2322,7 @@ component("base") {
}
@@ -2572,7 +2630,7 @@ buildflag_header("protected_memory_buildflags") {
header = "protected_memory_buildflags.h"
header_dir = "base/memory"
if (dep_libevent) {
- deps += [ "//third_party/libevent" ]
+ public_deps += [ "//third_party/libevent" ]
}
- protected_memory_enabled = !is_component_build && is_clang &&
+ protected_memory_enabled = !is_openbsd && !is_component_build && is_clang &&
(is_win || is_linux || is_android || is_mac)
if (use_libevent) {
@@ -3084,7 +3139,7 @@ if (is_apple) {
flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
@@ -3055,7 +3113,7 @@ if (is_apple) {
}
}
@@ -118,7 +112,7 @@
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
@@ -3743,7 +3798,7 @@ test("base_unittests") {
@@ -3717,7 +3775,7 @@ test("base_unittests") {
]
}
@@ -127,7 +121,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3770,7 +3825,7 @@ test("base_unittests") {
@@ -3744,7 +3802,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -136,7 +130,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3781,7 +3836,7 @@ test("base_unittests") {
@@ -3755,7 +3813,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -145,7 +139,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3966,7 +4021,7 @@ test("base_unittests") {
@@ -3942,7 +4000,7 @@ test("base_unittests") {
deps += [ ":base_profiler_test_support_library" ]
}
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-09-30 07:45:04 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-10-22 08:31:56 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -31,7 +31,7 @@ if (is_nacl) {
use_large_empty_slot_span_ring = is_mac
@@ -9,7 +9,7 @@
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
@@ -389,7 +389,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl
@@ -391,7 +391,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-09-30 07:45:04 UTC
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-10-22 08:31:56 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -856,7 +856,7 @@ if (is_clang_or_gcc) {
@@ -858,7 +858,7 @@ if (is_clang_or_gcc) {
configs -= [ partition_alloc_enable_arc_config ]
}
}
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-07-30 11:12:21 UTC
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-10-22 08:31:56 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal(
@@ -412,8 +412,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-08-26 12:06:38 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-10-22 08:31:56 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
@@ -168,7 +168,7 @@ constexpr bool kUseLazyCommit = false;
// This may be required on more platforms in the future.
@@ -7,9 +7,9 @@
- PA_BUILDFLAG(IS_CHROMEOS))
+ PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD))
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -216,7 +216,7 @@ constexpr bool kUseLazyCommit = false;
// Enable shadow metadata.
//
@@ -231,7 +231,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,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-09-30 07:45:04 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-10-22 08:31:56 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -43,7 +43,7 @@
@@ -44,7 +44,7 @@
#include "wow64apiset.h"
#endif
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -277,7 +277,7 @@ void PartitionAllocMallocInitOnce() {
@@ -290,7 +290,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.
@@ -1076,7 +1076,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
@@ -1110,7 +1110,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
@@ -1,4 +1,4 @@
--- base/base_paths_posix.cc.orig 2024-06-17 12:56:06 UTC
--- base/base_paths_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/base_paths_posix.cc
@@ -15,6 +15,7 @@
#include <ostream>
@@ -23,7 +23,7 @@
#elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
#include <stdlib.h>
#endif
@@ -49,8 +54,7 @@ bool PathProviderPosix(int key, FilePath* result) {
@@ -47,8 +52,7 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = bin_dir;
return true;
#elif BUILDFLAG(IS_FREEBSD)
@@ -31,9 +31,9 @@
- std::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
+ std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
NOTREACHED_IN_MIGRATION() << "Unable to resolve path.";
return false;
@@ -67,13 +71,65 @@ bool PathProviderPosix(int key, FilePath* result) {
NOTREACHED() << "Unable to resolve path.";
}
@@ -62,13 +66,65 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = FilePath(bin_dir);
return true;
#elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
@@ -1,6 +1,6 @@
--- base/compiler_specific.h.orig 2024-09-30 07:45:04 UTC
--- base/compiler_specific.h.orig 2024-10-22 08:31:56 UTC
+++ base/compiler_specific.h
@@ -326,7 +326,7 @@
@@ -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.
@@ -9,7 +9,7 @@
#if HAS_ATTRIBUTE(__no_stack_protector__)
#define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__))
#else
@@ -457,7 +457,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
@@ -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)) && \
-27
View File
@@ -1,27 +0,0 @@
--- base/features.cc.orig 2024-08-26 12:06:38 UTC
+++ base/features.cc
@@ -9,8 +9,10 @@
#include "base/threading/platform_thread.h"
#include "build/buildflag.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+#if !BUILDFLAG(IS_BSD)
#include "base/message_loop/message_pump_epoll.h"
+#endif
#include "base/message_loop/message_pump_libevent.h"
#endif
@@ -116,9 +118,11 @@ void Init(EmitThreadControllerProfilerMetadata
sequence_manager::internal::ThreadController::InitializeFeatures(
emit_thread_controller_profiler_metadata);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
MessagePumpLibevent::InitializeFeatures();
+#if !BUILDFLAG(IS_BSD)
MessagePumpEpoll::InitializeFeatures();
+#endif
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_CHROMEOS)
@@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2024-09-30 07:45:04 UTC
--- base/files/file_util_unittest.cc.orig 2024-10-22 08:31:56 UTC
+++ base/files/file_util_unittest.cc
@@ -3903,7 +3903,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3886,7 +3886,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";
@@ -4625,7 +4625,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4608,7 +4608,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
@@ -1,6 +1,6 @@
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2024-06-17 12:56:06 UTC
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
@@ -311,6 +311,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
@@ -310,6 +310,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -11,7 +11,7 @@
#if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
@@ -326,6 +330,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
@@ -325,6 +329,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
return false;
}
return true;
@@ -0,0 +1,44 @@
--- base/memory/protected_memory.h.orig 2024-10-22 08:31:56 UTC
+++ base/memory/protected_memory.h
@@ -119,12 +119,12 @@ __declspec(selectany) char __stop_protected_memory;
#define DECLARE_PROTECTED_DATA constinit
#define DEFINE_PROTECTED_DATA constinit __declspec(allocate("prot$mem"))
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// This value is used to align the writers variable. That variable needs to be
// aligned to ensure that the protected memory section starts on a page
// boundary.
#if (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \
- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
+ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
// arm64 supports 4kb, 16kb, and 64kb pages. Set to the largest of 64kb as that
// will guarantee the section is page aligned regardless of the choice.
inline constexpr int kProtectedMemoryAlignment = 65536;
@@ -339,7 +339,7 @@ class BASE_EXPORT AutoWritableMemoryBase {
// where an attacker could overwrite it with a large value and invoke code
// that constructs and destructs an AutoWritableMemory. After such a call
// protected memory would still be set writable because writers > 0.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// On Linux, the protected memory section is not automatically page aligned.
// This means that attempts to reset the protected memory region to readonly
// will set some of the preceding section that is on the same page readonly
@@ -353,7 +353,7 @@ class BASE_EXPORT AutoWritableMemoryBase {
#endif
static inline size_t writers GUARDED_BY(writers_lock()) = 0;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// On Linux, there is no guarantee the section following the protected
// memory section is page aligned. This can result in attempts to change
// the access permissions of the end of the protected memory section
@@ -411,7 +411,7 @@ class BASE_EXPORT AutoWritableMemoryInitializer
// the variable to something large before the section was read-only.
WriterData::writers = 0;
CHECK(SetProtectedSectionReadOnly());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Set the protected_memory_section_buffer to true to ensure the buffer
// section is created. If a variable is declared but not used the memory
// section won't be created.
@@ -0,0 +1,20 @@
--- base/memory/protected_memory_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/memory/protected_memory_posix.cc
@@ -6,7 +6,7 @@
#include <sys/mman.h>
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include <sys/resource.h>
#endif // BUILDFLAG(IS_LINUX)
@@ -34,7 +34,7 @@ bool SetMemory(void* start, void* end, int prot) {
} // namespace
namespace internal {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
void CheckMemoryReadOnly(const void* ptr) {
const uintptr_t page_start =
bits::AlignDown(reinterpret_cast<uintptr_t>(ptr), GetPageSize());
@@ -0,0 +1,11 @@
--- base/message_loop/message_pump_epoll.cc.orig 2024-10-22 08:31:56 UTC
+++ base/message_loop/message_pump_epoll.cc
@@ -42,7 +42,7 @@ std::atomic_bool g_use_batched_version = false;
std::atomic_bool g_use_poll = false;
constexpr std::pair<uint32_t, short int> kEpollToPollEvents[] = {
- {EPOLLIN, POLLIN}, {EPOLLOUT, POLLOUT}, {EPOLLRDHUP, POLLRDHUP},
+ {EPOLLIN, POLLIN}, {EPOLLOUT, POLLOUT},
{EPOLLPRI, POLLPRI}, {EPOLLERR, POLLERR}, {EPOLLHUP, POLLHUP}};
void SetEventsForPoll(const uint32_t epoll_events, struct pollfd* poll_entry) {
@@ -0,0 +1,14 @@
--- base/message_loop/message_pump_epoll.h.orig 2024-10-22 08:31:56 UTC
+++ base/message_loop/message_pump_epoll.h
@@ -51,7 +51,11 @@ namespace base {
// every call, don't do it when we have too many FDs.
BASE_FEATURE(kUsePollForMessagePumpEpoll,
"UsePollForMessagePumpEpoll",
+#if BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT);
+#else
base::FEATURE_DISABLED_BY_DEFAULT);
+#endif
// A MessagePump implementation suitable for I/O message loops on Linux-based
// systems with epoll API support.
@@ -1,6 +1,6 @@
--- base/native_library_unittest.cc.orig 2024-03-22 08:19:40 UTC
--- base/native_library_unittest.cc.orig 2024-10-22 08:31:56 UTC
+++ base/native_library_unittest.cc
@@ -133,7 +133,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
// versions with respect to symbol resolution scope.
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
#if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \
@@ -0,0 +1,11 @@
--- base/posix/file_descriptor_shuffle.h.orig 2024-10-22 08:31:56 UTC
+++ base/posix/file_descriptor_shuffle.h
@@ -26,6 +26,8 @@
#include "base/base_export.h"
#include "base/compiler_specific.h"
+#undef close
+
namespace base {
// A Delegate which performs the actions required to perform an injective
@@ -1,6 +1,6 @@
--- base/process/launch.h.orig 2024-08-26 12:06:38 UTC
--- base/process/launch.h.orig 2024-10-22 08:31:56 UTC
+++ base/process/launch.h
@@ -211,7 +211,7 @@ struct BASE_EXPORT LaunchOptions {
@@ -237,7 +237,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -1,6 +1,6 @@
--- base/process/launch_posix.cc.orig 2024-06-17 12:56:06 UTC
--- base/process/launch_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/process/launch_posix.cc
@@ -66,6 +66,9 @@
@@ -67,6 +67,9 @@
#error "macOS should use launch_mac.cc"
#endif
@@ -1,4 +1,4 @@
--- base/process/process_metrics.h.orig 2024-05-21 18:07:39 UTC
--- base/process/process_metrics.h.orig 2024-10-22 08:31:56 UTC
+++ base/process/process_metrics.h
@@ -38,7 +38,7 @@
#endif
@@ -18,7 +18,7 @@
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
@@ -116,7 +116,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -113,7 +113,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@@ -27,7 +27,7 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -150,7 +150,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -147,7 +147,7 @@ class BASE_EXPORT ProcessMetrics {
base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
@@ -195,7 +195,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -192,7 +192,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -213,7 +213,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
@@ -238,12 +238,10 @@ class BASE_EXPORT ProcessMetrics {
@@ -235,12 +235,10 @@ class BASE_EXPORT ProcessMetrics {
// Used to store the previous times and CPU usage counts so we can
// compute the CPU usage between calls.
TimeTicks last_cpu_time_;
@@ -68,7 +68,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -284,7 +282,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -281,7 +279,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -77,7 +77,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -319,7 +317,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -316,7 +314,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -86,7 +86,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
@@ -334,7 +332,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -331,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -95,7 +95,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -371,7 +369,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -368,7 +366,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -104,7 +104,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -566,7 +564,7 @@ class BASE_EXPORT SystemMetrics {
@@ -563,7 +561,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;
@@ -1,6 +1,6 @@
--- base/process/process_metrics_freebsd.cc.orig 2024-06-17 12:56:06 UTC
--- base/process/process_metrics_freebsd.cc.orig 2024-10-23 07:00:35 UTC
+++ base/process/process_metrics_freebsd.cc
@@ -3,44 +3,58 @@
@@ -3,43 +3,58 @@
// found in the LICENSE file.
#include "base/process/process_metrics.h"
@@ -67,14 +67,13 @@
-base::expected<TimeDelta, ProcessCPUUsageError>
-ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED_IN_MIGRATION();
- return base::unexpected(ProcessCPUUsageError::kNotImplemented);
- NOTREACHED();
-}
-
size_t GetSystemCommitCharge() {
int mib[2], pagesize;
unsigned long mem_total, mem_free, mem_inactive;
@@ -62,6 +76,230 @@ size_t GetSystemCommitCharge() {
@@ -61,6 +76,230 @@ size_t GetSystemCommitCharge() {
pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
@@ -1,6 +1,6 @@
--- base/process/process_metrics_openbsd.cc.orig 2024-06-17 12:56:06 UTC
--- base/process/process_metrics_openbsd.cc.orig 2024-10-22 08:31:56 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -6,75 +6,50 @@
@@ -6,74 +6,50 @@
#include <stddef.h>
#include <stdint.h>
@@ -79,8 +79,7 @@
-
-base::expected<TimeDelta, ProcessCPUUsageError>
-ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED_IN_MIGRATION();
- return base::unexpected(ProcessCPUUsageError::kNotImplemented);
- NOTREACHED();
-}
-
-ProcessMetrics::ProcessMetrics(ProcessHandle process)
@@ -94,7 +93,7 @@
struct vmtotal vmtotal;
unsigned long mem_total, mem_free, mem_inactive;
size_t len = sizeof(vmtotal);
@@ -86,9 +61,136 @@ size_t GetSystemCommitCharge() {
@@ -85,9 +61,136 @@ size_t GetSystemCommitCharge() {
mem_free = vmtotal.t_free;
mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
@@ -1,6 +1,6 @@
--- base/process/process_unittest.cc.orig 2024-03-22 08:19:40 UTC
--- base/process/process_unittest.cc.orig 2024-10-22 08:31:56 UTC
+++ base/process/process_unittest.cc
@@ -199,7 +199,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
@@ -203,7 +203,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
// was spawned and a time recorded after it was spawned. However, since the
// base::Time and process creation clocks don't match, tolerate some error.
constexpr base::TimeDelta kTolerance =
@@ -1,4 +1,4 @@
--- base/rand_util_posix.cc.orig 2024-08-26 12:06:38 UTC
--- base/rand_util_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/rand_util_posix.cc
@@ -28,7 +28,7 @@
#include "base/time/time.h"
@@ -30,7 +30,7 @@
// TODO(pasko): Unify reading kernel version numbers in:
// mojo/core/channel_linux.cc
// chrome/browser/android/seccomp_support_detector.cc
@@ -181,6 +183,7 @@ bool UseBoringSSLForRandBytes() {
@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() {
namespace {
void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
@@ -38,7 +38,7 @@
#if !BUILDFLAG(IS_NACL)
// The BoringSSL experiment takes priority over everything else.
if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
@@ -217,6 +220,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
@@ -213,6 +216,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
const int urandom_fd = GetUrandomFD();
const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
CHECK(success);
@@ -48,7 +48,7 @@
}
} // namespace
@@ -236,9 +242,11 @@ void RandBytes(span<uint8_t> output) {
@@ -232,9 +238,11 @@ void RandBytes(span<uint8_t> output) {
RandBytesInternal(output, /*avoid_allocation=*/false);
}
@@ -1,6 +1,6 @@
--- base/system/sys_info_freebsd.cc.orig 2024-06-17 12:56:06 UTC
--- base/system/sys_info_freebsd.cc.orig 2024-10-22 08:31:56 UTC
+++ base/system/sys_info_freebsd.cc
@@ -9,30 +9,106 @@
@@ -9,28 +9,103 @@
#include <sys/sysctl.h>
#include "base/notreached.h"
@@ -21,7 +21,7 @@
+ }
+ return ncpu;
+}
+
+
+uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
+ int pages, page_size, r = 0;
size_t size = sizeof(pages);
@@ -31,12 +31,11 @@
+
+ if (r == 0)
+ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
+ if (r == 0)
+ if (r == 0)
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+
+ if (r == -1) {
NOTREACHED_IN_MIGRATION();
return 0;
NOTREACHED();
}
- return static_cast<int64_t>(pages) * page_size;
+
@@ -48,7 +47,7 @@
+ unsigned int pgfree, pginact, pgcache;
+ size_t size = sizeof(page_size);
+ size_t szpg = sizeof(pgfree);
+
+
+ if (r == 0)
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+ if (r == 0)
@@ -93,10 +92,8 @@
size_t size = sizeof(limit);
+
if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
NOTREACHED_IN_MIGRATION();
return 0;
NOTREACHED();
}
+
return static_cast<uint64_t>(limit);
+}
+
@@ -1,14 +1,6 @@
--- base/system/sys_info_openbsd.cc.orig 2024-06-17 12:56:06 UTC
--- base/system/sys_info_openbsd.cc.orig 2024-10-22 08:31:56 UTC
+++ base/system/sys_info_openbsd.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/system/sys_info.h"
-
#include <stddef.h>
#include <stdint.h>
#include <sys/param.h>
@@ -12,6 +11,7 @@
@@ -12,6 +12,7 @@
#include "base/notreached.h"
#include "base/posix/sysctl.h"
@@ -16,7 +8,7 @@
namespace {
@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) {
@@ -27,9 +28,14 @@ uint64_t AmountOfMemory(int pages_name) {
namespace base {
@@ -32,7 +24,7 @@
int ncpu;
size_t size = sizeof(ncpu);
if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() {
@@ -40,10 +46,26 @@ int SysInfo::NumberOfProcessors() {
// static
uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -47,12 +39,12 @@
+std::string SysInfo::CPUModelName() {
+ int mib[] = {CTL_HW, HW_MODEL};
+ size_t len = std::size(cpumodel);
+
+
+ if (cpumodel[0] == '\0') {
+ if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0)
+ return std::string();
+ }
+
+
+ return std::string(cpumodel, len - 1);
+}
+
@@ -60,7 +52,7 @@
uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
// We should add inactive file-backed memory also but there is no such
// information from OpenBSD unfortunately.
@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
@@ -55,15 +77,27 @@ uint64_t SysInfo::MaxSharedMemorySize() {
int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
size_t limit;
size_t size = sizeof(limit);
@@ -68,8 +60,7 @@
+ if (shmmax)
+ goto out;
if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) {
NOTREACHED_IN_MIGRATION();
return 0;
NOTREACHED();
}
- return static_cast<uint64_t>(limit);
+ shmmax = static_cast<uint64_t>(limit);
@@ -1,6 +1,6 @@
--- base/system/sys_info_posix.cc.orig 2024-03-22 08:19:40 UTC
--- base/system/sys_info_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/system/sys_info_posix.cc
@@ -118,7 +118,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
namespace base {
@@ -9,7 +9,7 @@
// static
int SysInfo::NumberOfProcessors() {
#if BUILDFLAG(IS_MAC)
@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() {
@@ -173,7 +173,7 @@ int SysInfo::NumberOfProcessors() {
return cached_num_cpus;
}
@@ -18,7 +18,7 @@
// static
uint64_t SysInfo::AmountOfVirtualMemory() {
@@ -265,6 +265,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
@@ -256,6 +256,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
arch = "x86";
} else if (arch == "amd64") {
arch = "x86_64";
@@ -1,6 +1,6 @@
--- base/threading/platform_thread_internal_posix.cc.orig 2024-03-22 08:19:40 UTC
--- base/threading/platform_thread_internal_posix.cc.orig 2024-10-22 08:31:56 UTC
+++ base/threading/platform_thread_internal_posix.cc
@@ -42,7 +42,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
}
int GetCurrentThreadNiceValue() {
@@ -1,4 +1,4 @@
--- base/threading/platform_thread_unittest.cc.orig 2024-06-17 12:56:06 UTC
--- base/threading/platform_thread_unittest.cc.orig 2024-10-22 08:31:56 UTC
+++ base/threading/platform_thread_unittest.cc
@@ -38,7 +38,7 @@
#include "base/time/time.h"
@@ -9,7 +9,7 @@
#include <pthread.h>
#include <sys/syscall.h>
#include <sys/types.h>
@@ -429,7 +429,7 @@ TEST(PlatformThreadTest,
@@ -362,7 +362,7 @@ TEST(PlatformThreadTest,
// and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
// proprerty changes for a given platform.
TEST(PlatformThreadTest, CanChangeThreadType) {
@@ -18,7 +18,7 @@
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level unless we are root (euid == 0).
bool kCanIncreasePriority = false;
@@ -713,12 +713,16 @@ INSTANTIATE_TEST_SUITE_P(
@@ -616,12 +616,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)
@@ -1,6 +1,6 @@
--- build/config/clang/BUILD.gn.orig 2024-09-30 07:45:04 UTC
--- build/config/clang/BUILD.gn.orig 2024-10-22 08:31:56 UTC
+++ build/config/clang/BUILD.gn
@@ -237,7 +237,12 @@ template("clang_lib") {
@@ -236,7 +236,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-09-30 07:45:04 UTC
--- build/config/compiler/BUILD.gn.orig 2024-10-22 08:31:56 UTC
+++ build/config/compiler/BUILD.gn
@@ -199,7 +199,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
@@ -9,7 +9,7 @@
}
declare_args() {
@@ -253,13 +253,16 @@ config("default_include_dirs") {
@@ -256,13 +256,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@@ -27,7 +27,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -505,6 +508,10 @@ config("compiler") {
@@ -508,6 +511,10 @@ config("compiler") {
}
}
@@ -38,7 +38,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_icf && (!is_apple || use_lld)) {
@@ -558,7 +565,7 @@ config("compiler") {
@@ -561,7 +568,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -47,7 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
@@ -1217,7 +1224,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" ]
@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
@@ -1232,7 +1239,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" ]
@@ -1562,7 +1569,7 @@ config("compiler_deterministic") {
@@ -1567,7 +1574,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",
@@ -1620,7 +1627,7 @@ config("compiler_deterministic") {
@@ -1625,7 +1632,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@@ -83,7 +83,7 @@
current_os != "zos") {
update_args = [
"--print-revision",
@@ -1950,9 +1957,6 @@ config("default_warnings") {
@@ -1955,9 +1962,6 @@ config("default_warnings") {
# TODO(crbug.com/40286317): Evaluate and possibly enable.
"-Wno-vla-extension",
@@ -93,7 +93,7 @@
]
cflags_cc += [
@@ -1960,17 +1964,11 @@ config("default_warnings") {
@@ -1965,17 +1969,11 @@ config("default_warnings") {
"-Wenum-compare-conditional",
]
@@ -112,7 +112,7 @@
}
}
@@ -2699,7 +2697,7 @@ config("afdo_optimize_size") {
@@ -2709,7 +2707,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 +121,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2726,7 +2724,7 @@ config("afdo") {
@@ -2736,7 +2734,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@@ -130,8 +130,8 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2891,7 +2889,7 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
@@ -2913,7 +2911,7 @@ config("symbols") {
cflags += [ "-gomit-unreferenced-methods" ]
}
- if (is_clang && (!is_nacl || is_nacl_saigo)) {
@@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2024-07-30 11:12:21 UTC
--- build/config/rust.gni.orig 2024-10-22 08:31:56 UTC
+++ build/config/rust.gni
@@ -270,6 +270,10 @@ if (is_linux || is_chromeos) {
@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) {
}
}
+2 -2
View File
@@ -1,6 +1,6 @@
--- cc/base/features.cc.orig 2024-08-26 12:06:38 UTC
--- cc/base/features.cc.orig 2024-10-22 08:31:56 UTC
+++ cc/base/features.cc
@@ -85,7 +85,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr
@@ -78,7 +78,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.cc.orig 2024-08-26 12:06:38 UTC
--- chrome/app/chrome_main.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/app/chrome_main.cc
@@ -30,11 +30,11 @@
#include "chrome/app/chrome_main_mac.h"
@@ -23,7 +23,7 @@
#define ENABLE_OLD_HEADLESS
#endif
@@ -119,7 +119,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -120,7 +120,7 @@ int ChromeMain(int argc, const char** argv) {
#error Unknown platform.
#endif
@@ -32,7 +32,7 @@
PossiblyDetermineFallbackChromeChannel(argv[0]);
#endif
@@ -185,7 +185,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -186,7 +186,7 @@ int ChromeMain(int argc, const char** argv) {
SetUpBundleOverrides();
#endif
@@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -144,7 +144,7 @@
@@ -145,7 +145,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@@ -9,12 +9,12 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -188,21 +188,21 @@
@@ -189,17 +189,17 @@
#include "v8/include/v8.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/environment.h"
#endif
@@ -24,18 +24,13 @@
#include "ui/linux/display_server_utils.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "base/message_loop/message_pump_libevent.h"
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -44,7 +39,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -428,7 +428,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -53,7 +48,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() {
@@ -474,7 +474,7 @@ void SetCrashpadUploadConsentPostLogin() {
}
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -62,7 +57,7 @@
void SIGTERMProfilingShutdown(int signal) {
content::Profiling::Stop();
struct sigaction sigact;
@@ -559,7 +559,7 @@ std::optional<int> AcquireProcessSingleton(
@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton(
// process can be exited.
ChromeProcessSingleton::CreateInstance(user_data_dir);
@@ -71,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.
@@ -643,7 +643,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -640,7 +640,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -80,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.
@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(const StartupTimestamps&
@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(const StartupTimestamps&
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -89,7 +84,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -967,7 +967,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
@@ -964,7 +964,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
#if BUILDFLAG(IS_OZONE)
// Initialize Ozone platform and add required feature flags as per platform's
// properties.
@@ -98,7 +93,7 @@
ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
#endif
ui::OzonePlatform::PreEarlyInitialization();
@@ -1165,7 +1165,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
@@ -1168,7 +1168,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) || \
@@ -107,7 +102,7 @@
is_canary_dev;
#else
false;
@@ -1320,7 +1320,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1318,7 +1318,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@@ -116,7 +111,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1350,7 +1350,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1348,7 +1348,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -125,7 +120,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1737,7 +1737,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1725,7 +1725,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@@ -134,7 +129,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess &&
!command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
@@ -1833,13 +1833,13 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1821,13 +1821,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-09-30 07:45:04 UTC
--- chrome/browser/BUILD.gn.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/BUILD.gn
@@ -6829,6 +6829,13 @@ static_library("browser") {
@@ -6905,6 +6905,13 @@ static_library("browser") {
}
}
@@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/about_flags.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/about_flags.cc
@@ -245,7 +245,7 @@
@@ -244,7 +244,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -339,7 +339,7 @@
@@ -337,7 +337,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)
@@ -348,7 +348,7 @@
@@ -346,7 +346,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)
@@ -358,7 +358,7 @@
@@ -356,7 +356,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
@@ -500,7 +500,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -498,7 +498,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,
@@ -783,6 +783,26 @@ const FeatureEntry::FeatureVariation
@@ -775,6 +775,26 @@ const FeatureEntry::FeatureVariation
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
nullptr}};
@@ -72,7 +72,7 @@
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
{"UIClipboardMaximumAge", "60"}};
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
@@ -1195,7 +1215,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
@@ -1188,7 +1208,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"},
};
@@ -1239,7 +1259,7 @@ const FeatureEntry::FeatureVariation
@@ -1232,7 +1252,7 @@ const FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -90,25 +90,25 @@
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"},
@@ -3719,7 +3739,7 @@ const flags_ui::FeatureEntry::FeatureVariation
@@ -3678,7 +3698,7 @@ const flags_ui::FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {
{"link_capturing_state", "on_by_default"}};
@@ -4892,7 +4912,7 @@ const FeatureEntry kFeatureEntries[] = {
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
{{"link_capturing_state", "on_by_default"}};
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
@@ -4920,7 +4940,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_ANDROID)
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -5303,7 +5323,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5332,7 +5352,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
#endif // !BUILDFLAG(IS_ANDROID)
@@ -117,7 +117,7 @@
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
flag_descriptions::kShortcutsNotAppsDescription,
kOsMac | kOsWin | kOsLinux,
@@ -5452,7 +5472,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5487,7 +5507,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -126,7 +126,7 @@
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5479,9 +5499,18 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5514,9 +5534,18 @@ const FeatureEntry kFeatureEntries[] = {
{"wayland-text-input-v3", flag_descriptions::kWaylandTextInputV3Name,
flag_descriptions::kWaylandTextInputV3Description, kOsLinux,
FEATURE_VALUE_TYPE(features::kWaylandTextInputV3)},
@@ -146,7 +146,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -6472,7 +6501,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6465,7 +6494,7 @@ const FeatureEntry kFeatureEntries[] = {
"MlUrlScoring")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -155,7 +155,7 @@
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6767,7 +6796,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6752,7 +6781,7 @@ const FeatureEntry kFeatureEntries[] = {
"OrganicRepeatableQueries")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -164,7 +164,7 @@
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
@@ -7401,7 +7430,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7341,7 +7370,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -173,7 +173,7 @@
{"cups-ipp-printing-backend",
flag_descriptions::kCupsIppPrintingBackendName,
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
@@ -8405,7 +8434,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8326,7 +8355,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCooperativeSchedulingDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kCooperativeScheduling)},
@@ -182,7 +182,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -8429,7 +8458,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8350,7 +8379,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
#endif
@@ -191,7 +191,7 @@
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -9267,7 +9296,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9184,7 +9213,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -200,7 +200,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -9306,7 +9335,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9217,7 +9246,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -209,17 +209,8 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9531,7 +9560,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
{"policy-indication-for-managed-default-search",
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
@@ -9869,7 +9898,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
@@ -9745,7 +9774,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_CHROMEOS)
@@ -227,7 +218,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -10762,7 +10791,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10592,7 +10621,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@@ -236,7 +227,7 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10800,7 +10829,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10630,7 +10659,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -245,7 +236,7 @@
{"site-search-settings-policy",
flag_descriptions::kSiteSearchSettingsPolicyName,
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
@@ -10929,7 +10958,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10759,7 +10788,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
@@ -254,25 +245,16 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10972,7 +11001,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10801,7 +10830,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"enable-user-link-capturing-pwa",
flag_descriptions::kDesktopPWAsUserLinkCapturingName,
flag_descriptions::kDesktopPWAsUserLinkCapturingDescription,
@@ -11262,7 +11291,7 @@ const FeatureEntry kFeatureEntries[] = {
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
#endif
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"restart-to-gain-access-to-keychain",
flag_descriptions::kRestartToGainAccessToKeychainName,
flag_descriptions::kRestartToGainAccessToKeychainDescription,
@@ -11925,7 +11954,7 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-user-navigation-capturing-pwa",
flag_descriptions::kPwaNavigationCapturingName,
flag_descriptions::kPwaNavigationCapturingDescription,
@@ -11726,7 +11755,7 @@ const FeatureEntry kFeatureEntries[] = {
kAuthenticateUsingUserConsentVerifierInteropApi)},
#endif
@@ -281,8 +263,8 @@
{"sync-enable-bookmarks-in-transport-mode",
flag_descriptions::kSyncEnableBookmarksInTransportModeName,
flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
@@ -12001,7 +12030,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_WIN)
@@ -11816,7 +11845,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_WIN)
@@ -290,7 +272,7 @@
{"classify-url-on-process-response-event",
flag_descriptions::kClassifyUrlOnProcessResponseEventName,
flag_descriptions::kClassifyUrlOnProcessResponseEventDescription,
@@ -12010,7 +12039,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11825,7 +11854,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -299,7 +281,7 @@
{"tab-organization", flag_descriptions::kTabOrganizationName,
flag_descriptions::kTabOrganizationDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kTabOrganization)},
@@ -12049,7 +12078,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11864,7 +11893,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kLanguageDetectionAPIDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)},
@@ -1,6 +1,15 @@
--- chrome/browser/browser_features.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/browser_features.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/browser_features.cc
@@ -69,7 +69,7 @@ BASE_FEATURE(kClosedTabCache,
@@ -71,7 +71,7 @@ BASE_FEATURE(kClosedTabCache,
"ClosedTabCache",
base::FEATURE_DISABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Enables usage of os_crypt_async::SecretPortalKeyProvider. Once
// `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
// disabled without losing data.
@@ -87,7 +87,7 @@ BASE_FEATURE(kDbusSecretPortal,
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -9,7 +18,16 @@
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -328,7 +328,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
@@ -347,7 +347,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
"SandboxExternalProtocolBlockedWarning",
base::FEATURE_ENABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// 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) || \
@@ -0,0 +1,20 @@
--- chrome/browser/browser_features.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/browser_features.h
@@ -29,7 +29,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore
BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
BASE_DECLARE_FEATURE(kClosedTabCache);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
BASE_DECLARE_FEATURE(kDbusSecretPortal);
#endif
@@ -143,7 +143,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed
BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
BASE_DECLARE_FEATURE(kSecretPortalKeyProviderUseForEncryption);
#endif
@@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/browser_process_impl.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -228,7 +228,7 @@
@@ -235,7 +235,7 @@
#include "chrome/browser/ui/profiles/profile_picker.h"
#endif
@@ -9,7 +9,25 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1277,7 +1277,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -256,7 +256,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_features.h"
#include "components/os_crypt/async/browser/secret_portal_key_provider.h"
#endif
@@ -1124,7 +1124,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim
GoogleUpdateSettings::GetCollectStatsConsent());
registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
#endif
}
@@ -1307,7 +1307,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +36,16 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1614,7 +1614,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1404,7 +1404,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
}
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) {
providers.emplace_back(
/*precedence=*/10u,
@@ -1655,7 +1655,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/browser_process_impl.h.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/browser_process_impl.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/browser_process_impl.h
@@ -403,7 +403,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -405,7 +405,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -127,12 +127,12 @@
@@ -128,12 +128,12 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -219,7 +219,7 @@
@@ -221,7 +221,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -24,7 +24,7 @@
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
#include "chrome/browser/screen_ai/screen_ai_service_router.h"
#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
@@ -232,7 +232,7 @@
@@ -234,7 +234,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)
@@ -846,7 +846,7 @@ void BindMediaFoundationPreferences(
@@ -859,7 +859,7 @@ void BindMediaFoundationPreferences(
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -42,7 +42,7 @@
void BindScreenAIAnnotator(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) {
@@ -1063,7 +1063,7 @@ void PopulateChromeFrameBinders(
@@ -1083,7 +1083,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -51,7 +51,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
@@ -1159,7 +1159,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1179,7 +1179,7 @@ void PopulateChromeWebUIFrameBinders(
DataSharingInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1170,7 +1170,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1190,7 +1190,7 @@ void PopulateChromeWebUIFrameBinders(
policy::DlpInternalsUI>(map);
#endif
@@ -69,7 +69,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1256,14 +1256,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -1276,14 +1276,14 @@ void PopulateChromeWebUIFrameBinders(
page_image_service::mojom::PageImageServiceHandler, HistoryUI,
HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
@@ -86,7 +86,7 @@
WhatsNewUI,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
NewTabPageUI>(map);
@@ -1750,7 +1750,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1779,7 +1779,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -247,15 +247,15 @@
@@ -249,15 +249,15 @@
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -19,7 +19,7 @@
#include "base/nix/xdg_util.h"
#endif
@@ -288,14 +288,14 @@
@@ -290,14 +290,14 @@
// 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) || \
@@ -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"
@@ -367,14 +367,14 @@
@@ -369,14 +369,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");
@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl(
@@ -541,7 +541,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.
@@ -1105,7 +1105,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1118,7 +1118,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 .
@@ -1153,7 +1153,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1166,7 +1166,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(
@@ -1340,7 +1340,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1362,7 +1362,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(
@@ -1389,7 +1389,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1411,7 +1411,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -98,7 +98,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1501,7 +1501,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1523,7 +1523,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();
}
@@ -2050,7 +2050,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -2072,7 +2072,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-08-26 12:06:38 UTC
--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -25,7 +25,7 @@
#include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
@@ -28,7 +28,7 @@
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
@@ -169,7 +171,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl
@@ -170,7 +172,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
@@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -488,7 +488,7 @@
@@ -491,7 +491,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)
@@ -605,12 +605,12 @@
@@ -608,12 +608,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
@@ -621,7 +621,7 @@
@@ -624,7 +624,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"
@@ -629,7 +629,7 @@
@@ -632,7 +632,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)
@@ -644,7 +644,7 @@
@@ -647,7 +647,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"
@@ -1592,7 +1592,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1603,7 +1603,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)
@@ -1792,7 +1792,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1803,7 +1803,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)
@@ -1826,7 +1826,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1837,7 +1837,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
@@ -1847,7 +1847,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1858,7 +1858,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>());
@@ -1866,7 +1866,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1877,7 +1877,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@@ -96,7 +96,7 @@
main_parts->AddParts(
std::make_unique<
enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2740,7 +2740,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial(
@@ -2749,7 +2749,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();
@@ -2749,7 +2751,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2758,7 +2760,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
client_info->client_id);
}
#elif BUILDFLAG(IS_POSIX)
@@ -115,7 +115,7 @@
pid_t pid;
if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
command_line->AppendSwitchASCII(
@@ -3101,7 +3103,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -3117,7 +3119,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
}
}
@@ -124,7 +124,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4928,7 +4930,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4941,7 +4943,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -133,7 +133,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5524,7 +5526,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5530,7 +5532,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -142,7 +142,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5538,7 +5540,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5544,7 +5546,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -151,7 +151,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5577,7 +5579,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5583,7 +5585,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@@ -160,7 +160,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7518,7 +7520,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7543,7 +7545,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/download/chrome_download_manager_delegate.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1763,7 +1763,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1796,7 +1796,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();
}
@@ -1911,7 +1911,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1942,7 +1942,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1989,7 +1989,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -2020,7 +2020,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -1,4 +1,4 @@
--- chrome/browser/download/download_commands.cc.orig 2024-06-17 12:56:06 UTC
--- chrome/browser/download/download_commands.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/download/download_commands.cc
@@ -26,7 +26,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command)
@@ -166,7 +166,7 @@ void DownloadCommands::ExecuteCommand(Command command)
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2024-08-26 12:06:38 UTC
--- chrome/browser/download/download_item_model.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -814,7 +814,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -790,7 +790,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();
@@ -862,7 +862,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -838,7 +838,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);
@@ -1260,7 +1260,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1227,7 +1227,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}
@@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/download/download_prefs.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
@@ -8,7 +8,7 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
@@ -64,6 +65,10 @@
@@ -60,6 +61,10 @@
#include "chrome/browser/flags/android/chrome_feature_list.h"
#endif
@@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -74,7 +79,7 @@ namespace {
@@ -70,7 +75,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
@@ -176,7 +181,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -300,7 +305,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -471,7 +476,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -467,7 +472,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -503,7 +508,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -493,7 +498,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -540,7 +545,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -530,7 +535,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -692,7 +697,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -682,7 +687,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.
@@ -1,15 +1,15 @@
--- chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc.orig 2024-09-30 07:45:04 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc
@@ -16,7 +16,7 @@
#include "components/crash/core/common/crash_key.h"
#include "components/signin/public/identity_manager/identity_manager.h"
--- chrome/browser/enterprise/connectors/common.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/enterprise/connectors/common.cc
@@ -23,7 +23,7 @@
#include "components/policy/core/common/policy_loader_lacros.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#include "components/prefs/pref_service.h"
#endif
@@ -419,7 +419,7 @@ std::string GetProfileEmail(Profile* profile) {
@@ -266,7 +266,7 @@ std::string GetProfileEmail(Profile* profile) {
std::string email =
GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
@@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -546,7 +546,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
@@ -528,7 +528,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);
@@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
@@ -18,7 +18,7 @@
@@ -19,7 +19,7 @@
#if BUILDFLAG(IS_WIN)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h"
@@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -59,7 +59,7 @@
#include "base/strings/utf_string_conversions.h"
@@ -36,9 +36,9 @@
Profile* profile = Profile::FromBrowserContext(context_);
device_signals::SignalsAggregator* signals_aggregator =
enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile);
@@ -505,7 +505,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
? safe_browsing::GetProfileEmail(identity_manager_)
: std::string();
@@ -504,7 +504,7 @@ std::string RealtimeReportingClient::GetProfileUserNam
std::string username =
identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
@@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1535,6 +1535,10 @@ source_set("extensions") {
@@ -1499,6 +1499,10 @@ source_set("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
@@ -8,6 +8,6 @@
+ sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ]
+ }
+
if (enable_service_discovery) {
sources += [
"api/mdns/mdns_api.cc",
if (enable_pdf) {
deps += [
"//chrome/browser/pdf",
@@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -43,7 +43,7 @@
@@ -41,7 +41,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
@@ -119,7 +119,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
@@ -117,7 +117,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-09-30 07:45:04 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -38,7 +38,7 @@
@@ -41,7 +41,7 @@
#include "components/reporting/util/statusor.h"
#endif
@@ -9,7 +9,7 @@
#include <optional>
#include "base/strings/string_util.h"
@@ -155,7 +155,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
@@ -158,7 +158,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
return info;
}
@@ -18,7 +18,7 @@
device_signals::SignalsAggregationRequest CreateAggregationRequest(
device_signals::SignalName signal_name) {
@@ -217,7 +217,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
@@ -220,7 +220,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
@@ -643,7 +643,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
@@ -646,7 +646,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif
@@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-08-26 12:06:38 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -630,7 +630,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
@@ -636,7 +636,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
@@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-07-30 11:12:21 UTC
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
@@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "openbsd") == 0) {
@@ -1,6 +1,15 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -193,7 +193,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) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
(*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
settings_api::PrefType::kBoolean;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
settings_api::PrefType::kBoolean;
@@ -9,7 +18,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::kBoolean;
#endif
@@ -216,7 +216,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -223,7 +223,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,6 +1,6 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-10-26 13:10:01 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -891,7 +891,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
@@ -886,7 +886,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
// minimized.
// TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
// TODO(crbug.com/40254339): Find a fix for wayland as well.
@@ -1,6 +1,6 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-07-30 11:12:21 UTC
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -834,7 +834,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -816,7 +816,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -862,7 +862,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.
@@ -1,11 +1,11 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -321,7 +321,7 @@ const struct {
@@ -324,7 +324,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// On Linux also block access to devices via /dev.
{kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren},
// And security sensitive data in /proc and /sys.
@@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/flag_descriptions.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -464,7 +464,7 @@ const char kIsolatedSandboxedIframesDescription[] =
@@ -458,7 +458,7 @@ const char kIsolatedSandboxedIframesDescription[] =
"grouping when enabled is per-site.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
const char kAutofillEnableAmountExtractionDesktopName[] =
"Enable checkout amount extraction on Chrome desktop";
const char kAutofillEnableAmountExtractionDesktopDescription[] =
@@ -909,7 +909,7 @@ const char kDevicePostureDescription[] =
@@ -939,7 +939,7 @@ const char kDevicePostureDescription[] =
"Enables Device Posture API (foldable devices)";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,16 +18,7 @@
const char kDocumentPictureInPictureAnimateResizeName[] =
"Document Picture-in-Picture Animate Resize";
const char kDocumentPictureInPictureAnimateResizeDescription[] =
@@ -3130,7 +3130,7 @@ const char kCbdTimeframeRequiredDescription[] =
"value to the list.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
const char kPolicyIndicationForManagedDefaultSearchName[] =
"Enable policy indication for managed Default Search provider";
const char kPolicyIndicationForManagedDefaultSearchDescription[] =
@@ -3472,7 +3472,7 @@ const char kShowAutofillTypePredictionsDescription[] =
@@ -3519,7 +3519,7 @@ const char kShowAutofillTypePredictionsDescription[] =
"text.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +27,7 @@
const char kShowFeaturedEnterpriseSiteSearchName[] =
"Show featured Enterprise site search engines in Omnibox";
const char kShowFeaturedEnterpriseSiteSearchDescription[] =
@@ -3509,7 +3509,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) || \
@@ -45,8 +36,8 @@
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
const char kSiteSearchSettingsPolicyDescription[] =
"Allow site search engines to be defined by the SiteSearchSettings policy.";
@@ -7950,7 +7950,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
@@ -7912,7 +7912,7 @@ const char kBlinkExtensionDiagnosticsDescription[] =
"Enable the experimental Diagnostics Blink Extension.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -54,7 +45,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -8198,7 +8198,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
@@ -8148,7 +8148,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
// Linux -----------------------------------------------------------------------
@@ -63,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -8231,6 +8231,18 @@ const char kWaylandPerWindowScalingDescription[] =
@@ -8181,6 +8181,18 @@ const char kWaylandPerWindowScalingDescription[] =
const char kWaylandTextInputV3Name[] = "Wayland text-input-v3";
const char kWaylandTextInputV3Description[] =
"Enable Wayland's text-input-v3 experimental support.";
@@ -82,7 +73,7 @@
#endif // BUILDFLAG(IS_LINUX)
// All views-based platforms --------------------------------------------------
@@ -8257,14 +8269,14 @@ const char kZeroCopyVideoCaptureDescription[] =
@@ -8207,7 +8219,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) || \
@@ -91,15 +82,16 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -8220,7 +8232,7 @@ const char kTaskManagerDesktopRefreshDescription[] =
"Enables a refreshed design for the Task Manager on Desktop platforms.";
#endif // BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -8296,7 +8308,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -8252,7 +8264,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -108,7 +100,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -8450,7 +8462,7 @@ const char kElementCaptureDescription[] =
@@ -8398,7 +8410,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -117,7 +109,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -8524,7 +8536,7 @@ const char kAutofillCaretExtractionDescription[] =
@@ -8472,7 +8484,7 @@ const char kAutofillCaretExtractionDescription[] =
"Enables passing caret position via Autofill";
#endif // BUILDFLAG(ENABLE_COMPOSE)
@@ -126,7 +118,7 @@
const char kThirdPartyProfileManagementName[] =
"Third party profile management";
const char kThirdPartyProfileManagementDescription[] =
@@ -8613,7 +8625,7 @@ const char kEnableCertManagementV2UIDescription[] =
@@ -8561,7 +8573,7 @@ const char kEnableCertManagementV2UIDescription[] =
"chrome://settings/certificates";
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -1,7 +1,7 @@
--- chrome/browser/flag_descriptions.h.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/flag_descriptions.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/flag_descriptions.h
@@ -299,7 +299,7 @@ extern const char kImageDescriptionsAlternateRoutingNa
extern const char kImageDescriptionsAlternateRoutingDescription[];
@@ -297,7 +297,7 @@ extern const char kImprovedSigninUIOnDesktopName[];
extern const char kImprovedSigninUIOnDesktopDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
@@ -9,7 +9,7 @@
extern const char kAutofillEnableAmountExtractionDesktopName[];
extern const char kAutofillEnableAmountExtractionDesktopDescription[];
#endif
@@ -694,7 +694,7 @@ extern const char kDevicePostureName[];
@@ -715,7 +715,7 @@ extern const char kDevicePostureName[];
extern const char kDevicePostureDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,16 +18,7 @@
extern const char kDocumentPictureInPictureAnimateResizeName[];
extern const char kDocumentPictureInPictureAnimateResizeDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
@@ -1805,7 +1805,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif
@@ -2003,7 +2003,7 @@ extern const char kShowAutofillTypePredictionsName[];
@@ -2022,7 +2022,7 @@ extern const char kShowAutofillTypePredictionsName[];
extern const char kShowAutofillTypePredictionsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +27,7 @@
extern const char kShowFeaturedEnterpriseSiteSearchName[];
extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
@@ -2025,7 +2025,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
@@ -2044,7 +2044,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -45,8 +36,8 @@
extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[];
@@ -4604,7 +4604,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
@@ -4576,7 +4576,7 @@ extern const char kBlinkExtensionDiagnosticsName[];
extern const char kBlinkExtensionDiagnosticsDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -54,7 +45,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4750,7 +4750,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
@@ -4713,7 +4713,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux ---------------------------------------------------------------------
@@ -63,7 +54,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4772,6 +4772,9 @@ extern const char kWaylandPerWindowScalingDescription[
@@ -4735,6 +4735,9 @@ extern const char kWaylandPerWindowScalingDescription[
extern const char kWaylandTextInputV3Name[];
extern const char kWaylandTextInputV3Description[];
@@ -73,7 +64,7 @@
#endif // BUILDFLAG(IS_LINUX)
// All views-based platforms --------------------------------------------------
@@ -4801,7 +4804,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4764,7 +4767,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -82,7 +73,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4820,13 +4823,13 @@ extern const char kScreenlockReauthPromoCardDescriptio
@@ -4780,7 +4783,7 @@ extern const char kScreenlockReauthPromoCardDescriptio
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -91,14 +82,16 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -4791,7 +4794,7 @@ extern const char kTaskManagerDesktopRefreshName[];
extern const char kTaskManagerDesktopRefreshDescription[];
#endif // BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4925,7 +4928,7 @@ extern const char kElementCaptureDescription[];
@@ -4888,7 +4891,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -107,7 +100,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
#endif
@@ -4979,7 +4982,7 @@ extern const char kAutofillCaretExtractionName[];
@@ -4942,7 +4945,7 @@ extern const char kAutofillCaretExtractionName[];
extern const char kAutofillCaretExtractionDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
@@ -116,7 +109,7 @@
extern const char kThirdPartyProfileManagementName[];
extern const char kThirdPartyProfileManagementDescription[];
@@ -5035,7 +5038,7 @@ extern const char kEnableCertManagementV2UIName[];
@@ -4998,7 +5001,7 @@ extern const char kEnableCertManagementV2UIName[];
extern const char kEnableCertManagementV2UIDescription[];
#endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -1,4 +1,4 @@
--- chrome/browser/memory_details.cc.orig 2024-06-17 12:56:06 UTC
--- chrome/browser/memory_details.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/memory_details.cc
@@ -38,7 +38,7 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
@@ -9,7 +9,7 @@
#include "content/public/browser/zygote_host/zygote_host_linux.h"
#endif
@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
});
}
@@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-08-26 12:06:38 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -196,11 +196,11 @@
@@ -195,11 +195,11 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@@ -59,7 +59,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -950,7 +950,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -951,7 +951,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)
@@ -1137,7 +1137,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1138,7 +1138,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(
@@ -1471,7 +1471,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
@@ -1472,7 +1472,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-09-30 07:45:04 UTC
--- chrome/browser/net/profile_network_context_service.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/net/profile_network_context_service.cc
@@ -138,7 +138,7 @@
@@ -140,7 +140,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"
@@ -258,7 +258,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet
@@ -260,7 +260,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) {
@@ -975,7 +975,7 @@ ProfileNetworkContextService::CreateClientCertStore()
@@ -986,7 +986,7 @@ ProfileNetworkContextService::CreateClientCertStore()
store = std::make_unique<ClientCertStoreLacros>(
std::move(certificate_provider), cert_db_initializer, std::move(store));
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -101,7 +101,7 @@
@@ -102,7 +102,7 @@
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/branded_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -145,7 +145,7 @@ SystemNetworkContextManager* g_system_network_context_
@@ -146,7 +146,7 @@ SystemNetworkContextManager* g_system_network_context_
// received a failed launch for a sandboxed network service.
bool g_previously_failed_to_launch_sandboxed_service = false;
@@ -18,7 +18,7 @@
// Whether kerberos library loading will work in the network service due to the
// sandbox.
bool g_network_service_will_allow_gssapi_library_load = false;
@@ -153,7 +153,7 @@ bool g_network_service_will_allow_gssapi_library_load
@@ -154,7 +154,7 @@ bool g_network_service_will_allow_gssapi_library_load
const char* kGssapiDesiredPref =
#if BUILDFLAG(IS_CHROMEOS)
prefs::kKerberosEnabled;
@@ -27,7 +27,7 @@
prefs::kReceivedHttpAuthNegotiateHeader;
#endif
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -199,7 +199,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -200,7 +200,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@@ -36,7 +36,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
#endif // BUILDFLAG(IS_ANDROID)
@@ -45,7 +45,7 @@
auth_dynamic_params->allow_gssapi_library_load =
local_state->GetBoolean(kGssapiDesiredPref);
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -224,7 +224,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -225,7 +225,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
void OnNewHttpAuthDynamicParams(
network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -54,7 +54,7 @@
// The kerberos library is incompatible with the network service sandbox, so
// if library loading is now enabled, the network service needs to be
// restarted. It will be restarted unsandboxed because is
@@ -266,11 +266,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -267,11 +267,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
@@ -68,7 +68,7 @@
// The network service sandbox and the kerberos library are incompatible.
// If kerberos is enabled by policy, disable the network service sandbox.
if (g_network_service_will_allow_gssapi_library_load ||
@@ -286,7 +286,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -287,7 +287,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
@@ -77,7 +77,7 @@
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
@@ -516,7 +516,7 @@ void SystemNetworkContextManager::DeleteInstance() {
@@ -517,7 +517,7 @@ void SystemNetworkContextManager::DeleteInstance() {
g_system_network_context_manager = nullptr;
}
@@ -86,7 +86,7 @@
SystemNetworkContextManager::GssapiLibraryLoadObserver::
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
: owner_(owner) {}
@@ -574,7 +574,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -575,7 +575,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -95,7 +95,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -588,7 +588,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -589,7 +589,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
auth_pref_callback);
#endif // BUILDFLAG(IS_ANDROID)
@@ -104,7 +104,7 @@
pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -658,7 +658,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -660,7 +660,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -113,7 +113,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -683,11 +683,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -685,11 +685,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@@ -127,7 +127,7 @@
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
@@ -740,7 +740,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
@@ -742,7 +742,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@@ -136,7 +136,7 @@
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -955,7 +955,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
@@ -969,7 +969,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}
@@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.h.orig 2024-08-26 12:06:38 UTC
--- chrome/browser/net/system_network_context_manager.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/net/system_network_context_manager.h
@@ -197,7 +197,7 @@ class SystemNetworkContextManager {
@@ -198,7 +198,7 @@ class SystemNetworkContextManager {
class URLLoaderFactoryForSystem;
class NetworkProcessLaunchWatcher;
@@ -9,7 +9,7 @@
class GssapiLibraryLoadObserver
: public network::mojom::GssapiLibraryLoadObserver {
public:
@@ -278,7 +278,7 @@ class SystemNetworkContextManager {
@@ -279,7 +279,7 @@ class SystemNetworkContextManager {
std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_;
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -1,6 +1,6 @@
--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-05-21 18:07:39 UTC
--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc
@@ -32,7 +32,7 @@
@@ -34,7 +34,7 @@
#include "services/network/public/cpp/resource_request.h"
namespace {
@@ -1,6 +1,6 @@
--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/new_tab_page/new_tab_page_util.cc
@@ -24,7 +24,7 @@ bool IsOsSupportedForCart() {
@@ -25,7 +25,7 @@ bool IsOsSupportedForCart() {
}
bool IsOsSupportedForDrive() {
@@ -1,15 +1,15 @@
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -557,7 +557,7 @@ void ChromePasswordManagerClient::
@@ -590,7 +590,7 @@ void ChromePasswordManagerClient::
bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
device_reauth::DeviceAuthenticator* authenticator) {
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
return false;
}
@@ -795,7 +795,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
@@ -828,7 +828,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
}
void ChromePasswordManagerClient::NotifyKeychainError() {
@@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -245,19 +245,19 @@
@@ -247,19 +247,19 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -23,7 +23,7 @@
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -271,13 +271,13 @@
@@ -273,13 +273,13 @@
#endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,10 +36,10 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/search_engines/site_search_policy_handler.h"
#include "components/search_engines/enterprise/site_search_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -554,7 +554,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -559,7 +559,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 },
@@ -896,7 +896,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -901,7 +901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -57,7 +57,7 @@
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
@@ -905,7 +905,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -910,7 +910,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -66,8 +66,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1730,7 +1730,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
@@ -1738,7 +1738,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@@ -75,7 +75,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1787,7 +1787,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1797,7 +1797,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@@ -84,7 +84,7 @@
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1813,12 +1813,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1823,12 +1823,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -99,7 +99,7 @@
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
@@ -1826,7 +1826,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1836,7 +1836,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kProfileSeparationDomainExceptionList,
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -108,7 +108,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1838,7 +1838,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1848,7 +1848,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) \
@@ -117,7 +117,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1939,7 +1939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -126,7 +126,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -2053,7 +2053,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2066,7 +2066,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -135,7 +135,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -2132,7 +2132,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2145,7 +2145,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -144,7 +144,7 @@
{ key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST },
@@ -2161,7 +2161,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2174,7 +2174,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kUiAutomationProviderEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@@ -153,7 +153,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2204,7 +2204,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2217,7 +2217,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER },
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -162,7 +162,7 @@
{ key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST},
@@ -2227,7 +2227,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2240,7 +2240,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kTabCompareSettings,
optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
base::Value::Type::INTEGER},
@@ -171,7 +171,7 @@
{ key::kChromeForTestingAllowed,
prefs::kChromeForTestingAllowed,
base::Value::Type::BOOLEAN },
@@ -2365,7 +2365,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2378,7 +2378,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -180,7 +180,7 @@
handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
key::kMemorySaverModeSavings,
performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
@@ -2381,7 +2381,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -189,7 +189,7 @@
handlers->AddHandler(
std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
@@ -2594,7 +2594,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2607,7 +2607,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -198,7 +198,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2647,7 +2647,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2660,7 +2660,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -207,7 +207,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
@@ -2732,7 +2732,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2745,7 +2745,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -216,7 +216,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -3101,7 +3101,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3116,7 +3116,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -225,7 +225,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -3109,7 +3109,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3124,7 +3124,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -234,7 +234,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -3127,7 +3127,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3142,7 +3142,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
key::kRelatedWebsiteSetsOverrides, chrome_schema)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -243,7 +243,7 @@
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -3150,7 +3150,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -3165,7 +3165,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -252,3 +252,12 @@
handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -3189,7 +3189,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);
@@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -308,7 +308,7 @@
@@ -313,7 +313,7 @@
#include "components/user_notes/user_notes_prefs.h"
#endif // BUILDFLAG(IS_ANDROID)
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
#endif
@@ -488,18 +488,18 @@
@@ -491,18 +491,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 @@
@@ -537,7 +537,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@@ -40,8 +40,8 @@
#include "ui/color/system_theme.h"
#endif
@@ -1595,7 +1595,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
registry->RegisterIntegerPref(prefs::kLastWhatsNewVersion, 0);
@@ -1678,7 +1678,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
on_device_translation::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -49,7 +49,7 @@
WhatsNewUI::RegisterLocalStatePrefs(registry);
#endif
@@ -1772,7 +1772,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1854,7 +1854,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
@@ -2129,12 +2129,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -2213,12 +2213,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-09-30 07:45:04 UTC
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -196,7 +196,7 @@ const char* const kPersistentPrefNames[] = {
@@ -198,7 +198,7 @@ const char* const kPersistentPrefNames[] = {
prefs::kShowFullscreenToolbar,
#endif
@@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -341,7 +341,7 @@
@@ -347,7 +347,7 @@
#include "chromeos/constants/chromeos_features.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
#endif
@@ -427,18 +427,18 @@
@@ -440,18 +440,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -31,7 +31,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
#include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
@@ -679,7 +679,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -706,7 +706,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance();
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
@@ -40,7 +40,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
@@ -814,7 +814,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -839,7 +839,7 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_connectors::ConnectorsServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -49,7 +49,7 @@
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
#endif
@@ -822,25 +822,25 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -847,25 +847,25 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance();
enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
#endif
@@ -80,7 +80,7 @@
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -972,7 +972,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -89,7 +89,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
@@ -1077,7 +1077,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1100,7 +1100,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
@@ -98,7 +98,7 @@
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
policy::UserPolicyOidcSigninServiceFactory::GetInstance();
#endif
@@ -1122,7 +1122,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1149,7 +1149,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
ProfileStatisticsFactory::GetInstance();
#endif
@@ -107,7 +107,7 @@
ProfileTokenWebSigninInterceptorFactory::GetInstance();
OidcAuthenticationSigninInterceptorFactory::GetInstance();
#endif
@@ -1138,7 +1138,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1168,7 +1168,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
ReduceAcceptLanguageFactory::GetInstance();
RendererUpdaterFactory::GetInstance();
@@ -1,6 +1,6 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -266,6 +266,10 @@
@@ -267,6 +267,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -600,7 +604,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
@@ -603,7 +607,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else
{
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -20,7 +20,7 @@
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage()
@@ -903,7 +907,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -908,7 +912,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
@@ -1,6 +1,6 @@
--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/screen_ai/screen_ai_service_router.cc
@@ -297,7 +297,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
@@ -324,7 +324,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
base::FilePath binary_path = state_instance->get_component_binary_path();
#if BUILDFLAG(IS_WIN)
std::vector<base::FilePath> preload_libraries = {binary_path};
@@ -9,7 +9,7 @@
std::vector<std::string> extra_switches = {
base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
binary_path.MaybeAsASCII().c_str())};
@@ -311,7 +311,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
@@ -338,7 +338,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
.WithPreloadedLibraries(
preload_libraries,
content::ServiceProcessHostPreloadLibraries::GetPassKey())
@@ -1,6 +1,6 @@
--- chrome/browser/sessions/session_restore.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/sessions/session_restore.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/sessions/session_restore.cc
@@ -99,7 +99,7 @@
@@ -103,7 +103,7 @@
#include "chrome/browser/web_applications/web_app_registrar.h"
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1051,7 +1051,7 @@ class SessionRestoreImpl : public BrowserListObserver
@@ -1076,7 +1076,7 @@ class SessionRestoreImpl : public BrowserListObserver
bool is_first_tab = true;
for (const auto& startup_tab : startup_tabs) {
const GURL& url = startup_tab.url;
@@ -1,6 +1,6 @@
--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/supervised_user/supervised_user_browser_utils.cc
@@ -40,7 +40,7 @@
@@ -42,7 +42,7 @@
#include "components/user_manager/user_type.h"
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
#include "chromeos/startup/browser_params_proxy.h"
@@ -9,8 +9,8 @@
#include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
#include "chrome/browser/supervised_user/supervised_user_verification_page.h"
#endif
@@ -178,7 +178,7 @@ bool IsAuthenticatedSupervisedProfile(Profile* profile
supervised_user::ChildAccountService::AuthState::AUTHENTICATED;
@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool
#endif
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -1,4 +1,4 @@
--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/supervised_user/supervised_user_browser_utils.h
@@ -11,7 +11,7 @@
#include "content/public/browser/web_contents.h"
@@ -9,9 +9,9 @@
#include "chrome/browser/supervised_user/supervised_user_verification_page.h"
#endif
@@ -59,7 +59,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool
// content area.
bool IsAuthenticatedSupervisedProfile(Profile* profile);
@@ -55,7 +55,7 @@ std::string GetAccountGivenName(Profile& profile);
// of the user.
void AssertChildStatusOfTheUser(Profile* profile, bool is_child);
-#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/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
@@ -26,7 +26,7 @@
@@ -29,7 +29,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
#include "chrome/browser/supervised_user/supervised_user_verification_page.h"
#endif
@@ -140,7 +140,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
@@ -145,7 +145,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
return content::NavigationThrottle::DEFER;
}
@@ -1,11 +1,20 @@
--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
@@ -212,7 +212,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR
@@ -201,7 +201,7 @@ void SupervisedUserNavigationThrottle::OnCheckDone(
}
}
-#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(
supervised_user::
kForceSupervisedUserReauthenticationForBlockedSites) &&
@@ -1,47 +0,0 @@
--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-09-30 07:45:04 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -119,7 +119,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#elif BUILDFLAG(IS_ANDROID)
@@ -233,7 +233,7 @@ bool ShouldSyncAppsTypesInTransportMode() {
syncer::DataTypeControllerDelegate* GetSavedTabGroupControllerDelegate(
Profile* profile) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
auto* keyed_service =
tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile);
CHECK(keyed_service);
@@ -251,7 +251,7 @@ syncer::DataTypeControllerDelegate* GetSavedTabGroupCo
syncer::DataTypeControllerDelegate* GetSharedTabGroupControllerDelegate(
Profile* profile) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
tab_groups::SavedTabGroupKeyedService* keyed_service =
tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile);
CHECK(keyed_service);
@@ -544,7 +544,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// platforms.
bool enable_tab_group_sync = false;
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
enable_tab_group_sync = true;
#elif BUILDFLAG(IS_ANDROID)
enable_tab_group_sync =
@@ -585,7 +585,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
@@ -0,0 +1,11 @@
--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/sync/chrome_sync_controller_builder.cc
@@ -324,7 +324,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService
#if BUILDFLAG(ENABLE_SPELLCHECK)
// Chrome prefers OS provided spell checkers where they exist. So only sync
// the custom dictionary on platforms that typically don't provide one.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Dictionary sync is enabled by default.
if (spellcheck_service_.value()) {
controllers.push_back(
@@ -1,24 +1,33 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/sync/sync_service_factory.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -85,7 +85,7 @@
@@ -105,7 +105,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#elif BUILDFLAG(IS_ANDROID)
#include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h"
@@ -134,7 +134,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/40118868): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
@@ -153,7 +153,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() {
tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) {
CHECK(profile);
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
tab_groups::TabGroupSyncService* service =
tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile);
CHECK(service);
@@ -381,7 +381,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) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
@@ -276,7 +276,7 @@ SyncServiceFactory::SyncServiceFactory()
base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled);
@@ -517,7 +517,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ProfilePasswordStoreFactory::GetInstance());
DependsOn(PowerBookmarkServiceFactory::GetInstance());
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -1,11 +1,20 @@
--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-08-26 12:06:38 UTC
--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc
@@ -30,7 +30,7 @@
#include "components/sync_device_info/device_info_sync_service.h"
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#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
std::unique_ptr<TabGroupSyncDelegate> delegate;
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
delegate =
std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile);
#else
if (tab_groups::IsTabGroupSyncServiceDesktopMigrationEnabled()) {
delegate =
std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile);
@@ -1,4 +1,4 @@
--- chrome/browser/themes/theme_service.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/themes/theme_service.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/themes/theme_service.cc
@@ -70,7 +70,7 @@
#include "extensions/browser/extension_registry_observer.h"
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#include "ui/ozone/public/ozone_platform.h" // nogncheck
#endif
@@ -327,7 +327,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
@@ -328,7 +328,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseCustomFrame() const {
@@ -1,6 +1,6 @@
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/actions/chrome_action_id.h
@@ -512,7 +512,7 @@
@@ -511,7 +511,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-09-30 07:45:04 UTC
--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
@@ -46,7 +46,7 @@ gfx::Rect GetPopupSizeForVcn3ds() {
@@ -48,7 +48,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)
}
@@ -106,7 +106,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
@@ -108,7 +108,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
}
}
@@ -1,6 +1,6 @@
--- chrome/browser/ui/browser.h.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/ui/browser.h.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/browser.h
@@ -297,7 +297,7 @@ class Browser : public TabStripModelObserver,
@@ -299,7 +299,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-09-30 07:45:04 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -130,7 +130,7 @@
@@ -129,7 +129,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
@@ -139,7 +139,7 @@
@@ -138,7 +138,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)
@@ -316,7 +316,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -319,7 +319,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();
@@ -571,7 +571,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -574,7 +574,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;
@@ -583,7 +583,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -586,7 +586,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
@@ -45,7 +45,7 @@
case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -777,7 +777,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 {
@@ -1280,12 +1280,12 @@ void BrowserCommandController::InitCommandState() {
@@ -1265,12 +1265,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()
@@ -1600,7 +1600,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
@@ -1601,7 +1601,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-09-30 07:45:04 UTC
--- chrome/browser/ui/browser_commands.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/browser_commands.cc
@@ -2023,7 +2023,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
@@ -2036,7 +2036,7 @@ void OpenUpdateChromeDialog(Browser* browser) {
} else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
} else {
@@ -1,4 +1,4 @@
--- chrome/browser/ui/managed_ui.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/ui/managed_ui.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/managed_ui.cc
@@ -435,7 +435,7 @@ std::optional<std::string> GetDeviceManagerIdentity()
g_browser_process->platform_part()->browser_policy_connector_ash();
@@ -7,9 +7,9 @@
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::string custom_management_label =
g_browser_process->local_state()->GetString(
prefs::kEnterpriseCustomLabel);
@@ -467,7 +467,7 @@ std::optional<std::string> GetAccountManagerIdentity(P
g_browser_process->local_state()
? g_browser_process->local_state()->GetString(
@@ -469,7 +469,7 @@ std::optional<std::string> GetAccountManagerIdentity(P
policy::EnterpriseManagementAuthority::CLOUD))
return std::nullopt;
@@ -1,6 +1,6 @@
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -100,7 +100,7 @@ namespace {
@@ -93,7 +93,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;
@@ -528,7 +528,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
@@ -513,7 +513,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
}
void ManagePasswordsUIController::OnKeychainError() {
@@ -1,4 +1,4 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-09-30 07:45:04 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -138,7 +138,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -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"
@@ -967,7 +967,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -963,7 +963,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())) {
@@ -1084,7 +1084,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1080,7 +1080,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) &&
@@ -1303,7 +1303,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1295,7 +1295,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/startup/startup_browser_creator_impl.cc.orig 2024-07-30 11:12:21 UTC
--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-10-22 08:31:56 UTC
+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -86,7 +86,7 @@
@@ -85,7 +85,7 @@
#include "chromeos/startup/browser_params_proxy.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
@@ -225,7 +225,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
// at the state of the MessageLoop.
Browser::CreateParams params = Browser::CreateParams(profile_, false);
params.creation_source = Browser::CreationSource::kStartupCreator;
@@ -18,7 +18,7 @@
params.startup_id =
command_line_->GetSwitchValueASCII("desktop-startup-id");
#endif
@@ -267,7 +267,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
@@ -255,7 +255,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
continue;
}

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