mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

www/chromium: update to 104.0.5112.79

Browse Source 
Security:	96a41723-133a-11ed-be3b-3065ec8fd3ec
This commit is contained in:
Robert Nagy 2022-07-24 15:19:41 +02:00 committed by Rene Ladan
parent 5b9287003a
commit 2acdadaf09
295 changed files with 3442 additions and 5496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/chromium/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= chromium
PORTVERSION= 103.0.5060.134
PORTVERSION= 104.0.5112.79
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
@ -92,7 +92,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
enable_js_type_check=false \
enable_nacl=false \
enable_one_click_signin=true \
enable_remoting=false \
enable_wmax_tokens=false \
fatal_linker_warnings=false \

14
www/chromium/distinfo
View File

@ -1,9 +1,9 @@
TIMESTAMP = 1658300677
SHA256 (chromium-103.0.5060.134.tar.xz) = e48a272481e41b1aae7aba71b55c41fe9e994cf71edd01c8ca1d0b604af0b571
SIZE (chromium-103.0.5060.134.tar.xz) = 1488286096
SHA256 (chrome-linux-103.0.5060.134-llvm13.profdata.tar.xz) = abac57f392bf42a68e94b9fcb90ac28e39e1019dccfbaf5ac5bf66210e24032c
SIZE (chrome-linux-103.0.5060.134-llvm13.profdata.tar.xz) = 24397884
SHA256 (chromium-103.0.5060.134-testdata.tar.xz) = 8097abf4dd8e0bd3a9e293acf5e01ea379dcab9b4154bfa57817e8bbb47b0d59
SIZE (chromium-103.0.5060.134-testdata.tar.xz) = 260891464
TIMESTAMP = 1659422888
SHA256 (chromium-104.0.5112.79.tar.xz) = 9cc662f1a84c796521ee17ed2808795ca937fe7f77bc605e788f0304a81dabf3
SIZE (chromium-104.0.5112.79.tar.xz) = 1509100404
SHA256 (chrome-linux-104.0.5112.79-llvm13.profdata.tar.xz) = d088e4540e6bf1a077e41e6a94ab7af3dd72cfdaad1f35737559a4570b0612b1
SIZE (chrome-linux-104.0.5112.79-llvm13.profdata.tar.xz) = 24547748
SHA256 (chromium-104.0.5112.79-testdata.tar.xz) = 9f54026ed796e66dcbaceb31be5408c510421a0c308ab890de8bc9237f2b837c
SIZE (chromium-104.0.5112.79-testdata.tar.xz) = 264005020
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

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

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2022-06-17 14:20:10 UTC
--- BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ BUILD.gn
@@ -54,7 +54,7 @@ declare_args() {
root_extra_deps = []
@ -17,7 +17,7 @@
"//net:net_unittests",
"//services:services_unittests",
"//services/service_manager/public/cpp",
@@ -447,7 +446,7 @@ group("gn_all") {
@@ -446,7 +445,7 @@ group("gn_all") {
]
}
@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1167,7 +1175,7 @@ if (!is_ios) {
@@ -1184,7 +1192,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -60,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1176,7 +1184,7 @@ if (!is_ios) {
@@ -1193,7 +1201,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -69,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1580,7 +1588,7 @@ group("chromium_builder_perf") {
@@ -1592,7 +1600,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

4
www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
View File

@ -1,6 +1,6 @@
--- apps/ui/views/app_window_frame_view.cc.orig 2022-02-28 16:54:41 UTC
--- apps/ui/views/app_window_frame_view.cc.orig 2022-07-22 17:30:31 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -138,7 +138,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

38
www/chromium/files/patch-base_BUILD.gn
View File

@ -1,15 +1,15 @@
--- base/BUILD.gn.orig 2022-06-17 14:20:10 UTC
--- base/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ base/BUILD.gn
@@ -1004,7 +1004,7 @@ mixed_component("base") {
@@ -1001,7 +1001,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
@@ -1015,6 +1015,12 @@ mixed_component("base") {
"profiler/stack_copier_signal.cc",
"profiler/stack_copier_signal.h",
@@ -1010,6 +1010,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@ -23,11 +23,11 @@
if (is_win) {
@@ -1496,11 +1502,23 @@ mixed_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
+ (is_android || ((is_linux || is_chromeos) && !is_chromecast && !is_bsd)) &&
- if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
+ if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) &&
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
@ -60,12 +60,12 @@
# Allow more direct string conversions on platforms with native utf8
# strings
- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) {
+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) {
- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
+ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2158,6 +2176,42 @@ mixed_component("base") {
@@ -2165,6 +2183,42 @@ mixed_component("base") {
}
}
@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -3452,7 +3506,7 @@ test("base_unittests") {
@@ -3467,7 +3521,7 @@ test("base_unittests") {
}
}
@ -117,25 +117,25 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3500,7 +3554,7 @@ test("base_unittests") {
@@ -3514,7 +3568,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3511,7 +3565,7 @@ test("base_unittests") {
"profiler/thread_delegate_posix_unittest.cc",
@@ -3524,7 +3578,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) {
+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) {
- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
+ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3683,7 +3737,7 @@ test("base_unittests") {
@@ -3712,7 +3766,7 @@ test("base_unittests") {
}
}

8
www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
View File

@ -1,9 +1,9 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2022-02-28 16:54:41 UTC
--- base/allocator/partition_allocator/page_allocator.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -194,7 +194,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr
// Whether decommitted memory is guaranteed to be zeroed when it is
@@ -206,7 +206,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() {
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
return false;

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 2022-03-25 21:59:56 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal(
@@ -347,8 +347,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__address__space.cc
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -184,7 +184,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
@@ -234,7 +234,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_ = 0;
}

8
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
View File

@ -1,8 +1,8 @@
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-06-17 14:20:10 UTC
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
@@ -88,6 +88,10 @@ void RandBytes(void* output, size_t output_length) {
return;
}
@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
if (getentropy(output, output_length) == 0) {
return;
}
+#elif BUILDFLAG(IS_BSD)
+ if (getentropy(output, output_length) == 0) {

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

@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h
@@ -10,7 +10,7 @@
namespace partition_alloc::internal::base::internal {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Current thread id is cached in thread local storage for performance reasons.
// In some rare cases it's important to invalidate that cache explicitly (e.g.
// after going through clone() syscall which does not call pthread_atfork()

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

@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc
@@ -17,7 +17,7 @@
#include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h"
#include "build/build_config.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include <sys/syscall.h>
#include <atomic>
#endif

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

@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc_base/time/time.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/time/time.cc
@@ -6,7 +6,7 @@
#include "build/build_config.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// time.h is a widely included header and its size impacts build time.
// Try not to raise this limit unless necessary. See
// https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md

8
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -66,7 +66,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -68,7 +68,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
@ -9,7 +9,7 @@
#define PA_HAS_LINUX_KERNEL
#endif
@@ -186,7 +186,7 @@ constexpr bool kUseLazyCommit = false;
@@ -187,7 +187,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
@ -18,7 +18,7 @@
#define PA_HAS_ATFORK_HANDLER
#endif
@@ -225,7 +225,7 @@ constexpr bool kUseLazyCommit = false;
@@ -227,7 +227,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.

15
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
View File

@ -1,11 +1,20 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-06-17 14:20:10 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -84,7 +84,7 @@ PartitionPageShift() {
@@ -96,7 +96,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -252,7 +252,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffse
#if defined(PA_HAS_64_BITS_POINTERS)
// The Configurable Pool is only available in 64-bit mode
constexpr size_t kNumPools = 3;
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Special-case macOS. Contrary to other platforms, there is no sandbox limit
// there, meaning that a single renderer could "happily" consume >8GiB. So the
// 8GiB pool size is a regression. Make the limit higher on this platform only

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 2022-06-17 14:20:10 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -29,7 +29,7 @@
@@ -33,7 +33,7 @@
#include "wow64apiset.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -226,7 +226,7 @@ void PartitionAllocMallocInitOnce() {
@@ -230,7 +230,7 @@ void PartitionAllocMallocInitOnce() {
if (!g_global_init_called.compare_exchange_strong(expected, true))
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.
@@ -305,7 +305,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -309,7 +309,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
SystemPageSize();
@ -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
@@ -651,7 +651,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -655,7 +655,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_allocator_partition__allocator_spinning__mutex.cc
View File

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-04-21 18:48:31 UTC
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
@@ -17,7 +17,15 @@
@@ -18,7 +18,15 @@
#if defined(PA_HAS_LINUX_KERNEL)
#include <errno.h>
@ -16,7 +16,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#endif // defined(PA_HAS_LINUX_KERNEL)
@@ -116,8 +124,13 @@ void SpinningMutex::FutexWait() {
@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
@ -30,7 +30,7 @@
if (err) {
// These are programming error, check them.
@@ -129,8 +142,14 @@ void SpinningMutex::FutexWait() {
@@ -120,8 +133,14 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
int saved_errno = errno;

7
www/chromium/files/patch-base_files_file__util__posix.cc
View File

@ -1,12 +1,15 @@
--- base/files/file_util_posix.cc.orig 2022-06-17 14:20:10 UTC
--- base/files/file_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/files/file_util_posix.cc
@@ -696,32 +696,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -696,32 +696,37 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
+ const FilePath kFileSystemRoot("/");
std::vector<FilePath> subpaths;
+ if (DirectoryExists(full_path))
+ return true;
+
// Collect a list of all parent directories.
FilePath last_path = full_path;
- subpaths.push_back(full_path);

20
www/chromium/files/patch-base_i18n_icu__util.cc
View File

@ -1,20 +1,20 @@
--- base/i18n/icu_util.cc.orig 2022-06-17 14:20:10 UTC
--- base/i18n/icu_util.cc.orig 2022-07-22 17:30:31 UTC
+++ base/i18n/icu_util.cc
@@ -54,7 +54,7 @@
@@ -53,7 +53,7 @@
#include "third_party/icu/source/common/unicode/unistr.h"
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
!BUILDFLAG(IS_CHROMECAST))
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \
BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -326,7 +326,7 @@ void InitializeIcuTimeZone() {
@@ -325,7 +325,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
-#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
!BUILDFLAG(IS_CHROMECAST)
-#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
+#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
// To respond to the time zone change properly, the default time zone
// cache in ICU has to be populated on starting up.
// See TimeZoneMonitorLinux::NotifyClientsFromImpl().

13
www/chromium/files/patch-base_process_memory.cc
View File

@ -1,15 +1,6 @@
--- base/process/memory.cc.orig 2022-02-28 16:54:41 UTC
--- base/process/memory.cc.orig 2022-07-22 17:30:31 UTC
+++ base/process/memory.cc
@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) {
} // namespace internal
+#if !BUILDFLAG(IS_BSD)
void TerminateBecauseOutOfMemory(size_t size) {
internal::OnNoMemoryInternal(size);
}
+#endif
@@ -29,7 +29,7 @@ namespace base {
// Defined in memory_mac.mm for macOS + use_allocator="none". In case of
// USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system
// default calloc of macOS.

4
www/chromium/files/patch-base_process_process__posix.cc
View File

@ -1,4 +1,4 @@
--- base/process/process_posix.cc.orig 2022-05-19 14:06:27 UTC
--- base/process/process_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/process/process_posix.cc
@@ -25,10 +25,15 @@
#include "build/build_config.h"
@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {}
@@ -379,7 +384,55 @@ void Process::Exited(int exit_code) const {
int Process::GetPriority() const {
DCHECK(IsValid());

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

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

4
www/chromium/files/patch-base_rand__util__posix.cc
View File

@ -1,4 +1,4 @@
--- base/rand_util_posix.cc.orig 2022-02-28 16:54:41 UTC
--- base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/rand_util_posix.cc
@@ -17,7 +17,7 @@
#include "base/posix/eintr_wrapper.h"
@ -33,7 +33,7 @@
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
// We have to call `getrandom` via Linux Syscall Support, rather than through
// the libc wrapper, because we might not have an up-to-date libc (e.g. on
@@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) {
@@ -91,11 +94,16 @@ void RandBytes(void* output, size_t output_length) {
const bool success =
ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
CHECK(success);

6
www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
View File

@ -1,6 +1,6 @@
--- base/strings/safe_sprintf_unittest.cc.orig 2022-02-28 16:54:41 UTC
--- base/strings/safe_sprintf_unittest.cc.orig 2022-07-22 17:30:31 UTC
+++ base/strings/safe_sprintf_unittest.cc
@@ -731,6 +731,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
@@ -732,6 +732,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
#endif
}
@ -8,7 +8,7 @@
TEST(SafeSPrintfTest, EmitNULL) {
char buf[40];
#if defined(__GNUC__)
@@ -747,6 +748,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
@@ -748,6 +749,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
#pragma GCC diagnostic pop
#endif
}

4
www/chromium/files/patch-base_threading_platform__thread.h
View File

@ -1,6 +1,6 @@
--- base/threading/platform_thread.h.orig 2022-05-19 14:06:27 UTC
--- base/threading/platform_thread.h.orig 2022-07-22 17:30:31 UTC
+++ base/threading/platform_thread.h
@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread {
@@ -213,7 +213,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by `delegate`.
static TimeDelta GetRealtimePeriod(Delegate* delegate);

20
www/chromium/files/patch-build_config_compiler_BUILD.gn
View File

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2022-06-17 14:20:10 UTC
--- build/config/compiler/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ build/config/compiler/BUILD.gn
@@ -231,13 +231,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
@@ -903,7 +910,7 @@ config("compiler_cpu_abi") {
@@ -909,7 +916,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -47,7 +47,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
@@ -917,7 +924,7 @@ config("compiler_cpu_abi") {
@@ -923,7 +930,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -56,7 +56,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
@@ -1238,7 +1245,7 @@ config("compiler_deterministic") {
@@ -1244,7 +1251,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@ -65,7 +65,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1529,12 +1536,12 @@ config("default_warnings") {
@@ -1535,12 +1542,12 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -78,9 +78,9 @@
- if (!is_nacl && !(is_chromeos ||
+ if (!is_nacl && !is_bsd && !(is_chromeos ||
default_toolchain == "//build/toolchain/cros:target")) {
# TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
# TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated.
cflags += [
@@ -1719,7 +1726,7 @@ config("no_chromium_code") {
@@ -1724,7 +1731,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -89,7 +89,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2233,7 +2240,7 @@ config("afdo_optimize_size") {
@@ -2238,7 +2245,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") {
@ -98,7 +98,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2249,7 +2256,7 @@ config("afdo") {
@@ -2254,7 +2261,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -107,7 +107,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2392,7 +2399,8 @@ config("symbols") {
@@ -2395,7 +2402,8 @@ config("symbols") {
}
}

4
www/chromium/files/patch-build_config_ozone.gni
View File

@ -1,6 +1,6 @@
--- build/config/ozone.gni.orig 2022-03-31 09:33:37 UTC
--- build/config/ozone.gni.orig 2022-07-22 17:30:31 UTC
+++ build/config/ozone.gni
@@ -91,7 +91,15 @@ declare_args() {
@@ -88,7 +88,15 @@ declare_args() {
} else if (is_chromeos_lacros) {
ozone_platform = "wayland"
ozone_platform_wayland = true

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

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

32
www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
View File

@ -1,7 +1,7 @@
--- chrome/app/chrome_main_delegate.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -117,7 +117,7 @@
#include "chrome/app/chrome_crash_reporter_client.h"
@@ -125,7 +125,7 @@
#include "components/about_ui/credit_utils.h"
#endif
-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -160,12 +160,12 @@
@@ -168,12 +168,12 @@
#include "v8/include/v8.h"
#endif
@ -24,7 +24,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -308,7 +308,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -320,7 +320,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -33,7 +33,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -348,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -406,7 +406,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -42,7 +42,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) ||
@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -470,7 +470,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -51,7 +51,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.
@@ -496,7 +496,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -554,7 +554,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -60,7 +60,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -668,6 +668,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
@@ -733,6 +733,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@ -69,16 +69,16 @@
#else
bool enable_gwp_asan = true;
#endif
@@ -806,7 +808,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
@@ -878,7 +880,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -837,7 +839,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
@@ -936,7 +938,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -87,7 +87,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1163,7 +1165,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1316,7 +1318,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@ -95,8 +95,8 @@
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if BUILDFLAG(IS_ANDROID)
@@ -1233,7 +1235,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1393,7 +1395,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.

14
www/chromium/files/patch-chrome_app_generated__resources.grd
View File

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2022-06-17 14:20:10 UTC
--- chrome/app/generated_resources.grd.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@ -18,21 +18,21 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
@@ -8669,7 +8669,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -8737,7 +8737,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
- <if expr="is_linux">
+ <if expr="is_posix">
<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>
@@ -9823,7 +9823,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -9897,7 +9897,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>

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

@ -1,11 +1,11 @@
--- chrome/app/settings_strings.grdp.orig 2022-05-19 14:06:27 UTC
--- chrome/app/settings_strings.grdp.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/settings_strings.grdp
@@ -131,7 +131,7 @@
Theme
</message>
</if>
- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>

26
www/chromium/files/patch-chrome_browser_about__flags.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/about_flags.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/about_flags.cc
@@ -202,7 +202,7 @@
@@ -203,7 +203,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -275,7 +275,7 @@
@@ -277,7 +277,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -364,7 +364,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
@@ -366,7 +366,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
@ -27,7 +27,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1055,7 +1055,7 @@ const FeatureEntry::FeatureVariation kJourneysOnDevice
@@ -1137,7 +1137,7 @@ const FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -36,8 +36,8 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
@@ -3681,7 +3681,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
@@ -3841,7 +3841,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)},
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX)
@ -45,7 +45,7 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -4283,7 +4283,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4449,7 +4449,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -54,7 +54,7 @@
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
@@ -4302,7 +4302,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4468,7 +4468,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@ -63,7 +63,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -4979,7 +4979,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5159,7 +5159,7 @@ const FeatureEntry kFeatureEntries[] = {
"OmniboxBundledExperimentV1")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -72,7 +72,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -6378,7 +6378,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6582,7 +6582,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -81,7 +81,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -7251,7 +7251,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7495,7 +7495,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -90,7 +90,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -7547,7 +7547,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7803,7 +7803,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

22
www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
View File

@ -1,15 +1,6 @@
--- chrome/browser/after_startup_task_utils.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/after_startup_task_utils.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/after_startup_task_utils.cc
@@ -25,7 +25,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -111,7 +111,7 @@ void SetBrowserStartupIsComplete() {
@@ -105,7 +105,7 @@ void SetBrowserStartupIsComplete() {
g_startup_complete_flag.Get().Set();
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -18,12 +9,3 @@
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
base::Process::Current().CreationTime();
@@ -130,7 +130,7 @@ void SetBrowserStartupIsComplete() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Make sure we complete the startup notification sequence, or launchers will
// get confused by not receiving the expected message from the main process.
views::LinuxUI* linux_ui = views::LinuxUI::instance();

71
www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
View File

@ -1,71 +0,0 @@
--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-04-21 18:48:31 UTC
+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc
@@ -4,6 +4,15 @@
#include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h"
+#include "build/build_config.h"
+
+#if defined(OS_BSD)
+#include <sys/types.h>
+#include <net/if_dl.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
+
#include <ifaddrs.h>
#include <net/if.h>
#include <stddef.h>
@@ -105,11 +114,33 @@ class MacAddressProcessor {
const char* const prefixes[],
size_t prefixes_count) {
const int MAC_LENGTH = 6;
+#if defined(OS_BSD)
+ struct ifaddrs *ifap, *ifinfo;
+#else
struct ifreq ifinfo;
+#endif
memset(&ifinfo, 0, sizeof(ifinfo));
- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+#if defined(OS_BSD)
+ int result = getifaddrs(&ifap);
+ if (result != 0)
+ return true;
+ result = 1; // no MAC found yet
+ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
+ struct sockaddr* sa = ifinfo->ifa_addr;
+ if (sa->sa_family == AF_LINK &&
+ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
+ sizeof(ifinfo->ifa_name) - 1)) {
+ result = 0;
+ break;
+ }
+ }
+
+ char mac_address[6];
+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
+#else
+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
int sd = socket(AF_INET, SOCK_DGRAM, 0);
int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
close(sd);
@@ -119,11 +150,17 @@ class MacAddressProcessor {
const char* mac_address =
static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
+#endif
if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
return true;
+#if defined(OS_BSD)
+ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
+ return true;
+#else
if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
return true;
+#endif
// Got one!
found_mac_address_ =

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 2022-04-21 18:48:31 UTC
--- chrome/browser/background/background_mode_manager.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/background/background_mode_manager.cc
@@ -900,7 +900,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
@@ -894,7 +894,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();

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

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

10
www/chromium/files/patch-chrome_browser_browser__resources.grd
View File

@ -1,11 +1,11 @@
--- chrome/browser/browser_resources.grd.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/browser_resources.grd.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/browser_resources.grd
@@ -125,7 +125,7 @@
@@ -124,7 +124,7 @@
<if expr="chromeos_ash">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
</if>
<!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->
- <if expr="is_linux and not chromeos_ash or chromeos_lacros">
+ <if expr="is_posix and not chromeos_ash or chromeos_lacros">
- <if expr="is_linux or chromeos_lacros">
+ <if expr="is_posix or chromeos_lacros">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
</if>
<if expr="chromeos_ash">

14
www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -110,13 +110,13 @@
@@ -111,13 +111,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
@@ -183,7 +183,7 @@
@@ -180,7 +180,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"
@@ -752,7 +752,7 @@ void PopulateChromeFrameBinders(
@@ -758,7 +758,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));
@@ -760,7 +760,7 @@ void PopulateChromeFrameBinders(
@@ -766,7 +766,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
render_frame_host->IsInPrimaryMainFrame()) {
map->Add<blink::mojom::SubAppsService>(
@@ -815,14 +815,14 @@ void PopulateChromeWebUIFrameBinders(
@@ -821,14 +821,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1177,7 +1177,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

28
www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -231,11 +231,11 @@
@@ -236,11 +236,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -14,16 +14,16 @@
#include "components/crash/core/app/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -270,7 +270,7 @@
@@ -276,7 +276,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) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
@@ -1019,7 +1019,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -1024,7 +1024,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 .
@@ -1032,7 +1032,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1037,7 +1037,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@ -41,12 +41,12 @@
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
@@ -1053,7 +1053,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1059,7 +1059,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) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(

28
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -381,7 +381,7 @@
@@ -380,7 +380,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"
@@ -454,17 +454,17 @@
@@ -456,17 +456,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -30,7 +30,7 @@
#if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
@@ -472,12 +472,12 @@
@@ -474,12 +474,12 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -45,7 +45,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -501,11 +501,11 @@
@@ -503,11 +503,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -59,7 +59,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -892,7 +892,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
@@ -898,7 +898,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@ -68,7 +68,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1418,7 +1418,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -77,7 +77,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1444,7 +1444,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1452,7 +1452,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -86,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1461,7 +1461,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1473,7 +1473,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -95,7 +95,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -2230,6 +2230,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2242,6 +2242,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -104,7 +104,7 @@
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2547,7 +2549,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2557,7 +2559,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -113,7 +113,7 @@
// TODO(https://crbug.com/1316129): Re-enable for Lacros.
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
@@ -3960,7 +3962,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -3971,7 +3973,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -4371,14 +4373,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4398,14 +4400,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -139,7 +139,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -4411,7 +4413,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4438,7 +4440,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -420,7 +420,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -421,7 +421,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_defaults.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/defaults.cc.orig 2022-03-25 21:59:56 UTC
--- chrome/browser/defaults.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/defaults.cc
@@ -48,7 +48,7 @@ const bool kSyncAutoStarts = true;
@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true;
const bool kSyncAutoStarts = false;
#endif

6
www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
View File

@ -1,11 +1,11 @@
--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
@@ -41,7 +41,7 @@ This file specifies browser resources for developer-fa
@@ -39,7 +39,7 @@ This file specifies browser resources for developer-fa
<include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" />
- <if expr="is_android or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_android or is_posix or chromeos_ash or chromeos_lacros">
<include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" preprocess="true" type="BINDATA" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="${root_gen_dir}\chrome\browser\resources\sandbox_internals\tsc\sandbox_internals.js" use_base_dir="false" type="BINDATA" />
</if>

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

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

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

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

6
www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
@@ -24,7 +24,7 @@
#include "base/win/registry.h"
@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
@@ -208,7 +208,7 @@ base::FilePath GetEndpointVerificationDir() {
@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() {
bool got_path = false;
#if BUILDFLAG(IS_WIN)
got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
@ -18,7 +18,7 @@
std::unique_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
@@ -219,7 +219,7 @@ base::FilePath GetEndpointVerificationDir() {
@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() {
if (!got_path)
return path;

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -186,7 +186,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
@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -200,7 +200,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_NUMBER;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -29,7 +29,7 @@
#include "extensions/browser/process_manager.h"
@ -18,7 +18,7 @@
if (extension) {
enabled_by_permissions =
extension->permissions_data()->active_permissions().HasAPIPermission(
@@ -579,7 +579,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
ExtensionFunction::ResponseAction
WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {

6
www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -52,7 +52,7 @@
@@ -53,7 +53,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "ppapi/buildflags/buildflags.h"
@ -9,7 +9,7 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
@@ -131,7 +131,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
@@ -132,7 +132,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
#endif
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();

6
www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-03-25 21:59:56 UTC
--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -821,7 +821,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -849,7 +849,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

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

@ -1,6 +1,6 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -219,7 +219,7 @@ const struct {
@@ -224,7 +224,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif

16
www/chromium/files/patch-chrome_browser_flag__descriptions.cc
View File

@ -1,15 +1,15 @@
--- chrome/browser/flag_descriptions.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/flag_descriptions.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -5709,7 +5709,7 @@ const char kSideSearchDSESupportDescription[] =
@@ -5867,7 +5867,7 @@ const char kSideSearchDSESupportDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kDesktopRestructuredLanguageSettingsName[] =
"Restructured Language Settings (Desktop)";
@@ -5735,7 +5735,7 @@ const char kWebShareDescription[] =
const char kDesktopDetailedLanguageSettingsName[] =
"Detailed Language Settings (Desktop)";
@@ -5888,7 +5888,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -18,7 +18,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -5747,7 +5747,7 @@ const char kOzonePlatformHintDescription[] =
@@ -5900,7 +5900,7 @@ const char kOzonePlatformHintDescription[] =
"\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
@ -27,7 +27,7 @@
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
@@ -5760,7 +5760,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -5913,7 +5913,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@ -36,7 +36,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -5875,7 +5875,7 @@ const char kElasticOverscrollDescription[] =
@@ -6028,7 +6028,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

14
www/chromium/files/patch-chrome_browser_flag__descriptions.h
View File

@ -1,15 +1,15 @@
--- chrome/browser/flag_descriptions.h.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/flag_descriptions.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/flag_descriptions.h
@@ -3279,7 +3279,7 @@ extern const char kSideSearchDSESupportDescription[];
@@ -3370,7 +3370,7 @@ extern const char kSideSearchDSESupportDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kDesktopRestructuredLanguageSettingsName[];
extern const char kDesktopRestructuredLanguageSettingsDescription[];
@@ -3298,7 +3298,7 @@ extern const char kWebShareName[];
extern const char kDesktopDetailedLanguageSettingsName[];
extern const char kDesktopDetailedLanguageSettingsDescription[];
@@ -3386,7 +3386,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -18,7 +18,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -3314,7 +3314,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -3402,7 +3402,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -27,7 +27,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -3395,7 +3395,7 @@ extern const char kElasticOverscrollDescription[];
@@ -3483,7 +3483,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -60,8 +60,10 @@
@@ -58,8 +58,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"
@@ -227,7 +229,7 @@ void RecordStartupMetrics() {
@@ -223,7 +225,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.

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

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

10
www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
View File

@ -1,11 +1,11 @@
--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
@@ -41,7 +41,7 @@ void RecordProcessHistograms(const char* histogram_suf
kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
#endif
@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf
const ProcessMonitor::Metrics& metrics) {
RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage);
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
base::UmaHistogramCounts10000(
base::StrCat({"PerformanceMonitor.IdleWakeups.", histogram_suffix}),
base::StrCat({"PerformanceMonitor.IdleWakeups2.", histogram_suffix}),
metrics.idle_wakeups);

17
www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
View File

@ -1,17 +1,26 @@
--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/power/process_monitor.cc
@@ -59,7 +59,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
metrics.precise_cpu_usage = process_metrics.GetPreciseCPUUsage();
@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif
#if BUILDFLAG(IS_MAC)
@@ -114,7 +114,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
metrics->cpu_usage *= factor;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
metrics->idle_wakeups *= factor;
#endif
@@ -130,7 +130,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
lhs.cpu_usage += rhs.cpu_usage;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)

6
www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
View File

@ -1,7 +1,7 @@
--- chrome/browser/metrics/power/process_monitor.h.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/metrics/power/process_monitor.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/power/process_monitor.h
@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
#endif
@@ -70,7 +70,7 @@ class ProcessMonitor : public content::BrowserChildPro
double cpu_usage = 0.0;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)

10
www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -90,7 +90,7 @@
@@ -91,7 +91,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -172,7 +172,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -466,7 +466,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -474,7 +474,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -27,7 +27,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -533,7 +533,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
std::string());

12
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 2022-06-17 14:20:10 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -186,7 +186,7 @@
@@ -188,7 +188,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1566,7 +1566,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS)
@ -18,7 +18,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1627,7 +1627,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -36,7 +36,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2300,7 +2300,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
static_cast<int>(variations::RestrictionPolicy::ALL), false));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -45,7 +45,7 @@
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2318,7 +2318,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2319,7 +2319,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
policy::key::kSpellcheckLanguageBlocklist));
#endif // BUILDFLAG(ENABLE_SPELLCHECK)

8
www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -434,14 +434,14 @@
@@ -438,14 +438,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@ -17,7 +17,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -1177,7 +1177,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1221,7 +1221,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@ -26,7 +26,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
@@ -1492,7 +1492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1543,7 +1543,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/printing/print_job_worker.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/printing/print_job_worker.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/printing/print_job_worker.cc
@@ -216,7 +216,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::
@@ -209,7 +209,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));

21
www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/process_singleton_posix.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/process_singleton_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/process_singleton_posix.cc
@@ -96,12 +96,12 @@
@@ -96,7 +96,7 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
@ -9,13 +9,7 @@
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
#endif
#if defined(TOOLKIT_VIEWS) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -355,7 +355,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
@@ -350,7 +350,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
@ -24,12 +18,3 @@
std::u16string relaunch_button_text =
l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
@@ -924,7 +924,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
return PROCESS_NONE;
} else if (strncmp(buf, kACKToken, std::size(kACKToken) - 1) == 0) {
#if defined(TOOLKIT_VIEWS) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
// Likely NULL in unit tests.
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui)

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

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -406,7 +406,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -414,7 +414,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#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_profiles_profile__impl.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -259,6 +259,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -845,7 +849,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -847,7 +851,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-06-17 14:20:10 UTC
--- chrome/browser/profiles/profiles_state.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/profiles/profiles_state.cc
@@ -177,7 +177,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
@@ -178,7 +178,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
PrefService* local_state,
bool show_warning) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \

29
www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts Normal file
View File

@ -0,0 +1,29 @@
--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// <if expr="is_linux or chromeos_ash or chromeos_lacros">
+// <if expr="is_posix or chromeos_ash or chromeos_lacros">
import './strings.m.js';
import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
@@ -121,7 +121,7 @@ function androidHandler() {
}
// </if>
-// <if expr="is_linux or chromeos_ash or chromeos_lacros">
+// <if expr="is_posix or chromeos_ash or chromeos_lacros">
/**
* Adds a status row that reports either Yes or No.
@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => {
// <if expr="is_android">
androidHandler();
// </if>
- // <if expr="is_linux or chromeos_ash or chromeos_lacros">
+ // <if expr="is_posix or chromeos_ash or chromeos_lacros">
linuxHandler();
// </if>
});

10
www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
View File

@ -1,11 +1,11 @@
--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts
@@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy {
useDefaultTheme(): void;
- // <if expr="is_linux and not chromeos_ash">
+ // <if expr="is_bsd and not chromeos_ash">
- // <if expr="is_linux">
+ // <if expr="is_bsd">
useSystemTheme(): void;
// </if>
@ -13,8 +13,8 @@
chrome.send('useDefaultTheme');
}
- // <if expr="is_linux and not chromeos_ash">
+ // <if expr="is_bsd and not chromeos_ash">
- // <if expr="is_linux">
+ // <if expr="is_bsd">
useSystemTheme() {
chrome.send('useSystemTheme');
}

14
www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
View File

@ -1,11 +1,11 @@
--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -27,7 +27,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
on-click="openThemeUrl_" external></cr-link-row>
-<if expr="not is_linux or chromeos_ash or chromeos_lacros">
+<if expr="not is_posix or chromeos_ash or chromeos_lacros">
-<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="onUseDefaultTap_">
@ -13,8 +13,8 @@
</cr-button>
</template>
</if>
-<if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+<if expr="is_posix and not chromeos_ash and not chromeos_lacros">
-<if expr="is_linux">
+<if expr="is_posix">
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
@ -22,8 +22,8 @@
pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
label="$i18n{showBookmarksBar}">
</settings-toggle-button>
-<if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+<if expr="is_posix and not chromeos_ash and not chromeos_lacros">
-<if expr="is_linux">
+<if expr="is_posix">
<div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
<settings-toggle-button
hidden="[[!showCustomChromeFrame_]]"

36
www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
View File

@ -1,51 +1,51 @@
--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -146,7 +146,7 @@ export class SettingsAppearancePageElement extends
@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends
'prefs.autogenerated.theme.policy.color.controlledBy)',
},
- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
- // <if expr="is_linux">
+ // <if expr="is_posix">
/**
* Whether to show the "Custom Chrome Frame" setting.
*/
@@ -168,7 +168,7 @@ export class SettingsAppearancePageElement extends
@@ -167,7 +167,7 @@ export class SettingsAppearancePageElement extends
'themeChanged_(' +
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
- // <if expr="is_linux and not chromeos_ash">
+ // <if expr="is_posix and not chromeos_ash">
- // <if expr="is_linux">
+ // <if expr="is_posix">
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
// </if>
@@ -187,7 +187,7 @@ export class SettingsAppearancePageElement extends
@@ -186,7 +186,7 @@ export class SettingsAppearancePageElement extends
private showReaderModeOption_: boolean;
private isForcedTheme_: boolean;
- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
- // <if expr="is_linux">
+ // <if expr="is_posix">
private showCustomChromeFrame_: boolean;
// </if>
@@ -265,7 +265,7 @@ export class SettingsAppearancePageElement extends
@@ -264,7 +264,7 @@ export class SettingsAppearancePageElement extends
this.appearanceBrowserProxy_.useDefaultTheme();
}
- // <if expr="is_linux and not chromeos_ash">
+ // <if expr="is_posix and not chromeos_ash">
- // <if expr="is_linux">
+ // <if expr="is_posix">
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
this.useSystemTheme_ = useSystemTheme;
}
@@ -326,10 +326,10 @@ export class SettingsAppearancePageElement extends
@@ -325,10 +325,10 @@ export class SettingsAppearancePageElement extends
}
let i18nId;
- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
+ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
- // <if expr="is_linux">
+ // <if expr="is_posix">
i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
// </if>
- // <if expr="not is_linux or chromeos_ash or chromeos_lacros">
+ // <if expr="not is_posix or chromeos_ash or chromeos_lacros">
- // <if expr="not is_linux">
+ // <if expr="not is_posix">
i18nId = 'chooseFromWebStore';
// </if>
this.themeSublabel_ = this.i18n(i18nId);

11
www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css Normal file
View File

@ -0,0 +1,11 @@
--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
@@ -70,7 +70,7 @@ cr-input.password-input::part(input),
* necessary to prevent Chrome from using the operating system's font
* instead of the Material Design font.
* TODO(dbeam): why not font: inherit? */
-<if expr="is_linux or chromeos_ash or chromeos_lacros">
+<if expr="is_posix or chromeos_ash or chromeos_lacros">
font-family: 'DejaVu Sans Mono', monospace;
</if>
<if expr="is_win">

11
www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html
View File

@ -1,11 +0,0 @@
--- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-02-28 16:54:41 UTC
+++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html
@@ -64,7 +64,7 @@
* necessary to prevent Chrome from using the operating system's font
* instead of the Material Design font.
* TODO(dbeam): why not font: inherit? */
-<if expr="chromeos_ash or chromeos_lacros or is_linux">
+<if expr="chromeos_ash or chromeos_lacros or is_posix">
font-family: 'DejaVu Sans Mono', monospace;
</if>
<if expr="is_win">

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

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

11
www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css Normal file
View File

@ -0,0 +1,11 @@
--- chrome/browser/resources/signin/signin_shared.css.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/signin/signin_shared.css
@@ -37,7 +37,7 @@ cr-button + cr-button {
margin-inline-start: 8px;
}
-<if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
+<if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
.action-container {
flex-flow: row-reverse;
justify-content: flex-start;

11
www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html
View File

@ -1,11 +0,0 @@
--- chrome/browser/resources/signin/signin_shared_css.html.orig 2021-06-11 09:30:40 UTC
+++ chrome/browser/resources/signin/signin_shared_css.html
@@ -30,7 +30,7 @@
margin-inline-start: 8px;
}
-<if expr="is_macosx or is_linux">
+<if expr="is_macosx or is_posix">
.action-container {
flex-flow: row-reverse;
justify-content: flex-start;

38
www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html Normal file
View File

@ -0,0 +1,38 @@
--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
@@ -298,7 +298,7 @@
consent-confirmation autofocus>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -308,7 +308,7 @@
disabled="[[anyButtonClicked_]]" hidden="[[syncForced_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -356,7 +356,7 @@
consent-confirmation>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -366,7 +366,7 @@
disabled="[[anyButtonClicked_]]" hidden="[[syncForced_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}

4
www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/sharing/sharing_device_registration.cc
@@ -327,7 +327,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
bool SharingDeviceRegistration::IsRemoteCopySupported() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

38
www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
View File

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

20
www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h
View File

@ -1,20 +0,0 @@
--- chrome/browser/signin/primary_account_policy_manager.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/signin/primary_account_policy_manager.h
@@ -44,7 +44,7 @@ class PrimaryAccountPolicyManager : public KeyedServic
Profile* profile,
signin_metrics::ProfileSignout clear_primary_account_source);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
class DeleteProfileDialogManager;
// SHows the delete profile dialog.
@@ -68,7 +68,7 @@ class PrimaryAccountPolicyManager : public KeyedServic
// profile-specific local prefs (like kGoogleServicesUsernamePattern).
PrefChangeRegistrar local_state_pref_registrar_;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
std::unique_ptr<DeleteProfileDialogManager> delete_profile_dialog_manager_;
bool hide_ui_for_testing_ = false;
#endif

4
www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/sync/device_info_sync_client_impl.cc
@@ -40,7 +40,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD
@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD
// in lacros-chrome once build flag switch of lacros-chrome is
// complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \

4
www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/themes/theme_helper.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/themes/theme_helper.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/themes/theme_helper.cc
@@ -24,7 +24,7 @@
#include "ui/native_theme/common_theme.h"
@ -9,7 +9,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -494,7 +494,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
@@ -498,7 +498,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
ui::NativeTheme const* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();

16
www/chromium/files/patch-chrome_browser_ui_browser.h
View File

@ -1,11 +1,11 @@
--- chrome/browser/ui/browser.h.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/browser.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/browser.h
@@ -734,7 +734,7 @@ class Browser : public TabStripModelObserver,
StatusBubble* GetStatusBubbleForTesting();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void RunScreenAIAnnotator();
@@ -282,7 +282,7 @@ class Browser : public TabStripModelObserver,
int32_t restore_id = kDefaultRestoreId;
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// When the browser window is shown, the desktop environment is notified
// using this ID. In response, the desktop will stop playing the "waiting
// for startup" animation (if any).

8
www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -97,7 +97,7 @@
@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
@@ -288,7 +288,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -320,7 +320,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
@@ -524,7 +524,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -556,7 +556,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;
@@ -1087,7 +1087,7 @@ void BrowserCommandController::InitCommandState() {
@@ -1122,7 +1122,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_browser__dialogs.h
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/browser_dialogs.h.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/ui/browser_dialogs.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/browser_dialogs.h
@@ -26,7 +26,7 @@
@@ -27,7 +27,7 @@
#include "ui/base/models/dialog_model.h"
#include "ui/gfx/native_widget_types.h"

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

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

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

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

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

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

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

@ -0,0 +1,11 @@
--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -241,7 +241,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
// at the state of the MessageLoop.
Browser::CreateParams params = Browser::CreateParams(profile_, false);
params.creation_source = Browser::CreationSource::kStartupCreator;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
params.startup_id = command_line_.GetSwitchValueASCII("desktop-startup-id");
#endif
browser = Browser::Create(params);

8
www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -196,7 +196,7 @@
@@ -198,7 +198,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
#include "chrome/browser/autofill_assistant/common_dependencies_chrome.h"
#include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h"
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -536,13 +536,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -25,7 +25,7 @@
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -557,7 +557,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

11
www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@ -32,3 +32,12 @@
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
@@ -238,7 +238,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS},
#endif

4
www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -19,7 +19,7 @@
#include "ui/gfx/image/image_skia.h"
@ -9,7 +9,7 @@
#include "chrome/browser/shell_integration_linux.h"
#endif
@@ -50,7 +50,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
@@ -55,7 +55,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
const AppWindow::CreateParams& create_params,
views::Widget::InitParams* init_params,
views::Widget* widget) {

6
www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-02-28 16:54:41 UTC
--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/download/download_item_view.cc
@@ -195,7 +195,7 @@ bool UseNewWarnings() {
@@ -188,7 +188,7 @@ bool UseNewWarnings() {
}
int GetFilenameStyle(const views::Label& label) {
@ -9,7 +9,7 @@
if (UseNewWarnings())
return STYLE_EMPHASIZED;
#endif
@@ -203,7 +203,7 @@ int GetFilenameStyle(const views::Label& label) {
@@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) {
}
int GetFilenameStyle(const views::StyledLabel& label) {

11
www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
View File

@ -1,11 +0,0 @@
--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
@@ -145,7 +145,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
}
void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto* view = static_cast<BrowserFrameViewLinux*>(
native_frame_->browser_frame()->GetFrameView());
auto* layout = view->layout();

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 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -1964,7 +1964,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
@@ -1968,7 +1968,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.

4
www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-05-19 14:06:27 UTC
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -610,7 +610,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
@@ -606,7 +606,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

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

@ -1,4 +1,4 @@
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -480,7 +480,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
@ -9,7 +9,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
@@ -1023,7 +1023,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -18,16 +18,16 @@
// 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.
@@ -1977,7 +1977,7 @@ void TabDragController::CompleteDrag() {
@@ -1979,7 +1979,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && \
+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) && \
!BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_MAC)
-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
@@ -2362,7 +2362,7 @@ TabDragController::Liveness TabDragController::GetLoca
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
@@ -2375,7 +2375,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-08-02 06:45:26 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -299,7 +299,7 @@
@@ -305,7 +305,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
@@ -324,17 +324,17 @@
@@ -330,17 +330,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
@@ -680,7 +680,7 @@ bool IsAboutUI(const GURL& url) {
@@ -693,7 +693,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)
@@ -1096,7 +1096,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1120,7 +1120,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
#endif // !defined(USE_REAL_DBUS_CLIENTS)
#endif // !defined(OFFICIAL_BUILD)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
@@ -1154,7 +1154,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1178,7 +1178,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)
@@ -1213,27 +1213,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -1237,27 +1237,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_ntp_app__launcher__handler.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -322,7 +322,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
@@ -325,7 +325,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
bool is_deprecated_app = false;
auto* context = extension_service_->GetBrowserContext();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
is_deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
#endif
@@ -1398,7 +1398,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
@@ -1434,7 +1434,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();

14
www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
View File

@ -1,15 +1,15 @@
--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-04-21 18:48:31 UTC
--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/webui/settings/appearance_handler.cc
@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() {
@@ -29,7 +29,7 @@ void AppearanceHandler::RegisterMessages() {
"useDefaultTheme",
base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
base::Unretained(this)));
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
web_ui()->RegisterMessageCallback(
"useSystemTheme",
base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
@@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
@@ -43,7 +43,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
// 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_webui_settings_settings__localized__strings__provider.cc
View File

@ -1,4 +1,4 @@
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -116,7 +116,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
@ -18,7 +18,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -372,7 +372,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -27,7 +27,7 @@
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -381,7 +381,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@ -36,7 +36,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
@@ -401,7 +401,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
@@ -402,7 +402,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_web__app__provider.cc
View File

@ -1,6 +1,6 @@
--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-06-17 14:20:10 UTC
--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/web_applications/web_app_provider.cc
@@ -281,7 +281,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
@@ -274,7 +274,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
protocol_handler_manager.get());
std::unique_ptr<UrlHandlerManager> url_handler_manager;

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