kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/chromium: update to 103.0.5060.53

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/b2a4c5f1-f1fe-11ec-bcd2-3065ec8fd3ec.html
This commit is contained in:
Robert Nagy 2022-06-18 07:51:42 +02:00 committed by Rene Ladan
parent e408d5e4ec
commit 80ffbf089d
338 changed files with 5758 additions and 3886 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/chromium/Makefile
View file

@ -1,7 +1,7 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
PORTNAME= chromium
PORTVERSION= 102.0.5005.115
PORTVERSION= 103.0.5060.53
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:fonts
@ -197,7 +197,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.include "Makefile.tests"
TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz:fonts
test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz:fonts
TEST_ALL_TARGET= ${TEST_TARGETS}
.include <bsd.port.options.mk>

14
www/chromium/distinfo
View file

@ -1,7 +1,7 @@
TIMESTAMP = 1654845180
SHA256 (chromium-102.0.5005.115.tar.xz) = 301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
SIZE (chromium-102.0.5005.115.tar.xz) = 1461900356
SHA256 (chromium-102.0.5005.115-testdata.tar.xz) = f979682d8f159cdab5bc0f07ca6342e6e8f7718fedb30dac49bdd8f3f9739a4e
SIZE (chromium-102.0.5005.115-testdata.tar.xz) = 260718224
SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650
TIMESTAMP = 1655470095
SHA256 (chromium-103.0.5060.53.tar.xz) = 0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
SIZE (chromium-103.0.5060.53.tar.xz) = 1470748636
SHA256 (chromium-103.0.5060.53-testdata.tar.xz) = df1e4c1864c2b338553c19c58418c9c0fe4f9581e86d21ce3d2594594a3ec572
SIZE (chromium-103.0.5060.53-testdata.tar.xz) = 260732188
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

