update to 109.0.5414.74

This commit is contained in:
robert 2023-01-11 13:13:25 +00:00
parent 9482c7f330
commit 4cc8ebc602
299 changed files with 1498 additions and 1211 deletions

View File

@ -6,7 +6,7 @@ DPB_PROPERTIES= parallel parallel2
COMMENT= Chromium browser
V= 108.0.5359.124
V= 109.0.5414.74
DISTNAME= chromium-${V}
@ -103,8 +103,7 @@ BUILDTYPE= Release
SUBST_VARS+= WRKSRC WRKDIR DEBUGFLAG
ALL_TARGET= chrome chromedriver
TEST_TARGET= gpu_tests
TTEST_TARGET= base_unittests \
TEST_TARGET= base_unittests \
blink_unittests \
chromedriver_unittests \
components_unittests \
@ -161,8 +160,10 @@ GN_ARGS= enable_nacl=false \
use_sysroot=false \
treat_warnings_as_errors=false \
clang_use_chrome_plugins=false \
use_allocator=\"none\" \
use_allocator_shim=false \
use_partition_alloc=true \
use_partition_alloc_as_malloc=false \
enable_backup_ref_ptr_support=false \
disable_fieldtrial_testing_config=true \
extra_cppflags=\"-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include\" \
fatal_linker_warnings=false \

View File

@ -1,10 +1,10 @@
SHA256 (chrome-linux-108.0.5359.124-llvm13.profdata.tar.xz) = qZR4wFhDvreIdOYQPlnzqKcqGqAPHdfPCPYFb1MukFk=
SHA256 (chromium-108.0.5359.124-testdata.tar.xz) = sxKaZLCEqg0OttoZX2VWmbM2K8IW/TUKNAxA5VP0ezU=
SHA256 (chromium-108.0.5359.124.tar.xz) = 1I36wqYbFKXX0vRgsJtw7zq4jie4LjFzk4y1TqphKnU=
SHA256 (chrome-linux-109.0.5414.74-llvm13.profdata.tar.xz) = fxeMUf+pyvv08Ufxeta2xoM8mZyIhcUNVsIbb0uoISw=
SHA256 (chromium-109.0.5414.74-testdata.tar.xz) = dAE8Pjw8riOZ33X7FukY3zyn6PCBC2t31fO2FsNTzgQ=
SHA256 (chromium-109.0.5414.74.tar.xz) = 7e0jPCarYxvjJa1JyzBsM4UTtqZSgZfUJlPmYYdUjl0=
SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc=
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g=
SIZE (chrome-linux-108.0.5359.124-llvm13.profdata.tar.xz) = 26088692
SIZE (chromium-108.0.5359.124-testdata.tar.xz) = 265528008
SIZE (chromium-108.0.5359.124.tar.xz) = 1731649648
SIZE (chrome-linux-109.0.5414.74-llvm13.profdata.tar.xz) = 26288820
SIZE (chromium-109.0.5414.74-testdata.tar.xz) = 262657092
SIZE (chromium-109.0.5414.74.tar.xz) = 1747778008
SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

View File

