sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/chromium: update to 114.0.5735.90

Browse source 
Approved by:	rene (mentor, implicit)
Security:	https://vuxml.freebsd.org/freebsd/fd87a250-ff78-11ed-8290-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2023-05-31 13:52:59 +02:00
parent 5fc5f6e576
commit e0eb878be5
330 changed files with 2040 additions and 11631 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
www/chromium/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= chromium
PORTVERSION= 113.0.5672.126
PORTVERSION= 114.0.5735.90
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
@ -69,9 +69,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
RUN_DEPENDS= xdg-open:devel/xdg-utils \
noto-basic>0:x11-fonts/noto-basic
USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv:wchar_t jpeg \
localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \
tar:xz xorg
USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
python:3.7+,build qt:5 shebangfix tar:xz xorg
CPE_VENDOR= google
CPE_PRODUCT= chrome
@ -121,7 +121,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libjpeg=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
extra_ldflags="${LDFLAGS}"
extra_ldflags="${LDFLAGS}" \
ffmpeg_branding="${FFMPEG_BRAND}"
# TODO: investigate building with these options:
# use_system_minigbm
@ -156,10 +157,10 @@ ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al
ALSA_VARS= GN_ARGS+=use_alsa=true
ALSA_VARS_OFF= GN_ARGS+=use_alsa=false
CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \
GN_ARGS+=proprietary_codecs=true
CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
GN_ARGS+=proprietary_codecs=false
CODECS_VARS= GN_ARGS+=proprietary_codecs=true \
FFMPEG_BRAND="Chrome"
CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \
FFMPEG_BRAND="Chromium"
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_VARS= GN_ARGS+=use_cups=true
@ -229,13 +230,24 @@ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm
.endif
# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
# - map ffmpeg target to ${ARCH}
.if ${ARCH} == aarch64
PLIST_SUB+= NOT_AARCH64="@comment "
.else
FFMPEG_TARGET= arm64
.elif ${ARCH} == amd64
BUILD_DEPENDS+= nasm:devel/nasm
PLIST_SUB+= NOT_AARCH64=""
FFMPEG_TARGET= x64
.elif ${ARCH} == i386
BUILD_DEPENDS+= nasm:devel/nasm
PLIST_SUB+= NOT_AARCH64=""
FFMPEG_TARGET= ia32
.endif
FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
# Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext
@ -264,10 +276,13 @@ pre-configure:
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
# Chromium uses an unreleased version of FFmpeg, so configure it
.for brand in Chrome Chromium
${CP} -R \
${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
cd ${WRKSRC}/third_party/ffmpeg && \
${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
--config-only --branding=${FFMPEG_BRAND}
cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
${MKDIR} ${FFMPEG_CDIR}
.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
do-configure:

14
www/chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1684318714
SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928
SHA256 (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 401df2b0b0452bcb0841b52383a98649e15ad4f6baea47dc99e913a35ae40111
SIZE (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 27020448
SHA256 (chromium-113.0.5672.126-testdata.tar.xz) = 89088e4cdc494ad5c468c7cf7e7ed26c4f76244d42ec74dac0ee141ead0fd6e6
SIZE (chromium-113.0.5672.126-testdata.tar.xz) = 262980780
TIMESTAMP = 1685521034
SHA256 (chromium-114.0.5735.90.tar.xz) = 071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8
SIZE (chromium-114.0.5735.90.tar.xz) = 1570683592
SHA256 (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 2a7f6a89475266193420ba70c00858093d7cd3ed0eda2a34ded2f3a6006b1526
SIZE (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 27343652
SHA256 (chromium-114.0.5735.90-testdata.tar.xz) = 9ce66f3d7b60e5f74d0f4e4290b1e159b3346e4afb85373c745ac44fc1d14994
SIZE (chromium-114.0.5735.90-testdata.tar.xz) = 256217488
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

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

@ -1,6 +1,6 @@
--- BUILD.gn.orig 2023-04-28 17:01:32 UTC
--- BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ BUILD.gn
@@ -60,7 +60,7 @@ declare_args() {
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
}
@ -9,49 +9,49 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -85,7 +85,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
- "//infra/orchestrator:orchestrator_all",
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -426,7 +425,7 @@ group("gn_all") {
@@ -95,7 +95,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
- "//infra/orchestrator:orchestrator_all",
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -419,7 +418,7 @@ group("gn_all") {
}
}
}
- if (is_linux || is_chromeos || is_android) {
+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -630,6 +629,15 @@ group("gn_all") {
- if (is_linux || is_chromeos || is_android) {
+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -619,6 +618,15 @@ group("gn_all") {
}
}
}
+ if (is_bsd) {
+ deps -= [
+ "//third_party/breakpad:dump_syms($host_toolchain)",
+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
+ "//third_party/breakpad:minidump_dump($host_toolchain)",
+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
+ ]
+ }
+ if (is_bsd) {
+ deps -= [
+ "//third_party/breakpad:dump_syms($host_toolchain)",
+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
+ "//third_party/breakpad:minidump_dump($host_toolchain)",
+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
+ ]
+ }
+
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -677,7 +685,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -666,7 +674,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
- } else if (!is_android && !is_ios && !is_fuchsia) {
+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
- } else if (!is_android && !is_ios && !is_fuchsia) {
+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1100,7 +1108,7 @@ if (!is_ios) {
@@ -1096,7 +1104,7 @@ if (!is_ios && !is_cronet_build) {
]
}
@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1200,7 +1208,7 @@ if (!is_ios) {
@@ -1196,7 +1204,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1209,7 +1217,7 @@ if (!is_ios) {
@@ -1205,7 +1213,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1677,7 +1685,7 @@ group("chromium_builder_perf") {
@@ -1672,7 +1680,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

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

@ -1,6 +1,6 @@
--- ash/display/mirror_window_controller.cc.orig 2022-10-24 13:33:33 UTC
--- ash/display/mirror_window_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ ash/display/mirror_window_controller.cc
@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
if (!base::Contains(display_info_list, iter->first,
&display::ManagedDisplayInfo::id)) {
CloseAndDeleteHost(iter->second, true);

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

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2023-04-28 17:01:32 UTC
--- base/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ base/BUILD.gn
@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1105,11 +1105,23 @@ component("base") {
@@ -1100,11 +1100,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@ -34,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1137,7 +1149,7 @@ component("base") {
@@ -1132,7 +1144,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@ -43,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1178,7 +1190,7 @@ component("base") {
@@ -1173,7 +1185,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -52,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2135,6 +2147,43 @@ component("base") {
@@ -2127,6 +2139,43 @@ component("base") {
}
}
@ -96,7 +96,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2244,7 +2293,7 @@ component("base") {
@@ -2236,7 +2285,7 @@ component("base") {
}
if (dep_libevent) {
@ -105,7 +105,7 @@
}
if (use_libevent) {
@@ -3562,7 +3611,7 @@ test("base_unittests") {
@@ -3559,7 +3608,7 @@ test("base_unittests") {
]
}
@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3611,7 +3660,7 @@ test("base_unittests") {
@@ -3608,7 +3657,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3622,7 +3671,7 @@ test("base_unittests") {
@@ -3619,7 +3668,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3848,7 +3897,7 @@ test("base_unittests") {
@@ -3843,7 +3892,7 @@ test("base_unittests") {
}
}

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

@ -1,6 +1,6 @@
--- base/allocator/dispatcher/tls.h.orig 2023-02-08 09:03:45 UTC
--- base/allocator/dispatcher/tls.h.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/dispatcher/tls.h
@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
partition_alloc::PartitionPageSize();
#elif BUILDFLAG(IS_APPLE)
constexpr static size_t AllocationChunkSize = 16384;

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2022-11-30 08:12:58 UTC
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-28 17:01:32 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -383,8 +383,12 @@ bool TryRecommitSystemPagesInternal(
@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-28 17:01:32 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -285,7 +285,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-28 17:01:32 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -43,7 +43,7 @@
@@ -46,7 +46,7 @@
#include "wow64apiset.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() {
@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -378,7 +378,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@ -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
@@ -850,7 +850,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -853,7 +853,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

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

@ -1,6 +1,6 @@
--- base/files/file_path_watcher_unittest.cc.orig 2023-02-08 09:03:45 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());
@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
@@ -1345,7 +1345,7 @@ enum Permission {
@@ -1275,7 +1275,7 @@ enum Permission {
Execute
};
@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)

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

@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2023-04-28 17:01:32 UTC
--- base/files/file_util_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ base/files/file_util_unittest.cc
@@ -3853,7 +3853,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3871,7 +3871,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";
@@ -4576,7 +4576,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

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

@ -1,6 +1,6 @@
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-05-19 14:06:27 UTC
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-05-31 08:12:17 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@ -11,7 +11,7 @@
#if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
return false;
}
return true;

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

@ -1,4 +1,4 @@
--- base/process/process_metrics.cc.orig 2023-03-09 06:31:50 UTC
--- base/process/process_metrics.cc.orig 2023-05-31 08:12:17 UTC
+++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base {
namespace {
@ -27,7 +27,7 @@
Value::Dict meminfo = memory_info_.ToDict();
meminfo.Merge(vmstat_info_.ToDict());
res.Set("meminfo", std::move(meminfo));
@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
@ -35,7 +35,7 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
}
@ -43,7 +43,7 @@
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,4 +1,4 @@
--- base/process/process_metrics_posix.cc.orig 2022-08-31 12:19:35 UTC
--- base/process/process_metrics_posix.cc.orig 2023-05-31 08:12:17 UTC
+++ base/process/process_metrics_posix.cc
@@ -20,6 +20,8 @@
@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() {
@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() {
return stats.size_in_use;
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();

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

@ -1,6 +1,6 @@
--- base/rand_util.h.orig 2022-11-30 08:12:58 UTC
--- base/rand_util.h.orig 2023-05-31 08:12:17 UTC
+++ base/rand_util.h
@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) {
@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}

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

@ -1,6 +1,6 @@
--- base/system/sys_info.cc.orig 2023-03-09 06:31:50 UTC
--- base/system/sys_info.cc.orig 2023-05-31 08:12:17 UTC
+++ base/system/sys_info.cc
@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() {
@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() {
#endif
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {

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

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2023-02-08 09:03:45 UTC
--- base/system/sys_info.h.orig 2023-05-31 08:12:17 UTC
+++ base/system/sys_info.h
@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo {
@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo {
static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
#endif
@ -9,7 +9,7 @@
private:
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo {
@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

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

@ -1,6 +1,6 @@
--- base/test/launcher/test_launcher.cc.orig 2023-03-09 06:31:50 UTC
--- base/test/launcher/test_launcher.cc.orig 2023-05-31 08:12:17 UTC
+++ base/test/launcher/test_launcher.cc
@@ -67,6 +67,7 @@
@@ -69,6 +69,7 @@
#include "third_party/libxml/chromium/libxml_utils.h"
#if BUILDFLAG(IS_POSIX)

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

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2023-04-28 17:01:32 UTC
--- build/config/compiler/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ build/config/compiler/BUILD.gn
@@ -237,13 +237,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@ -38,7 +38,16 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -816,7 +823,7 @@ config("compiler") {
@@ -727,7 +734,7 @@ config("compiler") {
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
- if (!is_chromeos) {
+ if (!is_chromeos && !is_bsd) {
# TODO(https://crbug.com/972449): turn on for ChromeOS when that
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
@@ -825,7 +832,7 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
@ -47,7 +56,7 @@
cflags_cc += [ "-gsimple-template-names" ]
}
@@ -996,7 +1003,7 @@ config("compiler_cpu_abi") {
@@ -1005,7 +1012,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -56,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -1011,7 +1018,7 @@ config("compiler_cpu_abi") {
@@ -1020,7 +1027,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -65,7 +74,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1346,7 +1353,7 @@ config("compiler_deterministic") {
@@ -1355,7 +1362,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@ -74,7 +83,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1398,7 +1405,7 @@ config("compiler_deterministic") {
@@ -1407,7 +1414,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -83,7 +92,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1636,7 +1643,7 @@ config("default_warnings") {
@@ -1645,7 +1652,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -92,7 +101,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1827,7 +1834,7 @@ config("no_chromium_code") {
@@ -1836,7 +1843,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -101,7 +110,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2337,7 +2344,7 @@ config("afdo_optimize_size") {
@@ -2346,7 +2353,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") {
@ -110,7 +119,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2356,7 +2363,7 @@ config("afdo") {
@@ -2365,7 +2372,7 @@ config("afdo") {
}
inputs = [ _clang_sample_profile ]
}
@ -119,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2511,7 +2518,8 @@ config("symbols") {
@@ -2523,7 +2530,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

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

@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2023-04-28 17:01:32 UTC
--- build/config/rust.gni.orig 2023-05-31 08:12:17 UTC
+++ build/config/rust.gni
@@ -157,7 +157,7 @@ if (enable_rust) {
@@ -170,7 +170,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {

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

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2023-04-28 17:01:32 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2023-05-31 08:12:17 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -837,22 +844,12 @@ template("gcc_toolchain") {
@@ -859,22 +866,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {

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

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2023-04-28 17:01:32 UTC
--- cc/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ cc/BUILD.gn
@@ -664,7 +664,7 @@ cc_test_static_library("test_support") {
@@ -672,7 +672,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -911,7 +911,6 @@ cc_test("cc_unittests") {
@@ -922,7 +922,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

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

@ -1,6 +1,6 @@
--- chrome/app/app_management_strings.grdp.orig 2022-07-22 17:30:31 UTC
--- chrome/app/app_management_strings.grdp.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/app_management_strings.grdp
@@ -173,7 +173,7 @@
@@ -176,7 +176,7 @@
You can open and edit supported files with this app from Finder 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>
</if>

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

@ -1,6 +1,6 @@
--- chrome/app/chrome_main.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/app/chrome_main.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/chrome_main.cc
@@ -28,11 +28,11 @@
@@ -27,11 +27,11 @@
#include "chrome/app/notification_metrics.h"
#endif
@ -14,7 +14,7 @@
#include "chrome/app/chrome_main_linux.h"
#endif
@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) {
SetUpBundleOverrides();
#endif
@ -23,7 +23,7 @@
AppendExtraArgumentsToCommandLine(command_line);
#endif
@@ -175,7 +175,7 @@ int ChromeMain(int argc, const char** argv) {
@@ -164,7 +164,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \

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

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -135,7 +135,7 @@
@@ -137,7 +137,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -179,16 +179,16 @@
@@ -182,16 +182,16 @@
#include "v8/include/v8.h"
#endif
@ -29,7 +29,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -323,7 +323,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -327,7 +327,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -38,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -408,7 +408,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -412,7 +412,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -47,7 +47,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -522,7 +522,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -526,7 +526,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -56,7 +56,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
@@ -611,7 +611,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -615,7 +615,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -941,7 +941,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -956,7 +956,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
@ -74,7 +74,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1080,7 +1080,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1094,7 +1094,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -83,7 +83,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1110,7 +1110,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1124,7 +1124,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1484,7 +1484,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1498,7 +1498,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -101,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1586,7 +1586,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1600,7 +1600,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.

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

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-04-28 17:01:32 UTC
--- chrome/app/generated_resources.grd.orig 2023-05-31 08:12:17 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.
-->
@@ -3219,7 +3219,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3258,7 +3258,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>
@@ -4974,7 +4974,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -5007,7 +5007,7 @@ are declared in tools/grit/grit_rule.gni.
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@ -27,7 +27,7 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
Read information about your browser, OS, device, installed software and files
</message>
@@ -5644,7 +5644,7 @@ Keep your key file in a safe place. You will need it t
@@ -5689,7 +5689,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
</if>
@ -36,7 +36,7 @@
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
@@ -5690,7 +5690,7 @@ Keep your key file in a safe place. You will need it t
@@ -5735,7 +5735,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
</message>
</if>
@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
@@ -9707,7 +9707,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -9841,7 +9841,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -54,7 +54,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>
@@ -11048,7 +11048,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -11182,7 +11182,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -63,7 +63,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -13184,7 +13184,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -13324,7 +13324,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

4
www/chromium/files/patch-chrome_app_profiles__strings.grdp
View file

@ -1,6 +1,6 @@
--- chrome/app/profiles_strings.grdp.orig 2022-02-07 13:39:41 UTC
--- chrome/app/profiles_strings.grdp.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/profiles_strings.grdp
@@ -66,7 +66,7 @@
@@ -60,7 +60,7 @@
Add Profile...
</message>
</if>

6
www/chromium/files/patch-chrome_app_settings__strings.grdp
View file

@ -1,6 +1,6 @@
--- chrome/app/settings_strings.grdp.orig 2023-04-05 11:05:06 UTC
--- chrome/app/settings_strings.grdp.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/settings_strings.grdp
@@ -166,7 +166,7 @@
@@ -202,7 +202,7 @@
Theme
</message>
</if>
@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
@@ -186,7 +186,7 @@
@@ -222,7 +222,7 @@
Use Classic
</message>
</if>

6
www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-04-05 11:05:06 UTC
--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
<includes>
@ -9,7 +9,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
@@ -63,7 +63,7 @@
@@ -67,7 +67,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@ -18,7 +18,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
@@ -77,7 +77,7 @@
@@ -81,7 +81,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->

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

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/about_flags.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/about_flags.cc
@@ -220,7 +220,7 @@
@@ -221,7 +221,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -312,7 +312,7 @@
@@ -314,7 +314,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -418,7 +418,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -420,7 +420,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -27,8 +27,8 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1447,7 +1447,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
#endif
@@ -1447,7 +1447,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
std::size(kChromeRefresh2023Level1), nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam
kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = {
{"DocumentProviderMaxLowQualitySuggestions", "1"},
@@ -4637,13 +4637,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4749,13 +4749,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -52,7 +52,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -4917,7 +4917,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5032,7 +5032,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -61,7 +61,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5537,7 +5537,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5679,7 +5679,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -70,16 +70,16 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -6252,7 +6252,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
@@ -6463,7 +6463,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -7145,7 +7145,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7336,7 +7336,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -88,7 +88,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -7883,7 +7883,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8111,7 +8111,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -97,16 +97,16 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -8108,7 +8108,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8356,7 +8356,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName,
flag_descriptions::kGetDisplayMediaSetDescription,
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8169,7 +8169,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8417,7 +8417,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -115,7 +115,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -8722,7 +8722,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8994,7 +8994,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -124,3 +124,21 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
@@ -9692,7 +9692,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
{"webui-system-font", flag_descriptions::kWebUiSystemFontName,
flag_descriptions::kWebUiSystemFontDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
@@ -9893,7 +9893,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
{"data-retention-policies-disable-sync-types-needed",
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,

11
www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/apps/app_service/publishers/extension_apps.cc
@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default;
bool ExtensionApps::Accepts(const extensions::Extension* extension) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(),
extension->id())) {
return false;

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

@ -1,4 +1,4 @@
--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-08-31 12:19:35 UTC
--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.cc
@@ -20,7 +20,7 @@
#include "extensions/common/extension.h"
@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
@@ -124,7 +124,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

10
www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
View file

@ -1,11 +1,11 @@
--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.h
@@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
// and false otherwise.
@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
// Chrome Apps are deprecated on the |profile|. Returns true if that was the
// case, or false otherwise.

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

@ -1,6 +1,6 @@
--- chrome/browser/background/background_mode_manager.cc.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/background/background_mode_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/background/background_mode_manager.cc
@@ -889,7 +889,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
@@ -874,7 +874,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();

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

@ -1,11 +1,11 @@
--- chrome/browser/browser_features.cc.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/browser_features.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/browser_features.cc
@@ -24,7 +24,7 @@ BASE_FEATURE(kClosedTabCache,
// the browser exits.
@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache,
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);

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

@ -1,4 +1,4 @@
--- chrome/browser/browser_process_impl.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/browser_process_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -213,7 +213,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1222,7 +1222,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1195,7 +1195,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1475,7 +1475,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1448,7 +1448,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

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 2023-04-28 17:01:32 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -113,13 +113,13 @@
@@ -117,13 +117,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
@@ -193,7 +193,7 @@
@@ -197,7 +197,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +25,7 @@
#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"
@@ -853,7 +853,7 @@ void PopulateChromeFrameBinders(
@@ -881,7 +881,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -861,7 +861,7 @@ void PopulateChromeFrameBinders(
@@ -889,7 +889,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,8 +43,8 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -926,14 +926,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
@@ -958,14 +958,14 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1377,7 +1377,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1420,7 +1420,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -240,11 +240,11 @@
@@ -241,11 +241,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/crashpad.h"
#endif
@@ -279,7 +279,7 @@
@@ -280,7 +280,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -23,7 +23,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -991,7 +991,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -992,7 +992,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 .
@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

34
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 2023-04-28 17:01:32 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -420,7 +420,7 @@
@@ -424,7 +424,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"
@@ -503,12 +503,12 @@
@@ -512,12 +512,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -517,14 +517,14 @@
@@ -526,14 +526,14 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -41,7 +41,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)
@@ -553,11 +553,11 @@
@@ -562,11 +562,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -55,7 +55,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1567,7 +1567,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1609,7 +1609,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true);
registry->RegisterBooleanPref(
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false);
@ -64,7 +64,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1680,7 +1680,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1722,7 +1722,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -73,7 +73,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1719,7 +1719,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1761,7 +1761,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.
@ -82,7 +82,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1740,7 +1740,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1782,7 +1782,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -91,7 +91,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -100,7 +100,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2582,6 +2582,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2626,6 +2626,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -109,7 +109,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2951,7 +2953,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -3020,7 +3022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -118,7 +118,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4504,7 +4506,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4574,7 +4576,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -127,7 +127,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5023,7 +5025,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5093,7 +5095,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -136,7 +136,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5033,7 +5035,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5103,7 +5105,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -145,7 +145,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5072,7 +5074,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5142,7 +5144,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@ -154,7 +154,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -6703,7 +6705,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -6849,7 +6851,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {

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 2023-04-28 17:01:32 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -458,7 +458,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -460,7 +460,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

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

@ -1,6 +1,6 @@
--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-02-08 09:03:45 UTC
--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
@@ -33,7 +33,7 @@ This file specifies browser resources for developer-fa
@@ -34,7 +34,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" />

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

@ -1,4 +1,4 @@
--- chrome/browser/download/download_item_model.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/download/download_item_model.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -766,7 +766,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1222,7 +1222,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1234,7 +1234,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

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

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2023-05-17 10:17:13 UTC
--- chrome/browser/download/download_prefs.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -308,7 +313,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -311,7 +316,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -481,7 +486,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -484,7 +489,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -513,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -516,7 +521,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -547,7 +552,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -668,7 +673,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -671,7 +676,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.

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

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/profiles/profile.h"
@ -9,12 +9,12 @@
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
@@ -56,7 +56,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
enterprise_signals::ContextInfoFetcher::CreateInstance(
profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
policy::CloudPolicyStore* store = nullptr;
// Managed device.
policy::CloudPolicyStore* browser_cloud_policy_store = nullptr;
if (management_service->HasManagementAuthority(

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1340,6 +1340,10 @@ static_library("extensions") {
@@ -1348,6 +1348,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -517,7 +517,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
@@ -544,7 +544,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

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 2023-04-05 11:05:06 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -196,7 +196,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
@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;

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

@ -1,15 +1,24 @@
--- chrome/browser/flag_descriptions.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/flag_descriptions.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -6311,7 +6311,7 @@ const char kLibAssistantV2MigrationDescription[] =
@@ -2450,7 +2450,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
const char kWebUIOmniboxPopupDescription[] =
"If enabled, shows the omnibox suggestions popup in WebUI.";
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
const char kWebUiSystemFontName[] = "WebUI System font";
const char kWebUiSystemFontDescription[] =
"If enabled, all WebUI surfaces will use the default UI font of the "
@@ -6593,7 +6593,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API";
const char kGetDisplayMediaSetDescription[] =
"When enabled, the getDisplayMediaSet API for capturing multiple surfaces "
@@ -6559,7 +6559,7 @@ const char kSearchWebInSidePanelDescription[] =
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -6839,7 +6839,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +27,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -6568,7 +6568,7 @@ const char kQuickCommandsDescription[] =
@@ -6848,7 +6848,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,7 +36,16 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -6589,7 +6589,7 @@ const char kWebShareDescription[] =
@@ -6870,7 +6870,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kUseOutOfProcessVideoDecodingName[] =
"Use out-of-process video decoding (OOP-VD)";
const char kUseOutOfProcessVideoDecodingDescription[] =
@@ -6888,7 +6888,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -36,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -6609,7 +6609,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -6908,7 +6908,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -45,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -6623,7 +6623,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -6922,7 +6922,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -54,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -6724,7 +6724,7 @@ const char kElasticOverscrollDescription[] =
@@ -7023,7 +7023,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -63,3 +81,12 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7052,7 +7052,7 @@ const char kSigninInterceptBubbleV2Description[] =
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
"Data Retention Policies Disable Sync Types";
const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =

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

@ -1,15 +1,24 @@
--- chrome/browser/flag_descriptions.h.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/flag_descriptions.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/flag_descriptions.h
@@ -3660,7 +3660,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
@@ -1379,7 +1379,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
extern const char kWebUIOmniboxPopupName[];
extern const char kWebUIOmniboxPopupDescription[];
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
extern const char kWebUiSystemFontName[];
extern const char kWebUiSystemFontDescription[];
#endif
@@ -3815,7 +3815,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
extern const char kLacrosScreenCoordinatesEnabledDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const char kGetDisplayMediaSetName[];
extern const char kGetDisplayMediaSetDescription[];
@@ -3787,14 +3787,14 @@ extern const char kSearchWebInSidePanelDescription[];
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -3942,14 +3942,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -26,7 +35,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -3804,7 +3804,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -3959,7 +3959,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -35,7 +44,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -3814,7 +3814,7 @@ extern const char kOzonePlatformHintName[];
@@ -3969,7 +3969,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -44,7 +53,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -3822,13 +3822,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -3977,13 +3977,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -60,7 +69,16 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -3908,7 +3908,7 @@ extern const char kElasticOverscrollDescription[];
@@ -3999,7 +3999,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kUseOutOfProcessVideoDecodingName[];
extern const char kUseOutOfProcessVideoDecodingDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -4073,7 +4073,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -69,3 +87,12 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4091,7 +4091,7 @@ extern const char kSigninInterceptBubbleV2Description[
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
#endif

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

@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -121,7 +121,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
@@ -125,7 +125,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite(
content::BrowserContext* context) {
@ -9,12 +9,12 @@
Profile* profile = Profile::FromBrowserContext(context);
if (!profile) {
return false;
@@ -148,7 +148,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
@@ -162,7 +162,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
bool IsGetDisplayMediaSetSelectAllScreensAllowed(
content::BrowserContext* context,
const GURL& url) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context);
if (!profile)
if (!profile) {
return false;

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

@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
@@ -20,7 +20,7 @@
@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/shell.h"
#include "ui/aura/window.h"
@ -9,7 +9,7 @@
#include "base/functional/callback.h"
#include "content/public/browser/desktop_capture.h"
#endif
@@ -31,7 +31,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
} // namespace
@ -18,7 +18,7 @@
namespace {
base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
return stream_devices_set;
}
@ -27,7 +27,7 @@
blink::mojom::StreamDevicesSetPtr EnumerateScreens(
blink::mojom::MediaStreamType stream_type) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
root_windows_for_testing_.Get() = std::move(root_windows);
}
@ -36,9 +36,9 @@
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
g_desktop_capturer_for_testing.Get() = std::move(capturer);
@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
DCHECK(base::FeatureList::IsEnabled(
features::kGetDisplayMediaSetAutoSelectAllScreens));
@@ -146,7 +146,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
features::kGetDisplayMediaSetAutoSelectAllScreens)) ||
base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

10
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 2023-04-28 17:01:32 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -65,8 +65,10 @@
@@ -66,8 +66,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"
@@ -100,7 +102,7 @@
@@ -101,7 +103,7 @@
#include "chromeos/startup/startup_switches.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -512,7 +514,7 @@ void RecordStartupMetrics() {
@@ -528,7 +530,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -30,7 +30,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -712,7 +714,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -728,7 +730,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)

16
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 2023-04-28 17:01:32 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -176,7 +176,7 @@
@@ -178,7 +178,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -202,7 +202,7 @@
@@ -204,7 +204,7 @@
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
@@ -764,7 +764,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -770,7 +770,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -27,7 +27,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -843,7 +843,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -849,7 +849,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -852,7 +852,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -858,7 +858,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
#if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \
(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -45,7 +45,7 @@
if (base::FeatureList::IsEnabled(
kExtendFamilyLinkUserLogSegmentToAllPlatforms)) {
metrics_service_->RegisterMetricsProvider(
@@ -960,7 +960,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -966,7 +966,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -54,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1144,7 +1144,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1163,7 +1163,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,4 +1,4 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -93,7 +93,7 @@
@ -27,8 +27,8 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -489,7 +489,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
base::Unretained(this)));
@@ -503,7 +503,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@ -36,7 +36,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -539,7 +539,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -553,7 +553,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -45,7 +45,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -568,7 +568,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -582,7 +582,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -54,8 +54,8 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -959,7 +959,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
@@ -1004,7 +1004,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)

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

@ -1,7 +1,7 @@
--- chrome/browser/net/system_network_context_manager.h.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/net/system_network_context_manager.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/net/system_network_context_manager.h
@@ -194,7 +194,7 @@ class SystemNetworkContextManager {
void UpdateExplicitlyAllowedNetworkPorts();
@@ -207,7 +207,7 @@ class SystemNetworkContextManager {
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)

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

@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -205,12 +205,12 @@
@@ -206,12 +206,12 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -15,7 +15,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -772,14 +772,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -770,14 +770,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -32,7 +32,7 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1439,7 +1439,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -41,7 +41,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1509,18 +1509,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -63,7 +63,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1533,7 +1533,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@ -72,7 +72,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1637,7 +1637,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1629,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -81,7 +81,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1724,13 +1724,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1725,13 +1725,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -97,7 +97,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1762,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -106,16 +106,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1790,7 +1790,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \
- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA))
+ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
@@ -1850,7 +1850,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1844,7 +1844,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -124,7 +115,7 @@
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
@@ -1895,7 +1895,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(ENABLE_PPAPI)
@ -133,7 +124,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2162,7 +2162,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2156,7 +2156,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -142,7 +133,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2219,7 +2219,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2213,7 +2213,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -151,7 +142,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2254,7 +2254,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2248,7 +2248,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -160,7 +151,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
@@ -2608,7 +2608,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2604,7 +2604,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -169,7 +160,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2616,7 +2616,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2612,7 +2612,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -178,7 +169,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2629,7 +2629,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2625,7 +2625,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));

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

@ -0,0 +1,20 @@
--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/policy/policy_value_and_status_aggregator.cc
@@ -55,7 +55,7 @@
#include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -106,7 +106,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
#else // BUILDFLAG(IS_CHROMEOS_ASH)
policy::CloudPolicyManager* cloud_policy_manager =
profile->GetUserCloudPolicyManager();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (!cloud_policy_manager) {
cloud_policy_manager = profile->GetProfileCloudPolicyManager();
}

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

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -464,13 +464,13 @@
@@ -465,13 +465,13 @@
#include "components/os_crypt/sync/os_crypt.h"
#endif
@ -16,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -503,7 +503,7 @@
@@ -504,7 +504,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -25,7 +25,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -800,7 +800,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
@@ -731,7 +731,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@ -34,7 +34,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -904,7 +904,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
@@ -872,7 +872,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@ -43,7 +43,7 @@
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1033,7 +1033,7 @@ void RegisterProfilePrefsForMigration(
@@ -987,7 +987,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@ -52,7 +52,7 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1686,11 +1686,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1690,11 +1690,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
@ -66,7 +66,7 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -1878,7 +1878,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
@@ -1857,7 +1857,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
@ -75,7 +75,7 @@
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -2038,7 +2038,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
@@ -1992,7 +1992,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif

17
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 2023-04-28 17:01:32 UTC
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -602,7 +602,7 @@ PrintBackendServiceManager::RegisterClient(
@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
@@ -868,7 +868,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -960,7 +960,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;
@@ -925,7 +925,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
@ -27,3 +27,12 @@
// No need to update if there were other query with UI clients.
if (HasQueryWithUiClientForRemoteId(remote_id)) {
return absl::nullopt;
@@ -1477,7 +1477,7 @@ template <class... T>
void PrintBackendServiceManager::RunSavedCallbacks(
RemoteSavedCallbacks<T...>& saved_callbacks,
const RemoteId& remote_id,
- std::remove_reference<T>::type... result) {
+ typename std::remove_reference<T>::type... result) {
auto found_callbacks_map = saved_callbacks.find(remote_id);
if (found_callbacks_map == saved_callbacks.end())
return; // No callbacks to run.

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

@ -0,0 +1,11 @@
--- chrome/browser/printing/print_backend_service_manager.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/printing/print_backend_service_manager.h
@@ -587,7 +587,7 @@ class PrintBackendServiceManager {
template <class... T>
void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
const RemoteId& remote_id,
- std::remove_reference<T>::type... result);
+ typename std::remove_reference<T>::type... result);
// Test support for client ID management.
static void SetClientsForTesting(

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

@ -1,6 +1,6 @@
--- chrome/browser/printing/printer_query.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/printing/printer_query.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/printing/printer_query.cc
@@ -339,7 +339,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));

16
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 2023-04-28 17:01:32 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -361,17 +361,17 @@
@@ -363,17 +363,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -21,7 +21,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -535,7 +535,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -543,7 +543,7 @@ void ChromeBrowserMainExtraPartsProfiles::
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
browser_sync::UserEventServiceFactory::GetInstance();
@ -30,7 +30,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
BrowsingDataHistoryObserverService::Factory::GetInstance();
@@ -606,16 +606,16 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -614,16 +614,16 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
DriveServiceFactory::GetInstance();
#endif
@ -50,7 +50,7 @@
enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -718,12 +718,12 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -729,12 +729,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -65,12 +65,12 @@
enterprise_idle::IdleServiceFactory::GetInstance();
#endif
ModelTypeStoreServiceFactory::GetInstance();
@@ -786,7 +786,7 @@ void ChromeBrowserMainExtraPartsProfiles::
PolicyBlocklistFactory::GetInstance();
@@ -801,7 +801,7 @@ void ChromeBrowserMainExtraPartsProfiles::
PredictionServiceFactory::GetInstance();
PrimaryAccountPolicyManagerFactory::GetInstance();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ProfileTokenWebSigninInterceptorFactory::GetInstance();
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)

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

@ -1,6 +1,6 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -260,6 +260,10 @@
@@ -263,6 +263,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@ -11,7 +11,16 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -865,7 +869,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -611,7 +615,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else
{
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage()
@@ -886,7 +890,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-09-24 10:57:32 UTC
--- chrome/browser/profiles/profiles_state.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/profiles/profiles_state.cc
@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
@@ -182,7 +182,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
PrefService* local_state,
bool show_warning) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \

10
www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
View file

@ -1,15 +1,15 @@
--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -28,7 +28,7 @@
@@ -27,7 +27,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
button-aria-description="$i18n{opensInNewTab}"
on-click="openThemeUrl_" external></cr-link-row>
-<if expr="not is_linux">
+<if expr="not is_posix">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<cr-button id="useDefault" on-click="onUseDefaultClick_">
@@ -36,7 +36,7 @@
@@ -35,7 +35,7 @@
</cr-button>
</template>
</if>
@ -18,7 +18,7 @@
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, systemTheme_)]]"
@@ -143,7 +143,7 @@
@@ -142,7 +142,7 @@
</div>
</template>

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

@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/route.ts.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/resources/settings/route.ts.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/resources/settings/route.ts
@@ -223,7 +223,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
@@ -232,7 +232,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));

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

@ -1,4 +1,4 @@
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-01-11 09:17:16 UTC
--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -18,7 +18,7 @@
#include "net/base/url_util.h"
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
@@ -364,7 +364,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
@@ -368,7 +368,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.

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

@ -0,0 +1,20 @@
--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
@@ -41,7 +41,7 @@
#include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
#elif BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
#endif
@@ -61,7 +61,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
#elif BUILDFLAG(IS_ANDROID)
return std::make_unique<SupervisedUserWebContentHandlerImpl>(
web_contents, frame_id, navigation_id);
-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
return std::make_unique<SupervisedUserWebContentHandlerImpl>(
web_contents, frame_id, navigation_id);
#endif

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

@ -1,4 +1,4 @@
--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -127,7 +127,7 @@
#endif // BUILDFLAG(IS_ANDROID)
@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
@@ -473,7 +473,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -18,7 +18,7 @@
if (base::FeatureList::IsEnabled(features::kTabGroupsSaveSyncIntegration)) {
controllers.push_back(std::make_unique<syncer::ModelTypeController>(
syncer::SAVED_TAB_GROUP,
@@ -486,7 +486,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -488,7 +488,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.
@ -27,7 +27,7 @@
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
@@ -653,7 +653,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
@@ -655,7 +655,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -76,7 +76,7 @@
@@ -74,7 +74,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
@@ -117,7 +117,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -119,7 +119,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
@@ -258,7 +258,7 @@ SyncServiceFactory::SyncServiceFactory()
@@ -257,7 +257,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ThemeServiceFactory::GetInstance());
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

10
www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/task_manager/sampling/task_group.h.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/task_manager/sampling/task_group.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/task_manager/sampling/task_group.h
@@ -43,7 +43,7 @@ constexpr int kUnsupportedVMRefreshFlags =
@@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags =
REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
@ -9,7 +9,7 @@
REFRESH_TYPE_FD_COUNT |
#endif
REFRESH_TYPE_HARD_FAULTS;
@@ -149,7 +149,7 @@ class TaskGroup {
@@ -150,7 +150,7 @@ class TaskGroup {
}
#endif // BUILDFLAG(ENABLE_NACL)
@ -18,7 +18,7 @@
int open_fd_count() const { return open_fd_count_; }
void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -169,7 +169,7 @@ class TaskGroup {
@@ -170,7 +170,7 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
@ -27,7 +27,7 @@
void OnOpenFdCountRefreshDone(int open_fd_count);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -241,7 +241,7 @@ class TaskGroup {
@@ -243,7 +243,7 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)

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

@ -1,6 +1,6 @@
--- chrome/browser/themes/theme_service.cc.orig 2023-02-08 09:03:45 UTC
--- chrome/browser/themes/theme_service.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/themes/theme_service.cc
@@ -71,7 +71,7 @@
@@ -73,7 +73,7 @@
#include "extensions/browser/extension_registry_observer.h"
#endif
@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -313,7 +313,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
@@ -315,7 +315,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseCustomFrame() const {

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -105,7 +105,7 @@
@@ -110,7 +110,7 @@
#include "components/user_manager/user_manager.h"
#endif
@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -298,7 +298,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -550,7 +550,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -1112,7 +1112,7 @@ void BrowserCommandController::InitCommandState() {
@@ -1151,7 +1151,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/chrome_pages.cc.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/ui/chrome_pages.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -69,7 +69,7 @@
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -651,7 +651,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -663,7 +663,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 2023-04-05 11:05:06 UTC
--- chrome/browser/ui/chrome_pages.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -34,7 +34,7 @@ enum class ConsentLevel;
} // namespace signin
@ -9,7 +9,7 @@
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
@@ -241,7 +241,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -245,7 +245,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

11
www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
@@ -1954,7 +1954,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
return OmniboxFieldTrial::IsChromeRefreshIconsEnabled()
? omnibox::kShareWinChromeRefreshIcon
: omnibox::kShareWinIcon;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return OmniboxFieldTrial::IsChromeRefreshIconsEnabled()
? omnibox::kShareLinuxChromeRefreshIcon
: omnibox::kShareIcon;

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 2023-02-08 09:03:45 UTC
--- chrome/browser/ui/signin_view_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/signin_view_controller.cc
@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
@@ -276,7 +276,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 2023-02-08 09:03:45 UTC
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -94,7 +94,7 @@ static const char* kBadFlags[] = {
@@ -95,7 +95,7 @@ static const char* kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

8
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 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h"
@@ -957,7 +957,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -961,7 +961,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
@@ -1061,7 +1061,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1065,7 +1065,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -27,7 +27,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1253,7 +1253,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1257,7 +1257,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);

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -204,7 +204,7 @@
@@ -208,7 +208,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h"
@@ -538,12 +538,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -546,12 +546,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \

11
www/chromium/files/patch-chrome_browser_ui_ui__features.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/ui/ui_features.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/ui_features.cc
@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
"TopChromeWebUIUsesSpareRenderer",
base::FEATURE_ENABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Enables alternate update-related text to be displayed in browser app menu
// button, menu item and confirmation dialog.
BASE_FEATURE(kUpdateTextOptions,

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

@ -0,0 +1,11 @@
--- chrome/browser/ui/ui_features.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/ui_features.h
@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
BASE_DECLARE_FEATURE(kUpdateTextOptions);
extern const base::FeatureParam<int> kUpdateTextOptionNumber;
#endif

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -51,7 +51,7 @@
#include "components/user_manager/user_manager.h"
@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
@@ -294,7 +294,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@@ -298,7 +298,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@ -27,7 +27,7 @@
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
@@ -442,7 +442,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -456,7 +456,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@ -36,7 +36,7 @@
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
@@ -459,7 +459,7 @@ void BrowserFrame::SelectNativeTheme() {
@@ -473,7 +473,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
@@ -228,7 +228,7 @@ class BrowserFrame : public views::Widget, public view
@@ -232,7 +232,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -1994,7 +1994,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -1997,7 +1997,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -40,7 +40,7 @@
@@ -42,7 +42,7 @@
#include "ui/aura/window.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
@@ -61,7 +61,7 @@ constexpr int kBackToTabImageSize = 16;
@@ -63,7 +63,7 @@ constexpr int kBackToTabImageSize = 16;
// The height of the controls bar at the top of the window.
constexpr int kTopControlsHeight = 30;
@ -18,7 +18,7 @@
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
@@ -151,7 +151,7 @@ class WindowEventObserver : public ui::EventObserver {
@@ -153,7 +153,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@ -27,7 +27,7 @@
// Calculate input bounds for Linux. This is needed because the input bounds
// is not necessary the same as the local bounds on Linux.
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
@@ -341,7 +341,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
@@ -350,7 +350,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
hide_close_button_animation_.set_continuous(false);
hide_close_button_animation_.set_delegate(this);
@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
@@ -469,7 +469,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
@@ -480,7 +480,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@ -45,7 +45,7 @@
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
@@ -514,7 +514,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
@@ -525,7 +525,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
@@ -715,7 +715,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
@@ -726,7 +726,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@ -63,7 +63,7 @@
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
@@ -838,7 +838,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
@@ -849,7 +849,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@ -72,7 +72,7 @@
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
@@ -859,7 +859,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
@@ -870,7 +870,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@ -81,8 +81,8 @@
return FrameBorderInsets();
#else
return gfx::Insets(kResizeBorder);
@@ -870,7 +870,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
return FrameBorderInsets().top() + kTopControlsHeight;
@@ -889,7 +889,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
top_height + border_thickness.bottom());
}
-#if BUILDFLAG(IS_LINUX)

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/controls/image_view.h"
@ -18,7 +18,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
@@ -159,7 +159,7 @@ class PictureInPictureBrowserFrameView
@@ -163,7 +163,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@ -27,7 +27,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
@@ -222,7 +222,7 @@ class PictureInPictureBrowserFrameView
@@ -227,7 +227,7 @@ class PictureInPictureBrowserFrameView
gfx::MultiAnimation show_close_button_animation_;
gfx::MultiAnimation hide_close_button_animation_;

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-02-08 09:03:45 UTC
--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -61,7 +61,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
@@ -62,7 +62,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
SetAnimateOnStateChange(true);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
@@ -581,7 +581,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
return;

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -79,7 +79,7 @@
@@ -81,7 +81,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
@ -9,7 +9,7 @@
#include "ui/aura/client/drag_drop_client.h"
#endif
@@ -187,7 +187,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
@ -18,7 +18,7 @@
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
@@ -361,7 +361,7 @@ void TabDragController::Init(TabDragContext* source_co
@@ -363,7 +363,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
// - ChromeOS Ash
// Releasing capture on Ash cancels gestures so avoid it.
@ -27,7 +27,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
@@ -957,7 +957,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
@@ -952,7 +952,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,7 +36,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
@@ -1957,7 +1957,7 @@ void TabDragController::CompleteDrag() {
@@ -1978,7 +1978,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@ -45,7 +45,7 @@
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
@@ -2340,7 +2340,7 @@ TabDragController::Liveness TabDragController::GetLoca
@@ -2361,7 +2361,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
@@ -749,7 +749,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
@@ -751,7 +751,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
// not become active. Setting this to false creates the need to explicitly
// hide the hovercard on press, touch, and keyboard events.
SetCanActivate(false);

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -406,7 +406,7 @@ std::string GetFileExtension(FileExtension file_extens
}
@ -9,7 +9,7 @@
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
@@ -869,7 +869,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
@@ -872,7 +872,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts.";
// TODO(crbug.com/1273568): Investigate the true source of flakiness instead
// of papering over it here.
@ -18,7 +18,7 @@
ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts());
#endif
LOG(INFO)
@@ -1740,7 +1740,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
@@ -1812,7 +1812,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@ -27,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
@@ -2905,7 +2905,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
@@ -2992,7 +2992,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@ -36,7 +36,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -2920,7 +2920,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -3007,7 +3007,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@ -45,7 +45,7 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -2930,7 +2930,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
@@ -3017,7 +3017,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
@ -54,7 +54,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -2946,7 +2946,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
@@ -3033,7 +3033,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
@ -63,7 +63,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -3565,7 +3565,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
@@ -3759,7 +3759,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const AppId& app_id) {
@ -72,7 +72,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
@@ -3740,7 +3740,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
@@ -3938,7 +3938,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@ -81,7 +81,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
@@ -3784,7 +3784,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/about_ui.cc.orig 2023-04-05 11:05:06 UTC
--- chrome/browser/ui/webui/about_ui.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/about_ui.cc
@@ -602,7 +602,7 @@ std::string ChromeURLs() {
@@ -603,7 +603,7 @@ std::string ChromeURLs() {
return html;
}
@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
@@ -656,7 +656,7 @@ void AboutUIHTMLSource::StartDataRequest(
@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
@@ -362,7 +362,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
@@ -416,7 +416,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
bool deprecated_app = false;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
auto* context = extension_system_->extension_service()->GetBrowserContext();
deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
@@ -425,7 +425,7 @@ void AppHomePageHandler::FillExtensionInfoList(
@@ -479,7 +479,7 @@ void AppHomePageHandler::FillExtensionInfoList(
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -330,7 +330,7 @@
@@ -325,7 +325,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
@@ -356,17 +356,17 @@
@@ -351,17 +351,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
@@ -746,7 +746,7 @@ bool IsAboutUI(const GURL& url) {
@@ -702,7 +702,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1054,7 +1054,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -982,7 +982,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<ash::KerberosInBrowserUI>;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
@@ -1109,7 +1109,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
@@ -1177,27 +1177,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1105,27 +1105,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -171,7 +171,7 @@ enum class ReportingType {
@@ -172,7 +172,7 @@ enum class ReportingType {
kUserActivity
};
@ -9,7 +9,7 @@
const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent";
const char kManagementScreenCaptureData[] = "managementScreenCaptureData";
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -973,7 +973,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
@@ -974,7 +974,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
kManagementOnPageVisitedVisibleData, &info);
}

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

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -127,7 +127,7 @@
@@ -129,7 +129,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#endif
@@ -147,7 +147,7 @@
@@ -149,7 +149,7 @@
#include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
#endif
@ -18,16 +18,7 @@
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -236,7 +236,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
#endif
html_source->AddBoolean("isChildAccount", profile->IsChild());
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
#else
bool allow_qt_theme = false;
@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -384,7 +384,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
{"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
{"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@ -36,7 +27,7 @@
{"gtkTheme", IDS_SETTINGS_GTK_THEME},
{"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
{"qtTheme", IDS_SETTINGS_QT_THEME},
@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -394,7 +394,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@ -45,7 +36,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
@@ -421,7 +421,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/web_applications/extension_status_utils.h.orig 2023-01-11 09:17:16 UTC
--- chrome/browser/web_applications/extension_status_utils.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/extension_status_utils.h
@@ -48,7 +48,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
@@ -56,7 +56,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
const std::string& extension_id);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-03-09 06:31:50 UTC
--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/extensions/extension_status_utils.cc
@@ -26,7 +26,7 @@ namespace {
const char* g_preinstalled_app_for_testing = nullptr;
@ -9,7 +9,7 @@
// TODO(b/268221237): Remove this allow-list.
const char kDefaultAllowedExtensionIds[] =
"alhngdkjgnedakdlnamimgfihgkmenbh,"
@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
@@ -116,7 +116,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -17,4 +17,4 @@
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context,
const std::string& extension_id) {
if (!base::FeatureList::IsEnabled(features::kChromeAppsDeprecation))
if (testing::g_enable_chrome_apps_for_testing) {

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