10
www/chromium/files/patch-BUILD.gn
View file

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2022-05-19 14:06:27 UTC
--- BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ BUILD.gn
@@ -54,7 +54,7 @@ declare_args() {
root_extra_deps = []
@ -17,7 +17,7 @@
"//net:net_unittests",
"//services:services_unittests",
"//services/service_manager/public/cpp",
@@ -450,7 +449,7 @@ group("gn_all") {
@@ -447,7 +446,7 @@ group("gn_all") {
]
}
@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1159,7 +1167,7 @@ if (!is_ios) {
@@ -1167,7 +1175,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -60,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1168,7 +1176,7 @@ if (!is_ios) {
@@ -1176,7 +1184,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -69,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1565,7 +1573,7 @@ group("chromium_builder_perf") {
@@ -1580,7 +1588,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

22
www/chromium/files/patch-base_BUILD.gn
View file

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2022-05-19 14:06:27 UTC
--- base/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ base/BUILD.gn
@@ -998,7 +998,7 @@ mixed_component("base") {
@@ -1004,7 +1004,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
@@ -1009,6 +1009,12 @@ mixed_component("base") {
@@ -1015,6 +1015,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@ -22,7 +22,7 @@
}
if (is_win) {
@@ -1486,11 +1492,23 @@ mixed_component("base") {
@@ -1496,11 +1502,23 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
@ -47,7 +47,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
@@ -1518,7 +1536,7 @@ mixed_component("base") {
@@ -1528,7 +1546,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@ -56,7 +56,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
@@ -1574,7 +1592,7 @@ mixed_component("base") {
@@ -1584,7 +1602,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -65,7 +65,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2147,6 +2165,42 @@ mixed_component("base") {
@@ -2158,6 +2176,42 @@ mixed_component("base") {
}
}
@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -3436,7 +3490,7 @@ test("base_unittests") {
@@ -3452,7 +3506,7 @@ test("base_unittests") {
}
}
@ -117,7 +117,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3484,7 +3538,7 @@ test("base_unittests") {
@@ -3500,7 +3554,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
@ -126,7 +126,7 @@
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3495,7 +3549,7 @@ test("base_unittests") {
@@ -3511,7 +3565,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -135,7 +135,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3657,7 +3711,7 @@ test("base_unittests") {
@@ -3683,7 +3737,7 @@ test("base_unittests") {
}
}

4
www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@ -9,7 +9,7 @@
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges
@@ -121,7 +121,7 @@ AslrMask(uintptr_t bits) {
@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) {
return AslrAddress(0x20000000ULL);
}

13
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc Normal file
View file

@ -0,0 +1,13 @@
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
@@ -88,6 +88,10 @@ void RandBytes(void* output, size_t output_length) {
return;
}
}
+#elif BUILDFLAG(IS_BSD)
+ if (getentropy(output, output_length) == 0) {
+ return;
+ }
#endif
// If the OS-specific mechanisms didn't work, fall through to reading from

4
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -80,7 +80,7 @@ PartitionPageShift() {
@@ -84,7 +84,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \

6
www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_page.h.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/partition_page.h.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_page.h
@@ -129,13 +129,14 @@ struct __attribute__((packed)) SlotSpanMetadata {
@@ -130,13 +130,14 @@ struct SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
@ -17,7 +17,7 @@
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).
@@ -149,7 +150,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
@@ -150,7 +151,9 @@ struct SlotSpanMetadata {
#endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
// The maximum number of bits needed to cover all currently supported OSes.
static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;

4
www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -29,7 +29,7 @@
#include "wow64apiset.h"
@ -27,7 +27,7 @@
// 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
@@ -648,7 +648,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -651,7 +651,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

39
www/chromium/files/patch-base_files_dir__reader__linux.h Normal file
View file

@ -0,0 +1,39 @@
--- base/files/dir_reader_linux.h.orig 2022-06-18 05:49:12 UTC
+++ base/files/dir_reader_linux.h
@@ -16,10 +16,16 @@
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
+#include "build/build_config.h"
+
// See the comments in dir_reader_posix.h about this.
namespace base {
+#if BUILDFLAG(IS_BSD)
+#include <dirent.h>
+typedef struct dirent linux_dirent;
+#else
struct linux_dirent {
uint64_t d_ino;
int64_t d_off;
@@ -27,6 +33,7 @@ struct linux_dirent {
unsigned char d_type;
char d_name[0];
};
+#endif
class DirReaderLinux {
public:
@@ -61,7 +68,11 @@ class DirReaderLinux {
if (offset_ != size_)
return true;
+#if BUILDFLAG(IS_BSD)
+ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
+#else
const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
+#endif
if (r == 0)
return false;
if (r == -1) {

20
www/chromium/files/patch-base_files_dir__reader__posix.h Normal file
View file

@ -0,0 +1,20 @@
--- base/files/dir_reader_posix.h.orig 2022-06-17 14:20:10 UTC
+++ base/files/dir_reader_posix.h
@@ -17,7 +17,7 @@
// seems worse than falling back to enumerating all file descriptors so we will
// probably never implement this on the Mac.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "base/files/dir_reader_linux.h"
#else
#include "base/files/dir_reader_fallback.h"
@@ -25,7 +25,7 @@
namespace base {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
typedef DirReaderLinux DirReaderPosix;
#else
typedef DirReaderFallback DirReaderPosix;

4
www/chromium/files/patch-base_files_file__util__posix.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig 2022-05-19 14:06:27 UTC
--- base/files/file_util_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/files/file_util_posix.cc
@@ -697,32 +697,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -696,32 +696,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().

6
www/chromium/files/patch-base_files_file__util__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2022-04-21 18:48:31 UTC
--- base/files/file_util_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/files/file_util_unittest.cc
@@ -3523,7 +3523,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4239,7 +4239,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4238,7 +4238,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

6
www/chromium/files/patch-base_i18n_icu__util.cc
View file

@ -1,6 +1,6 @@
--- base/i18n/icu_util.cc.orig 2022-05-19 14:06:27 UTC
--- base/i18n/icu_util.cc.orig 2022-06-17 14:20:10 UTC
+++ base/i18n/icu_util.cc
@@ -52,7 +52,7 @@
@@ -54,7 +54,7 @@
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
@ -9,7 +9,7 @@
!BUILDFLAG(IS_CHROMECAST))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -324,7 +324,7 @@ void InitializeIcuTimeZone() {
@@ -326,7 +326,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));

4
www/chromium/files/patch-base_logging__unittest.cc
View file

@ -1,4 +1,4 @@
--- base/logging_unittest.cc.orig 2022-02-28 16:54:41 UTC
--- base/logging_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/logging_unittest.cc
@@ -32,7 +32,7 @@
#include "base/posix/eintr_wrapper.h"
@ -9,7 +9,7 @@
#include <ucontext.h>
#endif
@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
// need the arch-specific boilerplate below, which is inspired by breakpad.
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
uintptr_t crash_addr = 0;

6
www/chromium/files/patch-base_memory_platform__shared__memory__region.h
View file

@ -1,6 +1,6 @@
--- base/memory/platform_shared_memory_region.h.orig 2022-05-19 14:06:27 UTC
--- base/memory/platform_shared_memory_region.h.orig 2022-06-17 14:20:10 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -14,7 +14,7 @@
@@ -16,7 +16,7 @@
#include <stdint.h>
@ -9,7 +9,7 @@
namespace content {
class SandboxIPCHandler;
}
@@ -81,7 +81,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};

4
www/chromium/files/patch-base_process_launch.h
View file

@ -1,6 +1,6 @@
--- base/process/launch.h.orig 2022-05-19 14:06:27 UTC
--- base/process/launch.h.orig 2022-06-17 14:20:10 UTC
+++ base/process/launch.h
@@ -199,7 +199,7 @@ struct BASE_EXPORT LaunchOptions {
@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)

4
www/chromium/files/patch-base_process_launch__posix.cc
View file

@ -1,6 +1,6 @@
--- base/process/launch_posix.cc.orig 2022-02-07 13:39:41 UTC
--- base/process/launch_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/process/launch_posix.cc
@@ -64,6 +64,9 @@
@@ -63,6 +63,9 @@
#error "macOS should use launch_mac.cc"
#endif

12
www/chromium/files/patch-base_process_process__metrics.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics.cc.orig 2022-05-19 14:06:27 UTC
--- base/process/process_metrics.cc.orig 2022-06-17 14:20:10 UTC
+++ base/process/process_metrics.cc
@@ -18,7 +18,7 @@ namespace base {
@@ -17,7 +17,7 @@ namespace base {
namespace {
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
int CalculateEventsPerSecond(uint64_t event_count,
uint64_t* last_event_count,
base::TimeTicks* last_calculated) {
@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() {
@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() {
SystemMetrics system_metrics;
system_metrics.committed_memory_ = GetSystemCommitCharge();
@ -18,7 +18,7 @@
GetSystemMemoryInfo(&system_metrics.memory_info_);
GetVmStatInfo(&system_metrics.vmstat_info_);
GetSystemDiskInfo(&system_metrics.disk_info_);
@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const {
@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const {
Value res(Value::Type::DICTIONARY);
res.SetIntKey("committed_memory", static_cast<int>(committed_memory_));
@ -27,7 +27,7 @@
Value meminfo = memory_info_.ToValue();
Value vmstat = vmstat_info_.ToValue();
meminfo.MergeDictionary(&vmstat);
@@ -100,7 +100,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
@ -36,7 +36,7 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
TimeDelta cumulative_cpu = GetCumulativeCPUUsage();
TimeTicks time = TimeTicks::Now();
@@ -151,7 +151,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

28
www/chromium/files/patch-base_process_process__metrics.h
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics.h.orig 2022-05-19 14:06:27 UTC
--- base/process/process_metrics.h.orig 2022-06-17 14:20:10 UTC
+++ base/process/process_metrics.h
@@ -36,7 +36,7 @@
@@ -35,7 +35,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -9,7 +9,7 @@
#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;
@ -18,7 +18,7 @@
// 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();
@ -27,7 +27,7 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -154,7 +154,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -258,7 +258,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -63,7 +63,7 @@
CPU::CoreType GetCoreType(int core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -293,7 +293,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -72,7 +72,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -337,7 +337,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -336,7 +336,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) || \
@ -81,7 +81,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -371,7 +371,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -90,7 +90,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -386,7 +386,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -99,7 +99,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -423,7 +423,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -108,7 +108,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics {
@@ -610,7 +610,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

4
www/chromium/files/patch-base_process_process__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_unittest.cc.orig 2022-02-28 16:54:41 UTC
--- base/process/process_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/process/process_unittest.cc
@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
@@ -139,7 +139,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
// was spawned and a time recorded after it was spawned. However, since the
// base::Time and process creation clocks don't match, tolerate some error.
constexpr base::TimeDelta kTolerance =

6
www/chromium/files/patch-base_synchronization_lock__impl.h
View file

@ -1,6 +1,6 @@
--- base/synchronization/lock_impl.h.orig 2022-05-19 14:06:27 UTC
--- base/synchronization/lock_impl.h.orig 2022-06-17 14:20:10 UTC
+++ base/synchronization/lock_impl.h
@@ -106,6 +106,10 @@ void LockImpl::Unlock() {
@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@ -11,7 +11,7 @@
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
@@ -126,6 +130,9 @@ void LockImpl::Unlock() {
@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}

4
www/chromium/files/patch-base_system_sys__info.cc
View file

@ -1,6 +1,6 @@
--- base/system/sys_info.cc.orig 2022-05-19 14:06:27 UTC
--- base/system/sys_info.cc.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info.cc
@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
@@ -103,7 +103,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));

6
www/chromium/files/patch-base_system_sys__info.h
View file

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2022-03-16 08:38:25 UTC
--- base/system/sys_info.h.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info.h
@@ -212,6 +212,8 @@ class BASE_EXPORT SysInfo {
@@ -211,6 +211,8 @@ class BASE_EXPORT SysInfo {
// On Desktop this returns true when memory <= 2GB.
static bool IsLowEndDevice();
@ -9,7 +9,7 @@
private:
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
@@ -222,7 +224,7 @@ class BASE_EXPORT SysInfo {
@@ -221,7 +223,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

10
www/chromium/files/patch-base_system_sys__info__posix.cc
View file

@ -1,6 +1,6 @@
--- base/system/sys_info_posix.cc.orig 2022-03-25 21:59:56 UTC
--- base/system/sys_info_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info_posix.cc
@@ -37,7 +37,7 @@
@@ -36,7 +36,7 @@
namespace {
@ -9,7 +9,7 @@
int NumberOfProcessors() {
// sysconf returns the number of "logical" (not "physical") processors on both
// Mac and Linux. So we get the number of max available "logical" processors.
@@ -77,7 +77,7 @@ int NumberOfProcessors() {
@@ -76,7 +76,7 @@ int NumberOfProcessors() {
base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
@ -18,7 +18,7 @@
int64_t AmountOfVirtualMemory() {
struct rlimit limit;
@@ -143,11 +143,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
@@ -142,11 +142,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
namespace base {
@ -32,7 +32,7 @@
// static
int64_t SysInfo::AmountOfVirtualMemory() {
@@ -239,6 +239,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
@@ -236,6 +236,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
arch = "x86";
} else if (arch == "amd64") {
arch = "x86_64";

4
www/chromium/files/patch-base_system_sys__info__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/system/sys_info_unittest.cc.orig 2022-03-25 21:59:56 UTC
--- base/system/sys_info_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info_unittest.cc
@@ -234,12 +234,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
@@ -233,12 +233,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \

22
www/chromium/files/patch-base_threading_platform__thread__linux.cc
View file

@ -1,6 +1,6 @@
--- base/threading/platform_thread_linux.cc.orig 2022-05-19 14:06:27 UTC
--- base/threading/platform_thread_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ base/threading/platform_thread_linux.cc
@@ -30,7 +30,9 @@
@@ -29,7 +29,9 @@
#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#include <pthread.h>
@ -10,16 +10,16 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
@@ -133,7 +135,7 @@ int sched_setattr(pid_t pid,
@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid,
#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
#endif // BUILDFLAG(IS_CHROMEOS)
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
@@ -287,7 +289,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
namespace internal {
namespace {
@ -28,7 +28,7 @@
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
@@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
};
bool CanSetThreadPriorityToRealtimeAudio() {
@ -37,7 +37,7 @@
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
struct rlimit rlim;
@@ -311,7 +313,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
}
bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
@ -46,7 +46,7 @@
// For legacy schedtune interface
SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority);
@@ -329,7 +331,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
}
absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() {
@ -55,7 +55,7 @@
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
@@ -348,7 +350,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
@ -64,7 +64,7 @@
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
@@ -378,8 +380,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
// priority.
CHECK_NE(thread_id, process_id);
@ -73,5 +73,5 @@
SetThreadCgroupsForThreadPriority(thread_id, priority);
+#endif
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_CHROMEOS)
// For upstream uclamp interface. We try both legacy (schedtune, as done

6
www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
View file

@ -1,4 +1,4 @@
--- base/trace_event/malloc_dump_provider.cc.orig 2022-05-19 14:06:27 UTC
--- base/trace_event/malloc_dump_provider.cc.orig 2022-06-17 14:20:10 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -23,6 +23,8 @@
@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
@@ -174,7 +176,8 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
@@ -176,7 +178,8 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
@ -19,7 +19,7 @@
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
@@ -339,6 +342,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
@@ -341,6 +344,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.

6
www/chromium/files/patch-base_trace__event_process__memory__dump.cc
View file

@ -1,6 +1,6 @@
--- base/trace_event/process_memory_dump.cc.orig 2022-02-28 16:54:41 UTC
--- base/trace_event/process_memory_dump.cc.orig 2022-06-17 14:20:10 UTC
+++ base/trace_event/process_memory_dump.cc
@@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
@@ -106,7 +106,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
#if BUILDFLAG(IS_WIN)
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
@ -9,7 +9,7 @@
std::unique_ptr<char[]> vec(new char[max_vec_size]);
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
@@ -130,7 +130,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
@@ -131,7 +131,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
for (size_t i = 0; i < page_count; i++)
resident_page_count += vec[i].VirtualAttributes.Valid;

21
www/chromium/files/patch-build_config_compiler_BUILD.gn
View file

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2022-05-19 14:06:27 UTC
--- build/config/compiler/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ build/config/compiler/BUILD.gn
@@ -231,13 +231,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
@@ -904,7 +911,7 @@ config("compiler_cpu_abi") {
@@ -903,7 +910,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -47,7 +47,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
@@ -918,7 +925,7 @@ config("compiler_cpu_abi") {
@@ -917,7 +924,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -56,7 +56,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
@@ -1239,7 +1246,7 @@ config("compiler_deterministic") {
@@ -1238,7 +1245,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.
@ -65,7 +65,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1530,7 +1537,7 @@ config("default_warnings") {
@@ -1529,12 +1536,12 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -73,9 +73,6 @@
+ if (!is_nacl && !is_bsd) {
# TODO(https://crbug.com/1300731) Clean up and enable.
cflags += [ "-Wno-unqualified-std-cast-call" ]
@@ -1538,7 +1545,7 @@ config("default_warnings") {
cflags += [ "-Wno-deprecated-non-prototype" ]
}
- if (!is_nacl && !(is_chromeos ||
@ -83,7 +80,7 @@
default_toolchain == "//build/toolchain/cros:target")) {
# TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
cflags += [
@@ -1723,7 +1730,7 @@ config("no_chromium_code") {
@@ -1719,7 +1726,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -92,7 +89,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2237,7 +2244,7 @@ config("afdo_optimize_size") {
@@ -2233,7 +2240,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") {
@ -101,7 +98,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2253,7 +2260,7 @@ config("afdo") {
@@ -2249,7 +2256,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -110,7 +107,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2396,7 +2403,8 @@ config("symbols") {
@@ -2392,7 +2399,8 @@ config("symbols") {
}
}

4
www/chromium/files/patch-build_config_rust.gni
View file

@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2022-03-25 21:59:56 UTC
--- build/config/rust.gni.orig 2022-06-17 14:20:10 UTC
+++ build/config/rust.gni
@@ -116,7 +116,7 @@ if (enable_rust) {
@@ -124,7 +124,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {

10
www/chromium/files/patch-build_linux_unbundle_libxml.gn
View file

@ -1,10 +0,0 @@
--- build/linux/unbundle/libxml.gn.orig 2022-04-21 18:48:31 UTC
+++ build/linux/unbundle/libxml.gn
@@ -19,6 +19,7 @@ static_library("libxml_utils") {
":xml_reader",
":xml_writer",
"//base/test:test_support",
+ "//services/data_decoder:lib",
"//services/data_decoder:xml_parser_fuzzer_deps",
]
sources = [

6
www/chromium/files/patch-cc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2022-04-21 18:48:31 UTC
--- cc/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ cc/BUILD.gn
@@ -665,7 +665,7 @@ cc_test_static_library("test_support") {
@@ -669,7 +669,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -893,7 +893,6 @@ cc_test("cc_unittests") {
@@ -897,7 +897,6 @@ cc_test("cc_unittests") {
data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

10
www/chromium/files/patch-chrome_app_app__management__strings.grdp
View file

@ -1,11 +1,11 @@
--- chrome/app/app_management_strings.grdp.orig 2022-05-19 14:06:27 UTC
--- chrome/app/app_management_strings.grdp.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/app_management_strings.grdp
@@ -165,7 +165,7 @@
@@ -174,7 +174,7 @@
</message>
</if>
<!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->
- <if expr="is_fuchsia or is_linux and not chromeos_ash">
+ <if expr="is_fuchsia or is_posix and not chromeos_ash">
<!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash and not chromeos_lacros` once fixed. -->
- <if expr="is_fuchsia or is_linux and not chromeos_ash and not chromeos_lacros">
+ <if expr="is_fuchsia or is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>

13
www/chromium/files/patch-chrome_app_chrome__command__ids.h
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_command_ids.h.orig 2022-04-21 18:48:31 UTC
--- chrome/app/chrome_command_ids.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chrome_command_ids.h
@@ -66,7 +66,7 @@
@@ -67,7 +67,7 @@
#define IDC_NAME_WINDOW 34049
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete.
@ -9,12 +9,3 @@
#define IDC_USE_SYSTEM_TITLE_BAR 34051
#define IDC_RESTORE_WINDOW 34052
#endif
@@ -447,7 +447,7 @@
#define IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY 52414
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Screen AI
#define IDC_RUN_SCREEN_AI 52420
#endif

6
www/chromium/files/patch-chrome_app_chrome__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/app/chrome_main.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chrome_main.cc
@@ -25,7 +25,7 @@
@@ -26,7 +26,7 @@
#include "chrome/app/notification_metrics.h"
#endif
@ -9,7 +9,7 @@
#include "base/base_switches.h"
#endif
@@ -146,7 +146,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

18
www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -116,7 +116,7 @@
@@ -117,7 +117,7 @@
#include "chrome/app/chrome_crash_reporter_client.h"
#endif
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -159,12 +159,12 @@
@@ -160,12 +160,12 @@
#include "v8/include/v8.h"
#endif
@ -60,7 +60,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -669,6 +669,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
@@ -668,6 +668,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@ -69,7 +69,7 @@
#else
bool enable_gwp_asan = true;
#endif
@@ -807,7 +809,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
@@ -806,7 +808,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -78,8 +78,8 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -838,7 +840,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -837,7 +839,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@ -87,7 +87,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1153,7 +1155,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1163,7 +1165,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@ -96,7 +96,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if BUILDFLAG(IS_ANDROID)
@@ -1223,7 +1225,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1233,7 +1235,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.

18
www/chromium/files/patch-chrome_app_chromium__strings.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/chromium_strings.grd.orig 2022-05-19 14:06:27 UTC
--- chrome/app/chromium_strings.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chromium_strings.grd
@@ -296,7 +296,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
@ -9,12 +9,12 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Chromium
</message>
@@ -981,7 +981,7 @@ Permissions you've already given to websites and apps
</message>
<!-- ProcessSingleton -->
- <if expr="is_linux or is_macosx">
+ <if expr="is_posix or is_macosx">
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
@@ -410,7 +410,7 @@ If you update this file, be sure also to update google
Chromium may not function correctly because it is no longer supported on Windows XP or Windows Vista
</message>
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
Chromium may not function correctly because it is no longer supported on this Linux distribution
</message>

8
www/chromium/files/patch-chrome_app_generated__resources.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2022-05-19 14:06:27 UTC
--- chrome/app/generated_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
@@ -3013,7 +3013,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -2989,7 +2989,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@ -18,7 +18,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
@@ -8670,7 +8670,7 @@ Keep your key file in a safe place. You will need it t
@@ -8669,7 +8669,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -27,7 +27,7 @@
<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>
@@ -9821,7 +9821,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -9823,7 +9823,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>

18
www/chromium/files/patch-chrome_app_google__chrome__strings.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/google_chrome_strings.grd.orig 2022-05-19 14:06:27 UTC
--- chrome/app/google_chrome_strings.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
@ -9,12 +9,12 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Google Chrome
</message>
@@ -1048,7 +1048,7 @@ Permissions you've already given to websites and apps
</message>
<!-- ProcessSingleton -->
- <if expr="is_linux or is_macosx">
+ <if expr="is_posix or is_macosx">
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
@@ -438,7 +438,7 @@ chromium_strings.grd. -->
This computer will no longer receive Google Chrome updates because Windows XP and Windows Vista are no longer supported
</message>
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
Google Chrome may not function correctly because it is no longer supported on this Linux distribution
</message>

8
www/chromium/files/patch-chrome_app_theme_theme__resources.grd
View file

@ -1,6 +1,6 @@
--- chrome/app/theme/theme_resources.grd.orig 2022-05-19 14:06:27 UTC
--- chrome/app/theme/theme_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/theme/theme_resources.grd
@@ -128,11 +128,11 @@
@@ -130,11 +130,11 @@
<structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" />
</if>
<if expr="not _google_chrome">
@ -14,7 +14,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
</if>
@@ -140,7 +140,7 @@
@@ -142,7 +142,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" />
</if>
<if expr="_google_chrome">
@ -23,7 +23,7 @@
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
@@ -148,7 +148,7 @@
@@ -150,7 +150,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
</if>

33
www/chromium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/about_flags.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/about_flags.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/about_flags.cc
@@ -202,7 +202,7 @@
#include "ui/native_theme/native_theme_features.h"
@ -9,8 +9,8 @@
#include "base/allocator/buildflags.h"
#endif
@@ -274,7 +274,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
@@ -275,7 +275,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -363,7 +363,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
@@ -364,7 +364,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
@@ -3668,7 +3668,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3681,7 +3681,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -45,16 +45,16 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -4271,7 +4271,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4283,7 +4283,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux | kOsLacros,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
@@ -4291,7 +4291,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4302,7 +4302,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@ -63,7 +63,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -4986,7 +4986,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4979,7 +4979,7 @@ const FeatureEntry kFeatureEntries[] = {
"OmniboxBundledExperimentV1")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -72,16 +72,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -5375,7 +5375,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#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)
{"webui-feedback", flag_descriptions::kWebuiFeedbackName,
flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
@@ -6396,7 +6396,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6378,7 +6378,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -90,7 +81,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -7260,7 +7260,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7251,7 +7251,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -99,7 +90,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -7551,7 +7551,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7547,7 +7547,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

8
www/chromium/files/patch-chrome_browser_browser__process__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/browser_process_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -209,7 +209,7 @@
@@ -208,7 +208,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1158,7 +1158,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1153,7 +1153,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1415,7 +1415,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1405,7 +1405,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

4
www/chromium/files/patch-chrome_browser_browser__process__impl.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.h.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/browser_process_impl.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/browser_process_impl.h
@@ -366,7 +366,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -358,7 +358,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/chromium/files/patch-chrome_browser_browser__resources.grd
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_resources.grd.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/browser_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/browser_resources.grd
@@ -119,7 +119,7 @@
@@ -125,7 +125,7 @@
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
</if>
<!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->

16
www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -100,13 +100,13 @@
@@ -110,13 +110,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -177,7 +177,7 @@
@@ -183,7 +183,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,8 +25,8 @@
#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"
@@ -726,7 +726,7 @@ void PopulateChromeFrameBinders(
#endif
@@ -752,7 +752,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -734,7 +734,7 @@ void PopulateChromeFrameBinders(
@@ -760,7 +760,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
render_frame_host->IsInPrimaryMainFrame()) {
map->Add<blink::mojom::SubAppsService>(
@@ -781,14 +781,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -815,14 +815,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1111,7 +1111,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

12
www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -230,11 +230,11 @@
@@ -231,11 +231,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -14,7 +14,7 @@
#include "components/crash/core/app/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -269,7 +269,7 @@
@@ -270,7 +270,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -23,7 +23,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
@@ -1009,7 +1009,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1019,7 +1019,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -32,7 +32,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1022,7 +1022,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1032,7 +1032,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@ -41,7 +41,7 @@
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1053,7 +1053,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

24
www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
View file

@ -1,20 +1,28 @@
--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -57,7 +57,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
@@ -57,13 +57,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
}
void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// No-op: Ash and Lacros Bluetooth DBusManager initialization depend on
// FeatureList, and is done elsewhere.
#else
@@ -122,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // BUILDFLAG(IS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_BSD)
bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
+#endif
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
@@ -123,7 +125,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// No-op; per PostBrowserStart() comment, this is done elsewhere.
#else
bluez::BluezDBusManager::Shutdown();

32
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -378,7 +378,7 @@
@@ -381,7 +381,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"
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -448,17 +448,17 @@
@@ -454,17 +454,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -30,7 +30,7 @@
#if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
@@ -466,12 +466,12 @@
@@ -472,12 +472,12 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -45,7 +45,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -493,11 +493,11 @@
@@ -501,11 +501,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -59,7 +59,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -889,7 +889,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
@@ -892,7 +892,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@ -68,16 +68,16 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
@@ -1406,7 +1406,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
std::move(parameters), &startup_data_);
is_integration_test, &startup_data_);
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
std::move(parameters), &startup_data_);
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1440,7 +1440,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
@@ -1444,7 +1444,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.
@ -86,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1457,7 +1457,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
@@ -1461,7 +1461,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -95,7 +95,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -2206,6 +2206,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2230,6 +2230,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -104,7 +104,7 @@
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2513,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2547,7 +2549,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -113,7 +113,7 @@
// TODO(https://crbug.com/1316129): Re-enable for Lacros.
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
@@ -3903,7 +3905,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -3960,7 +3962,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -4310,14 +4312,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4371,14 +4373,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -139,7 +139,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -4350,7 +4352,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4411,7 +4413,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -414,7 +414,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -420,7 +420,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

20
www/chromium/files/patch-chrome_browser_component__updater_registration.cc
View file

@ -1,20 +0,0 @@
--- chrome/browser/component_updater/registration.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/component_updater/registration.cc
@@ -90,7 +90,7 @@
#include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
#endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/component_updater/screen_ai_component_installer.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -214,7 +214,7 @@ void RegisterComponentsForUpdate() {
RegisterClientSidePhishingComponent(cus);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
RegisterScreenAIComponent(cus, g_browser_process->local_state());
#endif // BUILDFLAG(IS_LINUX)

10
www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/crash_upload_list/crash_upload_list.cc
@@ -52,7 +52,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
@@ -50,7 +50,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
// which isn't compatible with CrashUploadListCrashpad. crash_sender continues
// to log uploads in CrashUploadList::kReporterLogFilename.
// Linux is handled below.
#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
- BUILDFLAG(IS_LINUX))
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX))
+#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
if (crash_reporter::IsCrashpadEnabled()) {
return new CrashUploadListCrashpad();
}

12
www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
View file

@ -1,11 +1,11 @@
--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
@@ -50,7 +50,7 @@ This file specifies browser resources for developer-fa
<include name="IDR_PROFILE_INTERNALS_HTML" file="resources\profiles\profile_internals.html" type="BINDATA" />
<include name="IDR_MEDIA_SESSION_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\services\media_session\public\mojom\media_session.mojom-webui.js" use_base_dir="false" type="BINDATA" />
@@ -41,7 +41,7 @@ This file specifies browser resources for developer-fa
<include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" />
- <if expr="is_android or is_linux">
+ <if expr="is_android or is_posix">
- <if expr="is_android or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_android or is_posix or chromeos_ash or chromeos_lacros">
<include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" preprocess="true" type="BINDATA" />
</if>

12
www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1533,7 +1533,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1540,7 +1540,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
@ -9,7 +9,7 @@
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
@@ -1585,7 +1585,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1592,7 +1592,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -1693,7 +1693,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1699,7 +1699,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) || \
@ -27,7 +27,7 @@
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1735,7 +1735,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
@@ -1741,7 +1741,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -36,7 +36,7 @@
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
#else
@@ -1751,7 +1751,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
@@ -1757,7 +1757,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

6
www/chromium/files/patch-chrome_browser_download_download__item__model.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/download/download_item_model.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -678,7 +678,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -671,7 +671,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
@@ -718,7 +718,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -711,7 +711,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

35
www/chromium/files/patch-chrome_browser_download_download__prefs.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/download/download_prefs.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -13,6 +13,7 @@
#include "base/callback_helpers.h"
@ -46,25 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -434,7 +439,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
bool DownloadPrefs::IsAutoOpenByUserUsed() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (ShouldOpenPdfInSystemReader())
return true;
#endif
@@ -449,7 +454,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) &&
ShouldOpenPdfInSystemReader())
@@ -504,7 +509,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -496,7 +501,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -73,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -526,7 +531,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -528,7 +533,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -82,7 +64,16 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -666,7 +671,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -559,7 +564,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -678,7 +683,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.

4
www/chromium/files/patch-chrome_browser_download_download__prefs.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.h.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/download/download_prefs.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/download_prefs.h
@@ -125,7 +125,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@ -9,7 +9,7 @@
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
@@ -185,7 +185,7 @@ class DownloadPrefs {
@@ -186,7 +186,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

4
www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1302,6 +1302,10 @@ static_library("extensions") {
@@ -1281,6 +1281,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

4
www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
@@ -168,7 +168,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret

4
www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
@@ -52,7 +52,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
~EnterpriseReportingPrivateGetDeviceIdFunction() override;
};

6
www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -183,7 +183,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
@@ -197,7 +197,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_NUMBER;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

8
www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -53,7 +53,7 @@
@@ -52,7 +52,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "ppapi/buildflags/buildflags.h"
@ -9,10 +9,10 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
@@ -133,7 +133,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
@@ -131,7 +131,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
#endif
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SignedInDevicesManager::GetFactoryInstance();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
extensions::SystemIndicatorManagerFactory::GetInstance();

4
www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -217,7 +217,7 @@ const struct {
@@ -219,7 +219,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif

12
www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
View file

@ -1,11 +1,11 @@
--- chrome/browser/first_run/first_run_internal.h.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/first_run/first_run_internal.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/first_run/first_run_internal.h
@@ -58,7 +58,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
@@ -56,7 +56,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
bool force_first_run,
bool no_first_run);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// For testing, forces the first run dialog to either be shown or not. If not
// called, the decision to show the dialog or not will be made by Chrome based
// on a number of factors (such as install type, whether it's a Chrome-branded

21
www/chromium/files/patch-chrome_browser_flag__descriptions.cc
View file

@ -1,24 +1,15 @@
--- chrome/browser/flag_descriptions.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/flag_descriptions.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -5639,7 +5639,7 @@ const char kDownloadShelfWebUIDescription[] =
@@ -5709,7 +5709,7 @@ const char kSideSearchDSESupportDescription[] =
// Random platform combinations -----------------------------------------------
#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)
const char kWebuiFeedbackName[] = "WebUI Feedback";
const char kWebuiFeedbackDescription[] =
@@ -5650,7 +5650,7 @@ const char kWebuiFeedbackDescription[] =
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kDesktopRestructuredLanguageSettingsName[] =
"Restructured Language Settings (Desktop)";
@@ -5676,7 +5676,7 @@ const char kWebShareDescription[] =
@@ -5735,7 +5735,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -27,7 +18,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -5688,7 +5688,7 @@ const char kOzonePlatformHintDescription[] =
@@ -5747,7 +5747,7 @@ const char kOzonePlatformHintDescription[] =
"\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
@ -36,7 +27,7 @@
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
@@ -5701,7 +5701,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -5760,7 +5760,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@ -45,7 +36,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -5832,7 +5832,7 @@ const char kElasticOverscrollDescription[] =
@@ -5875,7 +5875,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

19
www/chromium/files/patch-chrome_browser_flag__descriptions.h
View file

@ -1,24 +1,15 @@
--- chrome/browser/flag_descriptions.h.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/flag_descriptions.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/flag_descriptions.h
@@ -3241,7 +3241,7 @@ extern const char kDownloadShelfWebUIDescription[];
@@ -3279,7 +3279,7 @@ extern const char kSideSearchDSESupportDescription[];
// Random platform combinations -----------------------------------------------
#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)
extern const char kWebuiFeedbackName[];
extern const char kWebuiFeedbackDescription[];
@@ -3250,7 +3250,7 @@ extern const char kWebuiFeedbackDescription[];
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kDesktopRestructuredLanguageSettingsName[];
extern const char kDesktopRestructuredLanguageSettingsDescription[];
@@ -3269,7 +3269,7 @@ extern const char kWebShareName[];
@@ -3298,7 +3298,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -27,7 +18,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -3285,7 +3285,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -3314,7 +3314,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -36,7 +27,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -3377,7 +3377,7 @@ extern const char kElasticOverscrollDescription[];
@@ -3395,7 +3395,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

6
www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-03-25 21:59:56 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -57,8 +57,10 @@
@@ -60,8 +60,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -223,7 +225,7 @@ void RecordStartupMetrics() {
@@ -227,7 +229,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.

8
www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -787,7 +787,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -876,7 +876,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -18,7 +18,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
metrics_service_->RegisterMetricsProvider(
@@ -1053,7 +1053,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1055,7 +1055,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc → www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc
@@ -43,7 +43,7 @@ void RecordProcessHistograms(const char* histogram_suf
--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
@@ -41,7 +41,7 @@ void RecordProcessHistograms(const char* histogram_suf
kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

8
www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc → www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_monitor/process_monitor.cc
@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/power/process_monitor.cc
@@ -59,7 +59,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
metrics.precise_cpu_usage = process_metrics.GetPreciseCPUUsage();
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif
#if BUILDFLAG(IS_MAC)
@@ -119,7 +119,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
@@ -114,7 +114,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

6
www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h → www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/performance_monitor/process_monitor.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_monitor/process_monitor.h
@@ -78,7 +78,7 @@ class ProcessMonitor : public content::BrowserChildPro
--- chrome/browser/metrics/power/process_monitor.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/power/process_monitor.h
@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

4
www/chromium/files/patch-chrome_browser_platform__util__linux.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/platform_util_linux.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/platform_util_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/platform_util_linux.cc
@@ -298,7 +298,9 @@ void RunCommand(const std::string& command,
@@ -294,7 +294,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
options.current_directory = working_directory;

11
www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
View file

@ -1,11 +0,0 @@
--- chrome/browser/plugins/plugins_resource_service.cc.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/plugins/plugins_resource_service.cc
@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() {
filename = "plugins_win.json";
#elif BUILDFLAG(IS_CHROMEOS_ASH)
filename = "plugins_chromeos.json";
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
filename = "plugins_linux.json";
#elif BUILDFLAG(IS_MAC)
filename = "plugins_mac.json";

16
www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -187,7 +187,7 @@
#endif // BUILDFLAG(ENABLE_SIDE_SEARCH)
@@ -186,7 +186,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
@@ -1557,7 +1557,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS)
@ -18,7 +18,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1624,7 +1624,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -27,7 +27,7 @@
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
@@ -1940,7 +1940,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -1945,7 +1945,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -36,7 +36,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2294,7 +2294,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
static_cast<int>(variations::RestrictionPolicy::ALL), false));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -45,7 +45,7 @@
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2313,7 +2313,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2318,7 +2318,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
policy::key::kSpellcheckLanguageBlocklist));
#endif // BUILDFLAG(ENABLE_SPELLCHECK)

17
www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -430,14 +430,14 @@
@@ -434,14 +434,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@ -17,7 +17,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -1191,7 +1191,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1177,7 +1177,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@ -26,16 +26,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
@@ -1205,7 +1205,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
registry->RegisterBooleanPref(
policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
screen_ai::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -1504,7 +1504,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1492,7 +1492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

8
www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -480,7 +480,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
@@ -481,7 +481,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
@@ -705,7 +705,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -706,7 +706,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@ -18,7 +18,7 @@
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
@@ -762,7 +762,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -763,7 +763,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:

4
www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -400,7 +400,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -406,7 +406,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -264,6 +264,10 @@
@@ -259,6 +259,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -844,7 +848,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -845,7 +849,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

4
www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/profiles_state.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/profiles/profiles_state.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/profiles/profiles_state.cc
@@ -176,7 +176,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
@@ -177,7 +177,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
PrefService* local_state,
bool show_warning) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \

4
www/chromium/files/patch-chrome_browser_resources_settings_route.ts
View file

@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/route.ts.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/resources/settings/route.ts.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/resources/settings/route.ts
@@ -188,7 +188,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
@@ -190,7 +190,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');

4
www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -20,7 +20,7 @@
#include "content/public/browser/browser_thread.h"
@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
@@ -283,7 +283,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
@@ -289,7 +289,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)

10
www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/signin/primary_account_policy_manager.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/signin/primary_account_policy_manager.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/signin/primary_account_policy_manager.cc
@@ -22,7 +22,7 @@
@@ -23,7 +23,7 @@
#include "google_apis/gaia/gaia_auth_util.h"
#include "ui/base/l10n/l10n_util.h"
@ -9,7 +9,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -34,7 +34,7 @@
@@ -35,7 +35,7 @@
#include "chrome/browser/ui/webui/profile_helper.h"
#endif
@ -18,7 +18,7 @@
// Manager that presents the profile will be deleted dialog on the first active
// browser window.
class PrimaryAccountPolicyManager::DeleteProfileDialogManager
@@ -249,7 +249,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
@@ -250,7 +250,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
break;
}
case signin::Tribool::kFalse:
@ -27,7 +27,7 @@
// Force remove the profile if sign out is not allowed and if the
// primary account is no longer allowed.
// This may be called while the profile is initializing, so it must be
@@ -280,7 +280,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
@@ -281,7 +281,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
}

20
www/chromium/files/patch-chrome_browser_themes_theme__helper.cc Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/themes/theme_helper.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/themes/theme_helper.cc
@@ -24,7 +24,7 @@
#include "ui/native_theme/common_theme.h"
#include "ui/native_theme/native_theme.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -494,7 +494,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
ui::NativeTheme const* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (const auto* linux_ui = views::LinuxUI::instance()) {
// We rely on the fact that the system theme is in use iff `theme_supplier`
// is non-null, but this is cheating. In the future this might not hold

8
www/chromium/files/patch-chrome_browser_themes_theme__service.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/themes/theme_service.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/themes/theme_service.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/themes/theme_service.cc
@@ -72,7 +72,7 @@
#include "extensions/browser/extension_registry_observer.h"
@ -9,7 +9,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -511,7 +511,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
@@ -489,7 +489,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
native_theme = ui::NativeTheme::GetInstanceForDarkUI();
} else {
native_theme = ui::NativeTheme::GetInstanceForNativeUi();
@ -18,7 +18,7 @@
if (const auto* linux_ui = views::LinuxUI::instance()) {
native_theme =
linux_ui->GetNativeTheme(delegate_->ShouldUseSystemTheme());
@@ -631,7 +631,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
@@ -611,7 +611,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseSystemTheme() const {
@ -27,7 +27,7 @@
return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
@@ -639,7 +639,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
@@ -619,7 +619,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
}
bool ThemeService::ShouldUseCustomFrame() const {

11
www/chromium/files/patch-chrome_browser_ui_browser.h Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/ui/browser.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/browser.h
@@ -734,7 +734,7 @@ class Browser : public TabStripModelObserver,
StatusBubble* GetStatusBubbleForTesting();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void RunScreenAIAnnotator();
#endif

37
www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
View file

@ -1,15 +1,6 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -71,7 +71,7 @@
#include "ui/base/ui_base_features.h"
#include "ui/events/keycodes/keyboard_codes.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/accessibility/accessibility_features.h"
#endif
@@ -96,7 +96,7 @@
@@ -97,7 +97,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -18,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -288,7 +288,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -27,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
@@ -523,7 +523,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -524,7 +524,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,16 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -926,7 +926,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
ExecuteUIDebugCommand(id, browser_);
break;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
case IDC_RUN_SCREEN_AI:
RunScreenAi(browser_);
break;
@@ -1088,7 +1088,7 @@ void BrowserCommandController::InitCommandState() {
@@ -1087,7 +1087,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -54,12 +36,3 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
@@ -1474,7 +1474,7 @@ void BrowserCommandController::UpdateCommandsForFullsc
command_updater_.UpdateCommandEnabled(
IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY, main_not_fullscreen);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
command_updater_.UpdateCommandEnabled(IDC_RUN_SCREEN_AI,
features::IsScreenAIEnabled());
#endif

20
www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
View file

@ -1,20 +0,0 @@
--- chrome/browser/ui/browser_commands.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/browser_commands.cc
@@ -176,7 +176,7 @@
#include "chromeos/lacros/lacros_service.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/accessibility/ax_action_data.h"
#include "ui/accessibility/ax_enums.mojom.h"
#endif
@@ -1859,7 +1859,7 @@ void UnfollowSite(content::WebContents* web_contents)
feed::UnfollowSite(web_contents);
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void RunScreenAi(Browser* browser) {
ui::AXActionData ad;
ad.action = ax::mojom::Action::kRunScreenAi;

11
www/chromium/files/patch-chrome_browser_ui_browser__commands.h
View file

@ -1,11 +0,0 @@
--- chrome/browser/ui/browser_commands.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/browser_commands.h
@@ -251,7 +251,7 @@ void ProcessInterceptedChromeURLNavigationInIncognito(
void FollowSite(content::WebContents* web_contents);
void UnfollowSite(content::WebContents* web_contents);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Triggers the Screen AI to be run once on the |browser|.
void RunScreenAi(Browser* browser);
#endif // BUILDFLAG(IS_LINUX)

4
www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/chrome_pages.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -561,7 +561,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -566,7 +566,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/chrome_pages.h.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/ui/chrome_pages.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -26,7 +26,7 @@
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -202,7 +202,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -204,7 +204,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/signin_view_controller.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/signin_view_controller.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/signin_view_controller.cc
@@ -262,7 +262,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -92,7 +92,7 @@ static const char* kBadFlags[] = {
@@ -91,7 +91,7 @@ static const char* kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -128,7 +128,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@ -9,7 +9,7 @@
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
@@ -1007,7 +1007,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1014,7 +1014,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -18,7 +18,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1197,7 +1197,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1204,7 +1204,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);

14
www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
View file

@ -1,15 +1,15 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -192,7 +192,7 @@
@@ -196,7 +196,7 @@
#endif
#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)
#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"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h"
@@ -530,13 +530,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -25,7 +25,7 @@
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
@@ -551,7 +551,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -33,4 +33,4 @@
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(
autofill_assistant::features::kAutofillAssistantDesktop)) {
autofill_assistant::CreateForWebContents(web_contents);
autofill_assistant::CreateForWebContents(

39
www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
View file

@ -1,29 +1,29 @@
--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -62,11 +62,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
{ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#endif // BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
{ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
IDC_MOVE_TAB_PREVIOUS},
@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
{ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
{ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
@@ -138,7 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
@ -32,12 +32,3 @@
{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},
@@ -240,7 +240,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
#endif // !BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_RUN_SCREEN_AI},
#endif
};

11
www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
View file

@ -1,11 +1,16 @@
--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
@@ -51,7 +51,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
@@ -51,11 +51,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
base::OnceClosure callback) override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
gfx::ImageSkia* GetDefaultWindowIcon() const override;
bool WindowManagerProvidesTitleBar(bool maximized) override;
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
gfx::ImageSkia* GetDefaultWindowIcon() const override;
#endif

20
www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
@@ -23,7 +23,7 @@ bool IsDesktopEnvironmentUnity() {
return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
int GetWindowIconResourceId() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
switch (chrome::GetChannel()) {
@@ -52,7 +52,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative
return ::CreateNativeWidget(native_widget_type, params, delegate);
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
return rb.GetImageSkiaNamed(GetWindowIconResourceId());

10
www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/first_run_dialog.cc
@@ -38,7 +38,7 @@
@@ -34,7 +34,7 @@
namespace {
@ -15,6 +15,6 @@
ChangeMetricsReportingState(report_crashes_->GetChecked());
-#else
+#elif !BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_CHROMEOS_ASH)
metrics::structured::NeutrinoDevicesLog(
metrics::structured::NeutrinoDevicesLocation::kFirstRunDialog);
ChangeMetricsReportingStateWithReply(
report_crashes_->GetChecked(),
base::BindOnce(&InitCrashReporterIfEnabled));

4
www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
@@ -151,7 +151,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
@@ -145,7 +145,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
}
void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() {

11
www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h
View file

@ -1,11 +0,0 @@
--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
@@ -95,7 +95,7 @@ class BrowserDesktopWindowTreeHostLinux
// browser_desktop_window_tree_host_lacros.cc.
#if BUILDFLAG(IS_CHROMEOS_LACROS)
using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameAuraLinux;
#else
#error Unknown platform

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