@ -1,7 +1,7 @@
Index: BUILD.gn
--- BUILD.gn.orig
+++ BUILD.gn
@@ -59,7 +59,7 @@ declare_args() {
@@ -60,7 +60,7 @@ declare_args() {
root_extra_deps = []
}
@ -10,7 +10,7 @@ Index: BUILD.gn
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -89,7 +89,6 @@ group("gn_all") {
@@ -90,7 +90,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@ -18,7 +18,7 @@ Index: BUILD.gn
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -430,7 +429,7 @@ group("gn_all") {
@@ -434,7 +433,7 @@ group("gn_all") {
]
}
@ -27,7 +27,7 @@ Index: BUILD.gn
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -632,6 +631,15 @@ group("gn_all") {
@@ -637,6 +636,15 @@ group("gn_all") {
deps += [ "//gpu/tools/compositor_model_bench" ]
}
@ -43,7 +43,7 @@ Index: BUILD.gn
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -680,7 +688,7 @@ group("gn_all") {
@@ -685,7 +693,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -52,7 +52,7 @@ Index: BUILD.gn
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1107,7 +1115,7 @@ if (!is_ios) {
@@ -1115,7 +1123,7 @@ if (!is_ios) {
]
}
@ -61,7 +61,7 @@ Index: BUILD.gn
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1202,7 +1210,7 @@ if (!is_ios) {
@@ -1211,7 +1219,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -70,7 +70,7 @@ Index: BUILD.gn
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1211,7 +1219,7 @@ if (!is_ios) {
@@ -1220,7 +1228,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -79,7 +79,7 @@ Index: BUILD.gn
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1655,7 +1663,7 @@ group("chromium_builder_perf") {
@@ -1660,7 +1668,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

View File

@ -1,7 +1,7 @@
Index: base/BUILD.gn
--- base/BUILD.gn.orig
+++ base/BUILD.gn
@@ -163,7 +163,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -167,7 +167,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@ -10,7 +10,7 @@ Index: base/BUILD.gn
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1048,7 +1048,7 @@ mixed_component("base") {
@@ -1059,7 +1059,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@ -19,7 +19,7 @@ Index: base/BUILD.gn
sources += [
"profiler/stack_base_address_posix.cc",
"profiler/stack_base_address_posix.h",
@@ -1059,6 +1059,14 @@ mixed_component("base") {
@@ -1070,6 +1070,14 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@ -34,7 +34,7 @@ Index: base/BUILD.gn
}
if (is_win) {
@@ -1559,11 +1567,23 @@ mixed_component("base") {
@@ -1569,11 +1577,23 @@ mixed_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.
@ -59,7 +59,7 @@ Index: base/BUILD.gn
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1591,7 +1611,7 @@ mixed_component("base") {
@@ -1601,7 +1621,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@ -68,7 +68,7 @@ Index: base/BUILD.gn
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1645,7 +1665,7 @@ mixed_component("base") {
@@ -1655,7 +1675,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -77,14 +77,13 @@ Index: base/BUILD.gn
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2218,6 +2238,42 @@ mixed_component("base") {
@@ -2238,6 +2258,41 @@ mixed_component("base") {
}
}
+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/file_util_linux.cc",
+ "files/scoped_file_linux.cc",
+ "process/memory_linux.cc",
+ "process/process_linux.cc",
@ -120,7 +119,7 @@ Index: base/BUILD.gn
# iOS
if (is_ios) {
sources -= [
@@ -2315,7 +2371,7 @@ mixed_component("base") {
@@ -2335,7 +2390,7 @@ mixed_component("base") {
}
if (dep_libevent) {
@ -129,7 +128,7 @@ Index: base/BUILD.gn
}
if (use_libevent) {
@@ -3583,7 +3639,7 @@ test("base_unittests") {
@@ -3605,7 +3660,7 @@ test("base_unittests") {
}
}
@ -138,7 +137,7 @@ Index: base/BUILD.gn
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3629,7 +3685,7 @@ test("base_unittests") {
@@ -3651,7 +3706,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -147,7 +146,7 @@ Index: base/BUILD.gn
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3640,7 +3696,7 @@ test("base_unittests") {
@@ -3662,7 +3717,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -156,7 +155,7 @@ Index: base/BUILD.gn
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3832,7 +3888,7 @@ test("base_unittests") {
@@ -3869,7 +3924,7 @@ test("base_unittests") {
}
}

View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/page_allocator_internals_posix.h
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -356,8 +356,12 @@ bool TryRecommitSystemPagesInternal(
@@ -370,8 +370,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

View File

@ -1,9 +1,9 @@
Index: base/allocator/partition_allocator/partition_address_space.cc
--- base/allocator/partition_allocator/partition_address_space.cc.orig
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_base_mask_ = 0;
@@ -432,7 +432,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
}
#endif
-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)

View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/partition_alloc_config.h
--- base/allocator/partition_allocator/partition_alloc_config.h.orig
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -84,7 +84,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc_config.h
#define PA_HAS_LINUX_KERNEL
#endif
@@ -197,7 +197,7 @@ constexpr bool kUseLazyCommit = false;
@@ -216,7 +216,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
@ -19,7 +19,7 @@ Index: base/allocator/partition_allocator/partition_alloc_config.h
#define PA_HAS_ATFORK_HANDLER
#endif
@@ -238,7 +238,7 @@ constexpr bool kUseLazyCommit = false;
@@ -257,7 +257,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.

View File

@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc_constants.h
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3;
@@ -274,7 +274,7 @@ constexpr size_t kNumPools = 3;
// Special-case Android and iOS, which incur test failures with larger
// pools. Regardless, allocating >8GiB with malloc() on these platforms is
// unrealistic as of 2022.

View File

@ -0,0 +1,12 @@
Index: base/allocator/partition_allocator/partition_alloc.gni
--- base/allocator/partition_allocator/partition_alloc.gni.orig
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -121,7 +121,7 @@ assert(
"Missing dangling pointer checks feature for its performance experiment")
declare_args() {
- enable_pkeys = is_linux && target_cpu == "x64"
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
}
assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
"Pkeys are only supported on x64 linux")

View File

@ -1,14 +1,7 @@
Index: base/allocator/partition_allocator/partition_page.h
--- base/allocator/partition_allocator/partition_page.h.orig
+++ base/allocator/partition_allocator/partition_page.h
@@ -138,13 +138,13 @@ struct SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
-#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
+#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE))
// System page size is not a constant on Apple OSes, but is either 4 or 16kiB
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
@@ -144,7 +144,7 @@ struct SlotSpanMetadata {
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;

View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/partition_root.cc
--- base/allocator/partition_allocator/partition_root.cc.orig
+++ base/allocator/partition_allocator/partition_root.cc
@@ -41,7 +41,7 @@
@@ -42,7 +42,7 @@
#include "wow64apiset.h"
#endif
@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_root.cc
#include <pthread.h>
#endif
@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() {
@@ -239,7 +239,7 @@ void PartitionAllocMallocInitOnce() {
if (!g_global_init_called.compare_exchange_strong(expected, true))
return;
@ -19,7 +19,7 @@ Index: base/allocator/partition_allocator/partition_root.cc
// 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.
@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -332,7 +332,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@ -28,7 +28,7 @@ Index: base/allocator/partition_allocator/partition_root.cc
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -734,7 +734,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -789,7 +789,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

View File

@ -1,12 +0,0 @@
Index: base/cpu.h
--- base/cpu.h.orig
+++ base/cpu.h
@@ -115,7 +115,7 @@ class BASE_EXPORT CPU final {
const std::string& cpu_brand() const { return cpu_brand_; }
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
enum class CoreType {
kUnknown = 0,
kOther,

View File

@ -1,7 +1,7 @@
Index: base/files/file_util_unittest.cc
--- base/files/file_util_unittest.cc.orig
+++ base/files/file_util_unittest.cc
@@ -3549,7 +3549,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3558,7 +3558,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@ -10,7 +10,7 @@ Index: base/files/file_util_unittest.cc
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4272,7 +4272,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4281,7 +4281,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

View File

@ -2,9 +2,9 @@ Index: base/process/memory.cc
--- base/process/memory.cc.orig
+++ base/process/memory.cc
@@ -28,7 +28,7 @@ namespace base {
// Defined in memory_mac.mm for macOS + use_allocator="none". In case of
// USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system
// default calloc of macOS.
// Defined in memory_mac.mm for macOS + use_partition_alloc_as_malloc=false.
// In case of use_partition_alloc_as_malloc=true, no need to route the call to
// the system default calloc of macOS.
-#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)

View File

@ -36,7 +36,7 @@ Index: base/process/process_metrics.cc
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
@@ -125,7 +124,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
}
@ -44,7 +44,7 @@ Index: base/process/process_metrics.cc
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
@@ -156,7 +154,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

View File

@ -10,7 +10,7 @@ Index: base/process/process_metrics.h
#include <string>
#include <utility>
#include <vector>
@@ -52,7 +52,7 @@ class Value;
@@ -51,7 +51,7 @@ class Value;
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
@ -19,7 +19,7 @@ Index: base/process/process_metrics.h
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
@@ -107,7 +107,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@ -28,7 +28,7 @@ Index: base/process/process_metrics.h
// 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;
@@ -165,7 +165,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -164,7 +164,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -37,7 +37,7 @@ Index: base/process/process_metrics.h
// 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
@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@ -46,7 +46,7 @@ Index: base/process/process_metrics.h
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -245,7 +245,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -55,16 +55,7 @@ Index: base/process/process_metrics.h
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
@@ -280,7 +280,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
CPU::CoreType GetCoreType(uint32_t core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
@@ -294,9 +294,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -264,9 +264,7 @@ 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_;
@ -74,7 +65,7 @@ Index: base/process/process_metrics.h
#if BUILDFLAG(IS_WIN)
TimeTicks last_cpu_time_for_precise_cpu_usage_;
@@ -304,7 +302,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -274,7 +272,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -83,7 +74,7 @@ Index: base/process/process_metrics.h
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -347,7 +345,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -317,7 +315,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) || \
@ -92,7 +83,7 @@ Index: base/process/process_metrics.h
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -382,7 +380,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -352,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -101,7 +92,7 @@ Index: base/process/process_metrics.h
// 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
@@ -397,7 +395,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -367,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -110,7 +101,7 @@ Index: base/process/process_metrics.h
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -434,7 +432,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -404,7 +402,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -119,7 +110,7 @@ Index: base/process/process_metrics.h
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -622,7 +620,7 @@ class BASE_EXPORT SystemMetrics {
@@ -592,7 +590,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

View File

@ -1,7 +1,7 @@
Index: base/system/sys_info_posix.cc
--- base/system/sys_info_posix.cc.orig
+++ base/system/sys_info_posix.cc
@@ -182,12 +182,12 @@ absl::optional<int> NumberOfPhysicalProcessors() {
@@ -154,12 +154,12 @@ int NumberOfProcessors() {
} // namespace internal
@ -16,7 +16,7 @@ Index: base/system/sys_info_posix.cc
// static
uint64_t SysInfo::AmountOfVirtualMemory() {
@@ -277,6 +277,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
@@ -249,6 +249,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
arch = "x86";
} else if (arch == "amd64") {
arch = "x86_64";
@ -25,10 +25,3 @@ Index: base/system/sys_info_posix.cc
} else if (std::string(info.sysname) == "AIX") {
arch = "ppc64";
}
@@ -300,4 +302,4 @@ void SysInfo::SetIsCpuSecurityMitigationsEnabled(bool
#endif // BUILDFLAG(IS_MAC)
-} // namespace base
\ No newline at end of file
+} // namespace base

View File

@ -1,7 +1,7 @@
Index: base/test/launcher/test_launcher.cc
--- base/test/launcher/test_launcher.cc.orig
+++ base/test/launcher/test_launcher.cc
@@ -65,6 +65,7 @@
@@ -67,6 +67,7 @@
#include "third_party/libxml/chromium/libxml_utils.h"
#if BUILDFLAG(IS_POSIX)

View File

@ -19,15 +19,6 @@ Index: base/threading/platform_thread_unittest.cc
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level.
constexpr bool kCanIncreasePriority = false;
@@ -523,7 +523,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
TEST(PlatformThreadTest, GetDefaultThreadStackSize) {
size_t stack_size = PlatformThread::GetDefaultThreadStackSize();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \
- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
!defined(THREAD_SANITIZER)) || \
(BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
EXPECT_EQ(0u, stack_size);
@@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)

View File

@ -11,7 +11,7 @@ Index: build/config/BUILDCONFIG.gn
(current_cpu != "s390x" && current_cpu != "s390" &&
current_cpu != "ppc64" && current_cpu != "ppc" &&
current_cpu != "mips" && current_cpu != "mips64" &&
@@ -220,6 +221,10 @@ if (host_toolchain == "") {
@@ -225,6 +226,10 @@ if (host_toolchain == "") {
host_toolchain = "//build/toolchain/aix:$host_cpu"
} else if (host_os == "zos") {
host_toolchain = "//build/toolchain/zos:$host_cpu"
@ -22,7 +22,7 @@ Index: build/config/BUILDCONFIG.gn
} else {
assert(false, "Unsupported host_os: $host_os")
}
@@ -264,6 +269,8 @@ if (target_os == "android") {
@@ -268,6 +273,8 @@ if (target_os == "android") {
_default_toolchain = "//build/toolchain/aix:$target_cpu"
} else if (target_os == "zos") {
_default_toolchain = "//build/toolchain/zos:$target_cpu"
@ -31,7 +31,7 @@ Index: build/config/BUILDCONFIG.gn
} else {
assert(false, "Unsupported target_os: $target_os")
}
@@ -298,7 +305,11 @@ is_android = current_os == "android"
@@ -302,7 +309,11 @@ is_android = current_os == "android"
is_chromeos = current_os == "chromeos"
is_fuchsia = current_os == "fuchsia"
is_ios = current_os == "ios"

View File

@ -1,7 +1,7 @@
Index: build/config/compiler/BUILD.gn
--- build/config/compiler/BUILD.gn.orig
+++ build/config/compiler/BUILD.gn
@@ -219,13 +219,16 @@ config("default_include_dirs") {
@@ -224,13 +224,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") {
@ -19,7 +19,7 @@ Index: build/config/compiler/BUILD.gn
}
# compiler ---------------------------------------------------------------------
@@ -449,6 +452,10 @@ config("compiler") {
@@ -454,6 +457,10 @@ config("compiler") {
}
}
@ -30,16 +30,25 @@ Index: build/config/compiler/BUILD.gn
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -524,7 +531,7 @@ config("compiler") {
@@ -529,7 +536,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
- if (is_clang && !is_nacl && current_os != "zos") {
+ if (is_clang && !is_nacl && current_os != "zos" && !is_bsd) {
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -808,7 +815,7 @@ config("compiler") {
# lldb doesn't have the needed changes yet.
# * Fuchsia isn't supported as zxdb doesn't support simple template names yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
- if (is_clang && !is_nacl && !is_win && !is_apple && !is_fuchsia) {
+ if (is_clang && !is_nacl && !is_win && !is_apple && !is_fuchsia && !is_bsd) {
cflags_cc += [ "-gsimple-template-names" ]
}
# TODO(hans): Remove this once Clang generates better optimized debug info
@@ -924,7 +931,7 @@ config("compiler_cpu_abi") {
@@ -958,7 +965,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -48,7 +57,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -939,7 +946,7 @@ config("compiler_cpu_abi") {
@@ -973,7 +980,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -57,7 +66,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1277,7 +1284,7 @@ config("compiler_deterministic") {
@@ -1307,7 +1314,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.
@ -66,7 +75,7 @@ Index: build/config/compiler/BUILD.gn
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1329,7 +1336,7 @@ config("compiler_deterministic") {
@@ -1359,7 +1366,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -75,7 +84,7 @@ Index: build/config/compiler/BUILD.gn
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1570,7 +1577,7 @@ config("default_warnings") {
@@ -1600,7 +1607,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -84,7 +93,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1749,7 +1756,7 @@ config("no_chromium_code") {
@@ -1779,7 +1786,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -93,7 +102,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2271,7 +2278,7 @@ config("afdo_optimize_size") {
@@ -2301,7 +2308,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") {
@ -102,7 +111,7 @@ Index: build/config/compiler/BUILD.gn
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2287,7 +2294,7 @@ config("afdo") {
@@ -2317,7 +2324,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -111,7 +120,7 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2436,7 +2443,8 @@ config("symbols") {
@@ -2464,7 +2471,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

View File

@ -0,0 +1,22 @@
Index: build/linux/unbundle/openh264.gn
--- build/linux/unbundle/openh264.gn.orig
+++ build/linux/unbundle/openh264.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/buildflag_header.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/shim_headers.gni")
@@ -33,4 +34,10 @@ source_set("processing") {
source_set("encoder") {
deps = [ ":openh264_shim" ]
public_configs = [ ":config" ]
+}
+
+buildflag_header("buildflags") {
+ header = "buildflags.h"
+ header_dir = "third_party/openh264"
+ flags = [ "OPENH264_API_WELS=1" ]
}

View File

@ -15,7 +15,7 @@ Index: build/toolchain/gcc_toolchain.gni
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -786,22 +793,12 @@ template("gcc_toolchain") {
@@ -799,22 +806,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {

View File

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

View File

@ -1,7 +1,7 @@
Index: chrome/app/chrome_main.cc
--- chrome/app/chrome_main.cc.orig
+++ chrome/app/chrome_main.cc
@@ -26,7 +26,7 @@
@@ -25,7 +25,7 @@
#include "chrome/app/notification_metrics.h"
#endif
@ -10,12 +10,12 @@ Index: chrome/app/chrome_main.cc
#include "base/base_switches.h"
#endif
@@ -152,7 +152,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -151,7 +151,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (command_line->HasSwitch(switches::kHeadless)) {
if (headless::IsOldHeadlessMode()) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
command_line->AppendSwitch(::headless::switches::kEnableCrashReporter);

View File

@ -1,7 +1,7 @@
Index: chrome/app/chrome_main_delegate.cc
--- chrome/app/chrome_main_delegate.cc.orig
+++ chrome/app/chrome_main_delegate.cc
@@ -135,7 +135,7 @@
@@ -136,7 +136,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/app/chrome_main_delegate.cc
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -179,16 +179,16 @@
@@ -180,16 +180,16 @@
#include "v8/include/v8.h"
#endif
@ -30,7 +30,7 @@ Index: chrome/app/chrome_main_delegate.cc
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -344,7 +344,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -348,7 +348,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -39,7 +39,7 @@ Index: chrome/app/chrome_main_delegate.cc
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -429,7 +429,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -433,7 +433,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -48,7 +48,7 @@ Index: chrome/app/chrome_main_delegate.cc
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -518,7 +518,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -540,7 +540,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -57,7 +57,7 @@ Index: chrome/app/chrome_main_delegate.cc
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
@@ -601,7 +601,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -629,7 +629,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -66,7 +66,7 @@ Index: chrome/app/chrome_main_delegate.cc
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -848,6 +848,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -911,6 +911,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on ChromeOS.
#if BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@ -75,7 +75,7 @@ Index: chrome/app/chrome_main_delegate.cc
#else
bool enable_gwp_asan = true;
#endif
@@ -908,7 +910,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -971,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::internal::TimerBase::InitializeFeatures();
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
@ -84,7 +84,7 @@ Index: chrome/app/chrome_main_delegate.cc
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1017,7 +1019,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1080,7 +1082,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -93,7 +93,7 @@ Index: chrome/app/chrome_main_delegate.cc
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1047,7 +1049,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1110,7 +1112,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -102,7 +102,7 @@ Index: chrome/app/chrome_main_delegate.cc
nacl::RegisterPathProvider();
#endif
@@ -1437,7 +1439,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1492,7 +1494,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -111,7 +111,7 @@ Index: chrome/app/chrome_main_delegate.cc
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1517,7 +1519,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1572,7 +1574,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.

View File

@ -28,7 +28,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
Read information about your browser, OS, device, installed software and files
</message>
@@ -5487,7 +5487,7 @@ Keep your key file in a safe place. You will need it t
@@ -5493,7 +5493,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
</if>
@ -37,7 +37,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
@@ -5515,7 +5515,7 @@ Keep your key file in a safe place. You will need it t
@@ -5521,7 +5521,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
</message>
</if>
@ -46,7 +46,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
@@ -9106,7 +9106,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -9168,7 +9168,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -55,7 +55,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
@@ -10404,7 +10404,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -10501,7 +10501,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -64,7 +64,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -12500,7 +12500,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12597,7 +12597,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

View File

@ -1,7 +1,7 @@
Index: chrome/app/settings_strings.grdp
--- chrome/app/settings_strings.grdp.orig
+++ chrome/app/settings_strings.grdp
@@ -142,7 +142,7 @@
@@ -151,7 +151,7 @@
Theme
</message>
</if>
@ -10,7 +10,7 @@ Index: chrome/app/settings_strings.grdp
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
@@ -162,7 +162,7 @@
@@ -171,7 +171,7 @@
Use Classic
</message>
</if>

View File

@ -1,7 +1,7 @@
Index: chrome/browser/about_flags.cc
--- chrome/browser/about_flags.cc.orig
+++ chrome/browser/about_flags.cc
@@ -215,7 +215,7 @@
@@ -217,7 +217,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
@ -10,7 +10,7 @@ Index: chrome/browser/about_flags.cc
#include "base/allocator/buildflags.h"
#endif
@@ -291,7 +291,7 @@
@@ -293,7 +293,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
@ -19,7 +19,7 @@ Index: chrome/browser/about_flags.cc
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -398,7 +398,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -401,7 +401,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -28,7 +28,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1322,7 +1322,7 @@ const FeatureEntry::FeatureVariation
@@ -1394,7 +1394,7 @@ const FeatureEntry::FeatureVariation kTabGroupsSaveVar
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -37,16 +37,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
@@ -4182,7 +4182,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)},
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -4784,7 +4784,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4810,7 +4810,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -55,7 +46,7 @@ Index: chrome/browser/about_flags.cc
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
@@ -4803,7 +4803,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4823,7 +4823,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@ -64,7 +55,7 @@ Index: chrome/browser/about_flags.cc
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5063,7 +5063,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5090,7 +5090,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -73,7 +64,7 @@ Index: chrome/browser/about_flags.cc
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5633,7 +5633,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5699,7 +5699,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -82,7 +73,7 @@ Index: chrome/browser/about_flags.cc
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -6213,7 +6213,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6335,7 +6335,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
@ -91,7 +82,7 @@ Index: chrome/browser/about_flags.cc
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -7186,7 +7186,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7337,7 +7337,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -100,7 +91,7 @@ Index: chrome/browser/about_flags.cc
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -8059,7 +8059,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8174,7 +8174,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -109,7 +100,7 @@ Index: chrome/browser/about_flags.cc
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -8350,7 +8350,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8439,7 +8439,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -118,7 +109,7 @@ Index: chrome/browser/about_flags.cc
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -8968,7 +8968,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

View File

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

View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_browser_interface_binders.cc
--- chrome/browser/chrome_browser_interface_binders.cc.orig
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -114,13 +114,13 @@
@@ -113,13 +113,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -17,7 +17,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
#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
@@ -190,7 +190,7 @@
@@ -191,7 +191,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -26,7 +26,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
@@ -807,7 +807,7 @@ void PopulateChromeFrameBinders(
@@ -809,7 +809,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -35,7 +35,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -815,7 +815,7 @@ void PopulateChromeFrameBinders(
@@ -817,7 +817,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -44,7 +44,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -880,14 +880,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -882,14 +882,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +61,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1271,7 +1271,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1289,7 +1289,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_browser_main.cc
--- chrome/browser/chrome_browser_main.cc.orig
+++ chrome/browser/chrome_browser_main.cc
@@ -239,11 +239,11 @@
@@ -240,11 +240,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -15,7 +15,7 @@ Index: chrome/browser/chrome_browser_main.cc
#include "components/crash/core/app/crashpad.h"
#endif
@@ -278,7 +278,7 @@
@@ -279,7 +279,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -24,7 +24,7 @@ Index: chrome/browser/chrome_browser_main.cc
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -987,7 +987,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -33,7 +33,7 @@ Index: chrome/browser/chrome_browser_main.cc
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1096,7 +1096,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1035,7 +1035,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.cc
--- chrome/browser/chrome_content_browser_client.cc.orig
+++ chrome/browser/chrome_content_browser_client.cc
@@ -393,7 +393,7 @@
@@ -395,7 +395,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
@ -10,7 +10,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -478,12 +478,12 @@
@@ -480,12 +480,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -25,7 +25,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -492,13 +492,13 @@
@@ -494,13 +494,13 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -41,7 +41,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -527,11 +527,11 @@
@@ -529,11 +529,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -53,9 +53,9 @@ Index: chrome/browser/chrome_content_browser_client.cc
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1537,7 +1537,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1623,7 +1623,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -64,7 +64,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1576,7 +1576,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1662,7 +1662,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -73,16 +73,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1597,7 +1597,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1683,7 +1683,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1616,7 +1616,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1702,7 +1702,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -91,7 +91,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2395,6 +2395,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2507,6 +2507,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -100,7 +100,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2759,7 +2761,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2902,7 +2904,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -109,7 +109,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4206,7 +4208,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4352,7 +4354,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -118,7 +118,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -4655,14 +4657,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4872,14 +4874,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -135,7 +135,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -4697,7 +4699,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4914,7 +4916,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}

View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.h
--- chrome/browser/chrome_content_browser_client.h.orig
+++ chrome/browser/chrome_content_browser_client.h
@@ -439,7 +439,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -442,7 +442,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

View File

@ -1,7 +1,7 @@
Index: chrome/browser/download/chrome_download_manager_delegate.cc
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1551,7 +1551,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -10,7 +10,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -1667,7 +1667,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1683,7 +1683,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -19,7 +19,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1713,7 +1713,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -1729,7 +1729,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

View File

@ -1,7 +1,7 @@
Index: chrome/browser/download/download_file_picker.cc
--- chrome/browser/download/download_file_picker.cc.orig
+++ chrome/browser/download/download_file_picker.cc
@@ -16,7 +16,7 @@
@@ -17,7 +17,7 @@
#include "content/public/browser/download_manager.h"
#include "content/public/browser/web_contents.h"
@ -10,7 +10,7 @@ Index: chrome/browser/download/download_file_picker.cc
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "ui/aura/window.h"
@@ -85,7 +85,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
@@ -86,7 +86,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
// dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
// and windows.Here we make owning_window host to browser current active
// window if it is null. https://crbug.com/1301898

View File

@ -1,7 +1,7 @@
Index: chrome/browser/download/download_item_model.cc
--- chrome/browser/download/download_item_model.cc.orig
+++ chrome/browser/download/download_item_model.cc
@@ -756,7 +756,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -787,7 +787,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -10,7 +10,7 @@ Index: chrome/browser/download/download_item_model.cc
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
@@ -799,7 +799,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -830,7 +830,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -19,7 +19,7 @@ Index: chrome/browser/download/download_item_model.cc
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1217,7 +1217,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1232,7 +1232,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

View File

@ -1,18 +1,18 @@
Index: chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/profiles/profile.h"
#include "components/policy/core/common/management/management_service.h"
@@ -22,7 +22,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/win/win_signals_decorator.h"
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -54,7 +54,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
enterprise_signals::ContextInfoFetcher::CreateInstance(
profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
@@ -62,7 +62,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
decorators.push_back(std::make_unique<WinSignalsDecorator>());
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)

View File

@ -19,9 +19,9 @@ Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router
void OnCloudReportingLaunched(
enterprise_reporting::ReportScheduler* report_scheduler) override;
void UploadToReportingServer(
@@ -41,7 +41,7 @@ class BrowserCrashEventRouter
nullptr;
raw_ptr<policy::ChromeBrowserCloudManagementController> controller_ = nullptr;
@@ -42,7 +42,7 @@ class BrowserCrashEventRouter
raw_ptr<policy::ChromeBrowserCloudManagementController, DanglingUntriaged>
controller_ = nullptr;
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)

View File

@ -0,0 +1,21 @@
Index: chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc
--- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig
+++ chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc
@@ -12,7 +12,7 @@
#include "components/enterprise/browser/identifiers/identifiers_prefs.h"
#include "components/prefs/pref_service.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "components/enterprise/browser/controller/browser_dm_token_storage.h"
#if BUILDFLAG(IS_WIN)
#include "base/strings/utf_string_conversions.h"
@@ -36,7 +36,7 @@ void CreateProfileGUID(PrefService* prefs) {
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// Gets the device ID from the BrowserDMTokenStorage.
std::string GetId() {
std::string device_id =

View File

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

View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@
@@ -31,7 +31,7 @@
#include "components/reporting/util/statusor.h"
#endif
@ -28,7 +28,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_rep
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
@@ -634,7 +634,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif

View File

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

View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/external_provider_impl.cc
--- chrome/browser/extensions/external_provider_impl.cc.orig
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -826,7 +826,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/browser/extensions/external_provider_impl.cc
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -854,7 +854,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

View File

@ -1,7 +1,7 @@
Index: chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -256,7 +256,7 @@ const struct {
@@ -252,7 +252,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif

View File

@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.cc
--- chrome/browser/flag_descriptions.cc.orig
+++ chrome/browser/flag_descriptions.cc
@@ -6600,7 +6600,7 @@ const char kSearchWebInSidePanelDescription[] =
@@ -6417,7 +6417,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -6609,7 +6609,7 @@ const char kQuickCommandsDescription[] =
@@ -6426,7 +6426,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -6623,7 +6623,7 @@ const char kWebShareDescription[] =
@@ -6440,7 +6440,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -28,16 +28,16 @@ Index: chrome/browser/flag_descriptions.cc
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -6643,7 +6643,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -6460,7 +6460,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
@@ -6656,7 +6656,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
const char kForcePasswordInitialSyncWhenDecryptionFailsName[] =
"Force initial sync to clean local undecryptable passwords during startup";
const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[] =
@@ -6468,7 +6468,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@ -46,7 +46,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -6665,7 +6665,7 @@ const char kSkipUndecryptablePasswordsDescription[] =
@@ -6477,7 +6477,7 @@ const char kSkipUndecryptablePasswordsDescription[] =
"there are undecryptable ones.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -55,7 +55,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -6770,7 +6770,7 @@ const char kElasticOverscrollDescription[] =
@@ -6577,7 +6577,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

View File

@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.h
--- chrome/browser/flag_descriptions.h.orig
+++ chrome/browser/flag_descriptions.h
@@ -3779,7 +3779,7 @@ extern const char kSearchWebInSidePanelDescription[];
@@ -3693,7 +3693,7 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kQuickCommandsName[];
extern const char kQuickCommandsDescription[];
@@ -3796,7 +3796,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -3710,7 +3710,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -3812,18 +3812,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -3723,18 +3723,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -41,7 +41,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -3900,7 +3900,7 @@ extern const char kElasticOverscrollDescription[];
@@ -3809,7 +3809,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

View File

@ -1,30 +1,26 @@
Index: chrome/browser/headless/headless_mode_util.cc
--- chrome/browser/headless/headless_mode_util.cc.orig
+++ chrome/browser/headless/headless_mode_util.cc
@@ -9,7 +9,7 @@
// Native headless is currently available on Linux, Windows and Mac platforms.
// More platforms will be added later, so avoid function level clutter by
// providing stub implementations at the end of the file.
@@ -10,11 +10,11 @@
// New headless mode is available on Linux, Windows and Mac platforms.
// More platforms will be added later, so avoid function level clutter
// by providing stub implementations at the end of the file.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include <cstdlib>
#include <vector>
@@ -17,7 +17,7 @@
#include "base/base_switches.h"
#include "ui/gfx/switches.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/gl/gl_switches.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -52,7 +52,7 @@ void SetUpCommandLine(const base::CommandLine* command
@@ -64,7 +64,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
::switches::kNoErrorDialogs);
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Native headless chrome on Linux relies on ozone/headless platform.
// Headless mode on Linux relies on ozone/headless platform.
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
::switches::kOzonePlatform, switches::kHeadless);

View File

@ -8,9 +8,9 @@ Index: chrome/browser/media/audio_service_util.cc
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) {
const base::Value* GetPolicy(const char* policy_name) {
const policy::PolicyMap& policies =
@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
@@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
bool IsAudioServiceSandboxEnabled() {
// TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
// built with OS_CHROMEOS instead of OS_LINUX.

View File

@ -10,7 +10,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -731,7 +731,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -735,7 +735,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -19,7 +19,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -810,7 +810,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -814,7 +814,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -28,7 +28,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -908,7 +908,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -912,7 +912,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -37,7 +37,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1093,7 +1093,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1097,7 +1097,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

View File

@ -1,7 +1,7 @@
Index: chrome/browser/net/system_network_context_manager.cc
--- chrome/browser/net/system_network_context_manager.cc.orig
+++ chrome/browser/net/system_network_context_manager.cc
@@ -91,7 +91,7 @@
@@ -92,7 +92,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -174,7 +174,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -19,7 +19,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -451,7 +451,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -452,7 +452,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -28,7 +28,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -523,7 +523,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -524,7 +524,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)

View File

@ -1,7 +1,106 @@
Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -1747,7 +1747,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -193,12 +193,12 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "components/device_signals/core/browser/pref_names.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
@@ -727,14 +727,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
- || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
- || BUILDFLAG(IS_FUCHSIA)
+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1358,7 +1358,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1428,18 +1428,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kBackgroundModeEnabled,
prefs::kBackgroundModeEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
- || BUILDFLAG(IS_FUCHSIA)
+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1452,7 +1452,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
- || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1649,7 +1649,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1696,7 +1696,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \
- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA))
+ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
@@ -1756,7 +1756,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kPrefixedStorageInfoEnabled,
storage::kPrefixedStorageInfoEnabled,
base::Value::Type::BOOLEAN },
@ -10,3 +109,48 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
@@ -2062,7 +2062,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2097,7 +2097,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) || \
- BUILDFLAG(IS_LINUX)
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -2435,7 +2435,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
chrome_schema));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2448,7 +2448,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2456,7 +2456,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));

View File

@ -1,7 +1,7 @@
Index: chrome/browser/prefs/browser_prefs.cc
--- chrome/browser/prefs/browser_prefs.cc.orig
+++ chrome/browser/prefs/browser_prefs.cc
@@ -446,14 +446,14 @@
@@ -449,14 +449,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@ -18,7 +18,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -481,7 +481,7 @@
@@ -489,7 +489,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -27,7 +27,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
#include "ui/color/system_theme.h"
#endif
@@ -978,7 +978,7 @@ void RegisterProfilePrefsForMigration(
@@ -1008,7 +1008,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@ -36,7 +36,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1212,7 +1212,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1259,7 +1259,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@ -45,7 +45,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1537,11 +1537,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1586,11 +1586,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
@ -59,7 +59,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -1938,7 +1938,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
@@ -1974,7 +1974,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif

View File

@ -1,7 +1,7 @@
Index: chrome/browser/printing/print_backend_service_manager.cc
--- chrome/browser/printing/print_backend_service_manager.cc.orig
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -481,7 +481,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
@@ -493,7 +493,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
@ -10,7 +10,7 @@ Index: chrome/browser/printing/print_backend_service_manager.cc
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
@@ -706,7 +706,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -729,7 +729,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@ -19,7 +19,7 @@ Index: chrome/browser/printing/print_backend_service_manager.cc
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
@@ -763,7 +763,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -786,7 +786,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:

View File

@ -1,7 +1,7 @@
Index: chrome/browser/printing/print_job_worker.cc
--- chrome/browser/printing/print_job_worker.cc.orig
+++ chrome/browser/printing/print_job_worker.cc
@@ -195,7 +195,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new
@@ -206,7 +206,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));

View File

@ -1,7 +1,7 @@
Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -258,7 +258,7 @@
@@ -261,7 +261,7 @@
#include "chrome/browser/ui/cocoa/screentime/screentime_features.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/enterprise/idle/idle_service_factory.h"
#endif
@@ -439,11 +439,11 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -448,11 +448,11 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

View File

@ -12,7 +12,7 @@ Index: chrome/browser/profiles/profile_impl.cc
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -839,7 +843,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -846,7 +850,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

View File

@ -10,7 +10,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_browser_prox
useGtkTheme(): void;
useQtTheme(): void;
// </if>
@@ -45,7 +45,7 @@ export class AppearanceBrowserProxyImpl implements App
@@ -41,7 +41,7 @@ export class AppearanceBrowserProxyImpl implements App
chrome.send('useDefaultTheme');
}

View File

@ -1,7 +1,7 @@
Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig
+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
@@ -336,7 +336,7 @@
@@ -395,7 +395,7 @@
consent-confirmation autofocus>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
@ -10,7 +10,7 @@ Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.h
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -346,7 +346,7 @@
@@ -405,7 +405,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
@ -19,7 +19,7 @@ Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.h
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -389,7 +389,7 @@
@@ -448,7 +448,7 @@
consent-confirmation>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
@ -28,7 +28,7 @@ Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.h
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -399,7 +399,7 @@
@@ -458,7 +458,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>

View File

@ -10,7 +10,7 @@ Index: chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
@@ -321,7 +321,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
@@ -364,7 +364,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.

View File

@ -1,22 +0,0 @@
Index: chrome/browser/shutdown_signal_handlers_posix.cc
--- chrome/browser/shutdown_signal_handlers_posix.cc.orig
+++ chrome/browser/shutdown_signal_handlers_posix.cc
@@ -187,12 +187,18 @@ void InstallShutdownSignalHandlers(
g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
+#if defined(OS_BSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under *BSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
+#else
#if !defined(ADDRESS_SANITIZER)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
#else
// ASan instrumentation bloats the stack frames, so we need to increase the
// stack size to avoid hitting the guard page.
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+#endif
#endif
ShutdownDetector* detector = new ShutdownDetector(
g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);

View File

@ -1,7 +1,7 @@
Index: chrome/browser/task_manager/sampling/task_group.cc
--- chrome/browser/task_manager/sampling/task_group.cc.orig
+++ chrome/browser/task_manager/sampling/task_group.cc
@@ -37,7 +37,7 @@ const int kBackgroundRefreshTypesMask =
@@ -38,7 +38,7 @@ const int kBackgroundRefreshTypesMask =
#if BUILDFLAG(IS_WIN)
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
#endif // BUILDFLAG(IS_WIN)
@ -10,7 +10,7 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
REFRESH_TYPE_FD_COUNT |
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(ENABLE_NACL)
@@ -122,7 +122,7 @@ TaskGroup::TaskGroup(
@@ -123,7 +123,7 @@ TaskGroup::TaskGroup(
#if BUILDFLAG(ENABLE_NACL)
nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
#endif // BUILDFLAG(ENABLE_NACL)
@ -19,7 +19,7 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
open_fd_count_(-1),
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
idle_wakeups_per_second_(-1),
@@ -141,7 +141,7 @@ TaskGroup::TaskGroup(
@@ -142,7 +142,7 @@ TaskGroup::TaskGroup(
weak_ptr_factory_.GetWeakPtr()),
base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
@ -28,7 +28,7 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -321,7 +321,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
@@ -322,7 +322,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
}
#endif // BUILDFLAG(ENABLE_NACL)

View File

@ -8,8 +8,8 @@ Index: chrome/browser/ui/browser_view_prefs.cc
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
bool GetCustomFramePrefDefault() {
#if defined(USE_OZONE)
return ui::OzonePlatform::GetInstance()
#if BUILDFLAG(IS_OZONE)
return ui::OzonePlatform::GetInstance()
@@ -35,7 +35,7 @@ void RegisterBrowserViewProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/sad_tab.cc
--- chrome/browser/ui/sad_tab.cc.orig
+++ chrome/browser/ui/sad_tab.cc
@@ -175,7 +175,7 @@ std::vector<int> SadTab::GetSubMessages() {
@@ -176,7 +176,7 @@ std::vector<int> SadTab::GetSubMessages() {
// Only show Incognito suggestion if not already in Incognito mode.
if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/startup/startup_browser_creator.cc
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -129,7 +129,7 @@
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
#endif // BUILDFLAG(IS_WIN)
@ -10,7 +10,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
@@ -1007,7 +1007,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1011,7 +1011,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -19,7 +19,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1197,7 +1197,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1203,7 +1203,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);

View File

@ -7,6 +7,6 @@ Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
params.creation_source = Browser::CreationSource::kStartupCreator;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
params.startup_id = command_line_.GetSwitchValueASCII("desktop-startup-id");
params.startup_id =
command_line_->GetSwitchValueASCII("desktop-startup-id");
#endif
browser = Browser::Create(params);

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/tab_helpers.cc
--- chrome/browser/ui/tab_helpers.cc.orig
+++ chrome/browser/ui/tab_helpers.cc
@@ -207,7 +207,7 @@
@@ -206,7 +206,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/autofill_assistant/common_dependencies_chrome.h"
#include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h"
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
@@ -551,13 +551,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -547,13 +547,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -26,7 +26,7 @@ Index: chrome/browser/ui/tab_helpers.cc
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
@@ -580,7 +580,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -576,7 +576,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

View File

@ -28,12 +28,12 @@ Index: chrome/browser/ui/views/accelerator_table.cc
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
-#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_FUCHSIA)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
@@ -236,7 +236,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -237,7 +237,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)

View File

@ -1,21 +0,0 @@
Index: chrome/browser/ui/views/download/download_item_view.cc
--- chrome/browser/ui/views/download/download_item_view.cc.orig
+++ chrome/browser/ui/views/download/download_item_view.cc
@@ -190,7 +190,7 @@ bool UseNewWarnings() {
}
int GetFilenameStyle(const views::Label& label) {
-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
if (UseNewWarnings())
return views::style::STYLE_EMPHASIZED;
#endif
@@ -198,7 +198,7 @@ int GetFilenameStyle(const views::Label& label) {
}
int GetFilenameStyle(const views::StyledLabel& label) {
-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
if (UseNewWarnings())
return views::style::STYLE_EMPHASIZED;
#endif

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc
--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig
+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc
@@ -157,7 +157,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos
@@ -159,7 +159,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos
// EyeDropper/WidgetDelegate.
set_owned_by_client();
SetPreferredSize(GetSize());

View File

@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
@@ -269,7 +269,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@@ -270,7 +270,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
@@ -392,7 +392,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -393,7 +393,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
@@ -409,7 +409,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -410,7 +410,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;

View File

@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.h
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
@@ -206,7 +206,7 @@ class BrowserFrame : public views::Widget, public view
@@ -210,7 +210,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;

View File

@ -26,5 +26,5 @@ Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (browser_view->browser()->is_type_picture_in_picture()) {
return std::make_unique<PictureInPictureBrowserFrameView>(frame,
browser_view);
auto view =
std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view);

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/frame/browser_view.cc
--- chrome/browser/ui/views/frame/browser_view.cc.orig
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -2069,7 +2069,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -2103,7 +2103,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -114,7 +114,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
@@ -113,7 +113,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
const gfx::Rect& bounding_rect) const override;
bool IsTranslucentWindowOpacitySupported() const override;
bool ShouldDrawRestoredFrameShadow() const override;
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
ui::WindowTiledEdges GetTiledEdges() const override;
#endif
@@ -230,7 +230,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
@@ -229,7 +229,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
// Background painter for the window frame.
std::unique_ptr<views::FrameBackground> frame_background_;

View File

@ -0,0 +1,57 @@
Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -32,7 +32,7 @@
#include "ui/aura/window.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
@@ -256,7 +256,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorOmniboxResultsIcon));
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// If the top bar background is already drawn by window_frame_provider_, skip
// drawing it again below.
if (window_frame_provider_) {
@@ -292,7 +292,7 @@ void PictureInPictureBrowserFrameView::AddedToWidget()
BrowserNonClientFrameView::AddedToWidget();
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -494,7 +494,7 @@ void PictureInPictureBrowserFrameView::OnMouseEvent(ui
///////////////////////////////////////////////////////////////////////////////
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (window_frame_provider_) {
// Draw the PiP window frame borders and shadows, including the top bar
// background.
@@ -562,7 +562,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
@@ -582,7 +582,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
return FrameBorderInsets().top() + kTopControlsHeight;
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void PictureInPictureBrowserFrameView::SetWindowFrameProvider(
ui::WindowFrameProvider* window_frame_provider) {
window_frame_provider_ = window_frame_provider;

View File

@ -0,0 +1,39 @@
Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/layout/box_layout_view.h"
#include "ui/views/widget/widget_observer.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/linux/window_frame_provider.h"
#endif
@@ -67,7 +67,7 @@ class PictureInPictureBrowserFrameView
void OnThemeChanged() override;
void Layout() override;
void AddedToWidget() override;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
@@ -145,7 +145,7 @@ class PictureInPictureBrowserFrameView
// Returns the height of the top bar area, including the window top border.
int GetTopAreaHeight() const;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
@@ -177,7 +177,7 @@ class PictureInPictureBrowserFrameView
widget_observation_{this};
bool mouse_inside_window_ = false;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Used to draw window frame borders and shadow on Linux when GTK theme is
// enabled.
raw_ptr<ui::WindowFrameProvider> window_frame_provider_ = nullptr;

View File

@ -18,7 +18,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
model->AddSeparator(ui::NORMAL_SEPARATOR);
bool supports_server_side_decorations = true;
#if defined(USE_OZONE) && !BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS)
@@ -144,7 +144,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);

View File

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

View File

@ -1,7 +1,25 @@
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -487,7 +487,7 @@ void TabDragController::Init(TabDragContext* source_co
@@ -82,7 +82,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/aura/client/drag_drop_client.h"
#endif
@@ -254,7 +254,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
@@ -506,7 +506,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
// - Chrome OS
// Releasing capture on Ash cancels gestures so avoid it.
@ -10,7 +28,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
@@ -1049,7 +1049,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
@@ -1106,7 +1106,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -19,7 +37,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
@@ -1987,7 +1987,7 @@ void TabDragController::CompleteDrag() {
@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@ -28,7 +46,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
@@ -2378,7 +2378,7 @@ TabDragController::Liveness TabDragController::GetLoca
@@ -2488,7 +2488,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/webui/about_ui.cc
--- chrome/browser/ui/webui/about_ui.cc.orig
+++ chrome/browser/ui/webui/about_ui.cc
@@ -621,7 +621,7 @@ std::string ChromeURLs() {
@@ -620,7 +620,7 @@ std::string ChromeURLs() {
return html;
}
@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/about_ui.cc
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
@@ -679,7 +679,7 @@ void AboutUIHTMLSource::StartDataRequest(
@@ -678,7 +678,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -317,7 +317,7 @@
@@ -319,7 +319,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
@@ -343,17 +343,17 @@
@@ -345,17 +345,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -31,7 +31,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
@@ -710,7 +710,7 @@ bool IsAboutUI(const GURL& url) {
@@ -716,7 +716,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@ -40,16 +40,16 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1147,7 +1147,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
#endif // !defined(USE_REAL_DBUS_CLIENTS)
#endif // !defined(OFFICIAL_BUILD)
@@ -1024,7 +1024,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<ash::personalization_app::PersonalizationAppUI>;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
@@ -1208,7 +1208,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1085,7 +1085,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@ -58,7 +58,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
@@ -1268,27 +1268,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1145,27 +1145,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

View File

@ -19,7 +19,7 @@ Index: chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
BPKUR::KeyTrustLevel trust_level) {
@@ -63,7 +63,7 @@ std::string HashAndEncodeString(const std::string& spk
@@ -70,7 +70,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu
} // namespace
connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -325,7 +325,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
@@ -326,7 +326,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
bool is_deprecated_app = false;
auto* context = extension_service_->GetBrowserContext();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
is_deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
#endif
@@ -1427,7 +1427,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
@@ -1444,7 +1444,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -120,7 +120,7 @@
@@ -122,7 +122,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
#include "ui/display/screen.h"
#endif
@@ -141,7 +141,7 @@
@@ -143,7 +143,7 @@
#include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
#endif
@ -19,7 +19,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -227,7 +227,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
@@ -229,7 +229,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
#endif
html_source->AddBoolean("isChildAccount", profile->IsChild());
@ -28,7 +28,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
#else
bool allow_qt_theme = false;
@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -382,7 +382,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
{"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
{"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@ -37,7 +37,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
{"gtkTheme", IDS_SETTINGS_GTK_THEME},
{"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
{"qtTheme", IDS_SETTINGS_QT_THEME},
@@ -383,7 +383,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -392,7 +392,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@ -46,7 +46,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
@@ -407,7 +407,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/window_sizer/window_sizer.cc
--- chrome/browser/ui/window_sizer/window_sizer.cc.orig
+++ chrome/browser/ui/window_sizer/window_sizer.cc
@@ -173,7 +173,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
@@ -205,7 +205,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
browser, window_bounds, show_state);
}

View File

@ -1,8 +1,8 @@
Index: chrome/browser/web_applications/extension_status_utils.h
--- chrome/browser/web_applications/extension_status_utils.h.orig
+++ chrome/browser/web_applications/extension_status_utils.h
@@ -43,7 +43,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
const std::string& extension_id);
@@ -48,7 +48,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
const std::string& extension_id);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)

View File

@ -10,7 +10,7 @@ Index: chrome/browser/web_applications/extensions/extension_status_utils.cc
const char kMobilityPrintExtensionId[] = "alhngdkjgnedakdlnamimgfihgkmenbh";
BASE_FEATURE(kChromeAppsDeprecationExcludeForceInstalls,
@@ -102,7 +102,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
@@ -108,7 +108,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

View File

@ -10,7 +10,7 @@ Index: chrome/browser/web_applications/os_integration/web_app_shortcut.h
#include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -35,7 +35,7 @@ class ImageSkia;
@@ -39,7 +39,7 @@ class ImageSkia;
namespace web_app {
@ -19,7 +19,7 @@ Index: chrome/browser/web_applications/os_integration/web_app_shortcut.h
struct LinuxFileRegistration {
std::string xdg_command;
std::string file_contents;
@@ -85,7 +85,7 @@ struct ShortcutOverrideForTesting
@@ -89,7 +89,7 @@ struct ShortcutOverrideForTesting
#elif BUILDFLAG(IS_MAC)
base::ScopedTempDir chrome_apps_folder;
std::map<base::FilePath, bool> startup_enabled;
@ -28,7 +28,7 @@ Index: chrome/browser/web_applications/os_integration/web_app_shortcut.h
base::ScopedTempDir desktop;
base::ScopedTempDir startup;
std::vector<LinuxFileRegistration> linux_file_registration;
@@ -132,7 +132,7 @@ struct ShortcutInfo {
@@ -136,7 +136,7 @@ struct ShortcutInfo {
std::set<std::string> file_handler_extensions;
std::set<std::string> file_handler_mime_types;
std::set<std::string> protocol_handlers;

View File

@ -1,7 +1,7 @@
Index: chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig
+++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
@@ -391,7 +391,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
@@ -449,7 +449,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
}
}

View File

@ -1,12 +1,12 @@
Index: chrome/browser/web_applications/web_app_provider.cc
--- chrome/browser/web_applications/web_app_provider.cc.orig
+++ chrome/browser/web_applications/web_app_provider.cc
@@ -277,7 +277,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
@@ -283,7 +283,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
protocol_handler_manager.get());
std::unique_ptr<UrlHandlerManager> url_handler_manager;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
url_handler_manager = std::make_unique<UrlHandlerManagerImpl>(profile);
#endif

View File

@ -1,7 +1,7 @@
Index: chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
@@ -667,7 +667,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
@@ -679,7 +679,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
g_observer->ConfiguringCable(request_type);
}

View File

@ -1,7 +1,7 @@
Index: chrome/common/chrome_features.cc
--- chrome/common/chrome_features.cc.orig
+++ chrome/common/chrome_features.cc
@@ -107,7 +107,7 @@ BASE_FEATURE(kAsyncDns,
@@ -108,7 +108,7 @@ BASE_FEATURE(kAsyncDns,
);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/common/chrome_features.cc
// Enables or disables the Autofill survey triggered by opening a prompt to
// save address info.
BASE_FEATURE(kAutofillAddressSurvey,
@@ -125,7 +125,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
@@ -126,7 +126,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
base::FEATURE_DISABLED_BY_DEFAULT);
#endif
@ -19,7 +19,7 @@ Index: chrome/common/chrome_features.cc
// Enables the Restart background mode optimization. When all Chrome UI is
// closed and it goes in the background, allows to restart the browser to
// discard memory.
@@ -304,7 +304,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
@@ -310,7 +310,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
// Enables or disables Desktop PWAs to be auto-started on OS login.
BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
"DesktopPWAsRunOnOsLogin",
@ -28,7 +28,7 @@ Index: chrome/common/chrome_features.cc
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
@@ -328,7 +328,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
@@ -334,7 +334,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -37,7 +37,7 @@ Index: chrome/common/chrome_features.cc
// Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
// If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
// Apps will not launch and will be marked in the UI as deprecated.
@@ -352,7 +352,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
@@ -358,7 +358,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -46,7 +46,7 @@ Index: chrome/common/chrome_features.cc
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
@@ -368,7 +368,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
@@ -374,7 +374,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -55,7 +55,7 @@ Index: chrome/common/chrome_features.cc
true
#else
false
@@ -744,7 +744,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito,
@@ -750,7 +750,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito,
"UpdateHistoryEntryPointsInIncognito",
base::FEATURE_ENABLED_BY_DEFAULT);
@ -64,7 +64,7 @@ Index: chrome/common/chrome_features.cc
BASE_FEATURE(kLinuxLowMemoryMonitor,
"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -757,7 +757,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
@@ -763,7 +763,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
&kLinuxLowMemoryMonitor, "critical_level", 255};
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)

View File

@ -1,7 +1,7 @@
Index: chrome/common/chrome_switches.cc
--- chrome/common/chrome_switches.cc.orig
+++ chrome/common/chrome_switches.cc
@@ -831,14 +831,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
@@ -839,14 +839,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

View File

@ -1,7 +1,7 @@
Index: chrome/common/chrome_switches.h
--- chrome/common/chrome_switches.h.orig
+++ chrome/common/chrome_switches.h
@@ -260,12 +260,12 @@ extern const char kAllowNaClSocketAPI[];
@@ -263,12 +263,12 @@ extern const char kAllowNaClSocketAPI[];
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

View File

@ -1,7 +1,7 @@
Index: chrome/common/pref_names.cc
--- chrome/common/pref_names.cc.orig
+++ chrome/common/pref_names.cc
@@ -1267,7 +1267,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
@@ -1268,7 +1268,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/common/pref_names.cc
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system";
const char kSystemTheme[] = "extensions.theme.system_theme";
@@ -1381,7 +1381,7 @@ const char kShowUpdatePromotionInfoBar[] =
@@ -1382,7 +1382,7 @@ const char kShowUpdatePromotionInfoBar[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -19,7 +19,7 @@ Index: chrome/common/pref_names.cc
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
@@ -1886,7 +1886,7 @@ const char kDownloadDirUpgraded[] = "download.director
@@ -1893,7 +1893,7 @@ const char kDownloadDirUpgraded[] = "download.director
const char kDownloadLastCompleteTime[] = "download.last_complete_time";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -28,7 +28,7 @@ Index: chrome/common/pref_names.cc
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
@@ -2190,7 +2190,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
@@ -2197,7 +2197,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
// its isolation requirements.
const char kWebAppsIsolationState[] = "web_apps.isolation_state";
@ -37,7 +37,7 @@ Index: chrome/common/pref_names.cc
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
// Dictionary that maps origins to web apps that can act as URL handlers.
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
@@ -2290,7 +2290,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
@@ -2297,7 +2297,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@ -46,7 +46,7 @@ Index: chrome/common/pref_names.cc
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
@@ -3307,7 +3307,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
@@ -3300,7 +3300,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";

View File

@ -1,7 +1,7 @@
Index: chrome/common/pref_names.h
--- chrome/common/pref_names.h.orig
+++ chrome/common/pref_names.h
@@ -397,7 +397,7 @@ extern const char kUseAshProxy[];
@@ -398,7 +398,7 @@ extern const char kUseAshProxy[];
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/common/pref_names.h
// TODO(https://crbug.com/1317782): Remove in M110.
extern const char kUsesSystemThemeDeprecated[];
extern const char kSystemTheme[];
@@ -424,7 +424,7 @@ extern const char kShowUpdatePromotionInfoBar[];
@@ -425,7 +425,7 @@ extern const char kShowUpdatePromotionInfoBar[];
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -19,7 +19,7 @@ Index: chrome/common/pref_names.h
extern const char kUseCustomChromeFrame[];
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
@@ -611,7 +611,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
@@ -616,7 +616,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
extern const char kDownloadDirUpgraded[];
extern const char kDownloadLastCompleteTime[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -28,7 +28,7 @@ Index: chrome/common/pref_names.h
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -723,7 +723,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
@@ -728,7 +728,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
extern const char kWebAppsPreferences[];
extern const char kWebAppsIsolationState[];
@ -37,7 +37,7 @@ Index: chrome/common/pref_names.h
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
extern const char kWebAppsUrlHandlerInfo[];
#endif
@@ -854,7 +854,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
@@ -859,7 +859,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
extern const char kAmbientAuthenticationInPrivateModesEnabled[];
extern const char kBasicAuthOverHttpEnabled[];
@ -46,7 +46,7 @@ Index: chrome/common/pref_names.h
extern const char kAuthNegotiateDelegateByKdcPolicy[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -1123,7 +1123,7 @@ extern const char kBlockAutoplayEnabled[];
@@ -1128,7 +1128,7 @@ extern const char kBlockAutoplayEnabled[];
#endif
extern const char kSandboxExternalProtocolBlocked[];

View File

@ -1,7 +1,7 @@
Index: chrome/common/webui_url_constants.cc
--- chrome/common/webui_url_constants.cc.orig
+++ chrome/common/webui_url_constants.cc
@@ -480,18 +480,18 @@ const char kOsUIScanningAppURL[] = "os://scanning";
@@ -487,18 +487,18 @@ const char kOsUIScanningAppURL[] = "os://scanning";
const char kOsUIVersionURL[] = "os://version";
#endif
@ -23,7 +23,7 @@ Index: chrome/common/webui_url_constants.cc
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
@@ -506,14 +506,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
@@ -513,14 +513,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -40,7 +40,7 @@ Index: chrome/common/webui_url_constants.cc
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
const char kChromeUIEnterpriseProfileWelcomeHost[] =
@@ -529,7 +529,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
@@ -537,7 +537,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@ -49,7 +49,7 @@ Index: chrome/common/webui_url_constants.cc
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
@@ -605,7 +605,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
@@ -613,7 +613,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -58,7 +58,7 @@ Index: chrome/common/webui_url_constants.cc
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
@@ -813,7 +813,7 @@ const char* const kChromeDebugURLs[] = {
@@ -827,7 +827,7 @@ const char* const kChromeDebugURLs[] = {
blink::kChromeUIGpuJavaCrashURL,
kChromeUIJavaCrashURL,
#endif

View File

@ -1,7 +1,7 @@
Index: chrome/common/webui_url_constants.h
--- chrome/common/webui_url_constants.h.orig
+++ chrome/common/webui_url_constants.h
@@ -409,24 +409,24 @@ extern const char kOsUIScanningAppURL[];
@@ -414,24 +414,24 @@ extern const char kOsUIScanningAppURL[];
extern const char kOsUIVersionURL[];
#endif
@ -30,7 +30,7 @@ Index: chrome/common/webui_url_constants.h
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
@@ -441,14 +441,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
@@ -446,14 +446,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -47,7 +47,7 @@ Index: chrome/common/webui_url_constants.h
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
extern const char kChromeUIEnterpriseProfileWelcomeHost[];
@@ -461,7 +461,7 @@ extern const char kChromeUIProfilePickerUrl[];
@@ -467,7 +467,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif

View File

@ -1,7 +1,7 @@
Index: chrome/renderer/chrome_render_frame_observer.cc
--- chrome/renderer/chrome_render_frame_observer.cc.orig
+++ chrome/renderer/chrome_render_frame_observer.cc
@@ -342,7 +342,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
@@ -344,7 +344,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
void ChromeRenderFrameObserver::DraggableRegionsChanged() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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