mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-07 06:40:06 +00:00
www/iridium: update to 2023.11.119
This commit is contained in:
parent
03eac77c10
commit
e6d90349a7
@ -1,6 +1,5 @@
|
||||
PORTNAME= iridium
|
||||
PORTVERSION= 2023.10.118
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2023.11.119
|
||||
CATEGORIES= www wayland
|
||||
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
|
||||
PKGNAMESUFFIX= -browser
|
||||
@ -16,7 +15,7 @@ LICENSE_COMB= multi
|
||||
ONLY_FOR_ARCHS= aarch64 amd64 i386
|
||||
|
||||
PATCH_SITES= https://nerd.hu/distfiles/
|
||||
PATCHFILES+= disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch:-p1
|
||||
PATCHFILES+= disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch:-p1
|
||||
|
||||
BUILD_DEPENDS= bash:shells/bash \
|
||||
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
|
||||
|
@ -1,5 +1,5 @@
|
||||
TIMESTAMP = 1697953114
|
||||
SHA256 (iridium-browser-2023.10.118.tar.xz) = da3d10fae3e674731cdb0e186a469e4bc333b2d40fb79fcda186aa4db0c48385
|
||||
SIZE (iridium-browser-2023.10.118.tar.xz) = 1779967504
|
||||
SHA256 (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = ea4bfcac8636c65d8933236b89429699a51c77837fa04863cb40f8c7add833b4
|
||||
SIZE (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = 3559
|
||||
TIMESTAMP = 1700662814
|
||||
SHA256 (iridium-browser-2023.11.119.tar.xz) = 80ed8669c9538120382aa8da81bb33ac9b346ababb6490838d6dc1a107615026
|
||||
SIZE (iridium-browser-2023.11.119.tar.xz) = 1807223844
|
||||
SHA256 (disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch) = 0565deb50e1206c2fa6d0476474ec9504893fc86b3589467ee2406ad10c915fc
|
||||
SIZE (disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch) = 3437
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -61,7 +61,7 @@ declare_args() {
|
||||
root_extra_deps = []
|
||||
@ -57,10 +57,10 @@
|
||||
|
||||
- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
|
||||
+ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
|
||||
script_test("webdriver_wpt_tests") {
|
||||
script_test("chrome_wpt_tests") {
|
||||
script = "//third_party/blink/tools/run_wpt_tests.py"
|
||||
args = [
|
||||
@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1167,7 +1175,7 @@ if (use_blink && !is_cronet_build) {
|
||||
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
@@ -1193,7 +1201,7 @@ if (use_blink && !is_cronet_build) {
|
||||
@@ -1176,7 +1184,7 @@ if (use_blink && !is_cronet_build) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1653,7 +1661,7 @@ group("chromium_builder_perf") {
|
||||
@@ -1637,7 +1645,7 @@ group("chromium_builder_perf") {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
|
||||
@@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") {
|
||||
flags = [ "CRONET_BUILD=$is_cronet_build" ]
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
buildflag_header("message_pump_buildflags") {
|
||||
header = "message_pump_buildflags.h"
|
||||
header_dir = "base/message_loop"
|
||||
@@ -1111,11 +1111,23 @@ component("base") {
|
||||
@@ -1101,11 +1101,23 @@ component("base") {
|
||||
# Needed for <atomic> if using newer C++ library than sysroot, except if
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
@ -34,7 +34,7 @@
|
||||
if (use_allocator_shim) {
|
||||
if (is_apple) {
|
||||
sources += [ "allocator/early_zone_registration_apple.h" ]
|
||||
@@ -1135,7 +1147,7 @@ component("base") {
|
||||
@@ -1125,7 +1137,7 @@ component("base") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
@ -43,7 +43,7 @@
|
||||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -2080,6 +2092,22 @@ component("base") {
|
||||
@@ -2077,6 +2089,22 @@ component("base") {
|
||||
]
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
# iOS
|
||||
if (is_ios) {
|
||||
sources += [
|
||||
@@ -2212,6 +2240,29 @@ component("base") {
|
||||
@@ -2209,6 +2237,29 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,7 +96,7 @@
|
||||
if (use_blink) {
|
||||
sources += [
|
||||
"files/file_path_watcher.cc",
|
||||
@@ -2222,7 +2273,7 @@ component("base") {
|
||||
@@ -2219,7 +2270,7 @@ component("base") {
|
||||
}
|
||||
|
||||
if (dep_libevent) {
|
||||
@ -105,7 +105,7 @@
|
||||
}
|
||||
|
||||
if (use_libevent) {
|
||||
@@ -3596,7 +3647,7 @@ test("base_unittests") {
|
||||
@@ -3599,7 +3650,7 @@ test("base_unittests") {
|
||||
]
|
||||
}
|
||||
|
||||
@ -114,7 +114,7 @@
|
||||
sources += [
|
||||
"debug/proc_maps_linux_unittest.cc",
|
||||
"files/scoped_file_linux_unittest.cc",
|
||||
@@ -3617,7 +3668,7 @@ test("base_unittests") {
|
||||
@@ -3620,7 +3671,7 @@ test("base_unittests") {
|
||||
"posix/file_descriptor_shuffle_unittest.cc",
|
||||
"posix/unix_domain_socket_unittest.cc",
|
||||
]
|
||||
@ -123,7 +123,7 @@
|
||||
sources += [
|
||||
"profiler/stack_base_address_posix_unittest.cc",
|
||||
"profiler/stack_copier_signal_unittest.cc",
|
||||
@@ -3628,7 +3679,7 @@ test("base_unittests") {
|
||||
@@ -3631,7 +3682,7 @@ test("base_unittests") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
@ -132,7 +132,7 @@
|
||||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -3884,7 +3935,7 @@ test("base_unittests") {
|
||||
@@ -3892,7 +3943,7 @@ test("base_unittests") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/dispatcher/tls.h.orig 2023-07-24 14:27:53 UTC
|
||||
--- base/allocator/dispatcher/tls.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/allocator/dispatcher/tls.h
|
||||
@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
|
||||
@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator {
|
||||
partition_alloc::PartitionPageSize();
|
||||
#elif BUILDFLAG(IS_APPLE)
|
||||
constexpr static size_t AllocationChunkSize = 16384;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/allocator/partition_allocator/BUILD.gn
|
||||
@@ -562,7 +562,7 @@ source_set("allocator_shim") {
|
||||
@@ -569,7 +569,7 @@ source_set("allocator_shim") {
|
||||
]
|
||||
configs += [ ":mac_no_default_new_delete_symbols" ]
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc.gni
|
||||
@@ -328,7 +328,7 @@ declare_args() {
|
||||
@@ -319,7 +319,7 @@ declare_args() {
|
||||
# pkeys support is explicitly disabled in all Cronet builds, as some test
|
||||
# dependencies that use partition_allocator are compiled in AOSP against a
|
||||
# version of glibc that does not include pkeys syscall numbers.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
|
||||
@@ -12,11 +12,11 @@
|
||||
#include <string.h>
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
constexpr size_t kBufferSize = 4096u;
|
||||
|
||||
@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_
|
||||
@@ -359,7 +359,7 @@ void PrintStackTraceInternal(const void** trace, size_
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_APPLE)
|
||||
|
||||
@ -31,4 +31,4 @@
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
// Since /proc/self/maps is not available, use dladdr() to obtain module
|
||||
// names and offsets inside the modules from the given addresses.
|
||||
void PrintStackTraceInternal(void* const* trace, size_t size) {
|
||||
void PrintStackTraceInternal(const void* const* trace, size_t size) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
@@ -95,7 +95,7 @@ PartitionPageShift() {
|
||||
@@ -107,7 +107,7 @@ PartitionPageShift() {
|
||||
return 18; // 256 KiB
|
||||
}
|
||||
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
|
||||
@ -9,7 +9,7 @@
|
||||
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
|
||||
PartitionPageShift() {
|
||||
return PageAllocationGranularityShift() + 2;
|
||||
@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
|
||||
@@ -309,7 +309,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
|
||||
// 8GB for each of the glued pools).
|
||||
#if BUILDFLAG(HAS_64_BIT_POINTERS)
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/base_paths_posix.cc.orig 2022-12-01 10:35:46 UTC
|
||||
--- base/base_paths_posix.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/base_paths_posix.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <ostream>
|
||||
@ -8,7 +8,7 @@
|
||||
#include "base/environment.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/files/file_util.h"
|
||||
@@ -25,9 +26,13 @@
|
||||
@@ -26,9 +27,13 @@
|
||||
#include "base/process/process_metrics.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
@ -23,7 +23,17 @@
|
||||
#elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) {
|
||||
@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) {
|
||||
*result = bin_dir;
|
||||
return true;
|
||||
#elif BUILDFLAG(IS_FREEBSD)
|
||||
- int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
|
||||
- absl::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
|
||||
+ absl::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
|
||||
if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
|
||||
NOTREACHED() << "Unable to resolve path.";
|
||||
return false;
|
||||
@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) {
|
||||
*result = FilePath(bin_dir);
|
||||
return true;
|
||||
#elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/debug/stack_trace_posix.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/debug/stack_trace_posix.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
|
||||
@ -9,16 +9,19 @@
|
||||
#define HAVE_BACKTRACE
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
@@ -59,7 +59,7 @@
|
||||
@@ -59,8 +59,10 @@
|
||||
#include <AvailabilityMacros.h>
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
#include <sys/prctl.h>
|
||||
+#endif
|
||||
|
||||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) {
|
||||
@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) {
|
||||
std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
|
||||
}
|
||||
|
||||
@ -27,7 +30,7 @@
|
||||
void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
|
||||
// We have seen rare cases on AMD linux where the default signal handler
|
||||
// either does not run or a thread (Probably an AMD driver thread) prevents
|
||||
@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
|
||||
@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
|
||||
"Warning: Default signal handler failed to terminate process.\n");
|
||||
PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
|
||||
// See: https://man7.org/linux/man-pages/man2/exit_group.2.html
|
||||
@ -39,7 +42,7 @@
|
||||
}
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
@ -48,7 +51,7 @@
|
||||
// Set an alarm to trigger in case the default handler does not terminate
|
||||
// the process. See 'AlarmSignalHandler' for more details.
|
||||
struct sigaction action;
|
||||
@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
// signals that do not re-raise autonomously), such as signals delivered via
|
||||
// kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
|
||||
// otherwise be lost when re-raising the signal via raise().
|
||||
@ -56,7 +59,7 @@
|
||||
long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
|
||||
info->si_signo, info);
|
||||
if (retval == 0) {
|
||||
@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
|
||||
if (errno != EPERM) {
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
@ -64,7 +67,21 @@
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
|
||||
// BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper {
|
||||
@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper {
|
||||
return -1;
|
||||
}
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
// This class is copied from
|
||||
// third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
|
||||
// It aims at ensuring the process is dumpable before opening /proc/self/mem.
|
||||
@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper {
|
||||
r.base = cur_base;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Parses /proc/self/maps in order to compile a list of all object file names
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
@ -74,7 +91,7 @@
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/files/file_path_watcher_unittest.cc
|
||||
@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
@@ -705,7 +705,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
}
|
||||
delegate.RunUntilEventsMatch(event_expecter);
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
ASSERT_TRUE(WriteFile(file1, "content v2"));
|
||||
// Mac implementation does not detect files modified in a directory.
|
||||
// TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
|
||||
@@ -1525,7 +1525,7 @@ namespace {
|
||||
@@ -1641,7 +1641,7 @@ namespace {
|
||||
|
||||
enum Permission { Read, Write, Execute };
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
|
||||
struct stat stat_buf;
|
||||
|
||||
@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
@@ -1675,7 +1675,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
|
||||
} // namespace
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/files/file_util_posix.cc.orig 2023-07-24 14:27:53 UTC
|
||||
--- base/files/file_util_posix.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
||||
@@ -756,33 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
||||
File::Error* error) {
|
||||
ScopedBlockingCall scoped_blocking_call(
|
||||
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
|
||||
@ -34,11 +34,12 @@
|
||||
- if (!DirectoryExists(subpath)) {
|
||||
- if (error)
|
||||
- *error = File::OSErrorToFileError(saved_errno);
|
||||
- errno = saved_errno;
|
||||
- return false;
|
||||
+ if (!PathExists(subpath)) {
|
||||
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
|
||||
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
|
||||
+ int saved_errno = errno;
|
||||
+ int saved_errno = errno;
|
||||
+ if (error)
|
||||
+ *error = File::OSErrorToFileError(saved_errno);
|
||||
+ return false;
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/process/process_handle_freebsd.cc.orig 2022-10-05 07:34:01 UTC
|
||||
--- base/process/process_handle_freebsd.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/process/process_handle_freebsd.cc
|
||||
@@ -3,6 +3,7 @@
|
||||
// found in the LICENSE file.
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
@@ -15,10 +16,13 @@ namespace base {
|
||||
@@ -19,10 +20,13 @@ namespace base {
|
||||
|
||||
ProcessId GetParentProcessId(ProcessHandle process) {
|
||||
struct kinfo_proc info;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/process/process_unittest.cc.orig 2023-07-24 14:27:53 UTC
|
||||
--- base/process/process_unittest.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/process/process_unittest.cc
|
||||
@@ -195,7 +195,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
|
||||
@@ -198,7 +198,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
|
||||
// was spawned and a time recorded after it was spawned. However, since the
|
||||
// base::Time and process creation clocks don't match, tolerate some error.
|
||||
constexpr base::TimeDelta kTolerance =
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/rand_util_posix.cc.orig 2022-12-06 08:09:13 UTC
|
||||
--- base/rand_util_posix.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/rand_util_posix.cc
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "base/time/time.h"
|
||||
@ -9,14 +9,14 @@
|
||||
#include "third_party/lss/linux_syscall_support.h"
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
|
||||
@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY;
|
||||
static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC;
|
||||
#endif
|
||||
@@ -39,6 +39,7 @@ namespace base {
|
||||
|
||||
namespace {
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
// We keep the file descriptor for /dev/urandom around so we don't need to
|
||||
// reopen it (which is expensive), and since we may not even be able to reopen
|
||||
// it if we are later put in a sandbox. This class wraps the file descriptor so
|
||||
#if BUILDFLAG(IS_AIX)
|
||||
// AIX has no 64-bit support for O_CLOEXEC.
|
||||
static constexpr int kOpenFlags = O_RDONLY;
|
||||
@@ -63,10 +64,11 @@ class URandomFd {
|
||||
private:
|
||||
const int fd_;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/system/sys_info.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/system/sys_info.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/system/sys_info.h
|
||||
@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo {
|
||||
@@ -304,6 +304,8 @@ class BASE_EXPORT SysInfo {
|
||||
static void ResetCpuSecurityMitigationsEnabledForTesting();
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
private:
|
||||
friend class test::ScopedAmountOfPhysicalMemoryOverride;
|
||||
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
|
||||
@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo {
|
||||
@@ -316,7 +318,7 @@ class BASE_EXPORT SysInfo {
|
||||
static HardwareInfo GetHardwareInfoSync();
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
|
@ -1,14 +1,14 @@
|
||||
--- base/system/sys_info_openbsd.cc.orig 2022-10-05 07:34:01 UTC
|
||||
--- base/system/sys_info_openbsd.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/system/sys_info_openbsd.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <sys/sysctl.h>
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include "base/notreached.h"
|
||||
#include "base/posix/sysctl.h"
|
||||
+#include "base/strings/string_util.h"
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) {
|
||||
@@ -27,9 +28,15 @@ uint64_t AmountOfMemory(int pages_name) {
|
||||
|
||||
namespace base {
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
int ncpu;
|
||||
size_t size = sizeof(ncpu);
|
||||
if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
|
||||
@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() {
|
||||
@@ -41,10 +48,26 @@ int SysInfo::NumberOfProcessors() {
|
||||
|
||||
// static
|
||||
uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
|
||||
@ -53,7 +53,7 @@
|
||||
uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
|
||||
// We should add inactive file-backed memory also but there is no such
|
||||
// information from OpenBSD unfortunately.
|
||||
@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
|
||||
@@ -56,16 +79,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
|
||||
int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
|
||||
size_t limit;
|
||||
size_t size = sizeof(limit);
|
||||
@ -72,14 +72,7 @@
|
||||
|
||||
// static
|
||||
-std::string SysInfo::CPUModelName() {
|
||||
- int mib[] = {CTL_HW, HW_MODEL};
|
||||
- char name[256];
|
||||
- size_t len = std::size(name);
|
||||
- if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) {
|
||||
- NOTREACHED();
|
||||
- return std::string();
|
||||
- }
|
||||
- return name;
|
||||
- return StringSysctl({CTL_HW, HW_MODEL}).value();
|
||||
+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
|
||||
+ HardwareInfo info;
|
||||
+ // Set the manufacturer to "OpenBSD" and the model to
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- base/test/launcher/test_launcher.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/test/launcher/test_launcher.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/test/launcher/test_launcher.cc
|
||||
@@ -68,6 +68,7 @@
|
||||
@@ -70,6 +70,7 @@
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
#if BUILDFLAG(IS_POSIX)
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- base/threading/platform_thread_unittest.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- base/threading/platform_thread_unittest.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ base/threading/platform_thread_unittest.cc
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "base/time/time.h"
|
||||
@ -16,9 +16,9 @@
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
|
||||
// able to increase priority to any level.
|
||||
constexpr bool kCanIncreasePriority = false;
|
||||
@@ -695,12 +695,16 @@ INSTANTIATE_TEST_SUITE_P(
|
||||
// able to increase priority to any level unless we are root (euid == 0).
|
||||
bool kCanIncreasePriority = false;
|
||||
@@ -706,12 +706,16 @@ INSTANTIATE_TEST_SUITE_P(
|
||||
|
||||
#endif // BUILDFLAG(IS_APPLE)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/compiler/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- build/config/compiler/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -192,7 +192,7 @@ declare_args() {
|
||||
@@ -196,7 +196,7 @@ declare_args() {
|
||||
# This greatly reduces the size of debug builds, at the cost of
|
||||
# debugging information which is required by some specialized
|
||||
# debugging tools.
|
||||
@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
declare_args() {
|
||||
@@ -256,13 +256,16 @@ config("default_include_dirs") {
|
||||
@@ -260,13 +260,16 @@ config("default_include_dirs") {
|
||||
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
|
||||
# the executable they are loaded into, so they are unresolved at link-time.
|
||||
config("no_unresolved_symbols") {
|
||||
@ -27,17 +27,7 @@
|
||||
}
|
||||
|
||||
# compiler ---------------------------------------------------------------------
|
||||
@@ -310,7 +313,9 @@ config("compiler") {
|
||||
|
||||
configs += [
|
||||
# See the definitions below.
|
||||
+ ":clang_revision",
|
||||
":rustc_revision",
|
||||
+ ":compiler_cpu_abi",
|
||||
":compiler_codegen",
|
||||
":compiler_deterministic",
|
||||
]
|
||||
@@ -505,6 +510,10 @@ config("compiler") {
|
||||
@@ -505,6 +508,10 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -48,7 +38,7 @@
|
||||
# Linux-specific compiler flags setup.
|
||||
# ------------------------------------
|
||||
if (use_gold) {
|
||||
@@ -1070,7 +1079,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -1091,7 +1098,7 @@ config("compiler_cpu_abi") {
|
||||
]
|
||||
}
|
||||
} else if (current_cpu == "arm") {
|
||||
@ -57,7 +47,7 @@
|
||||
!(is_chromeos_lacros && is_chromeos_device)) {
|
||||
cflags += [ "--target=arm-linux-gnueabihf" ]
|
||||
ldflags += [ "--target=arm-linux-gnueabihf" ]
|
||||
@@ -1085,7 +1094,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -1106,7 +1113,7 @@ config("compiler_cpu_abi") {
|
||||
cflags += [ "-mtune=$arm_tune" ]
|
||||
}
|
||||
} else if (current_cpu == "arm64") {
|
||||
@ -66,7 +56,7 @@
|
||||
!(is_chromeos_lacros && is_chromeos_device)) {
|
||||
cflags += [ "--target=aarch64-linux-gnu" ]
|
||||
ldflags += [ "--target=aarch64-linux-gnu" ]
|
||||
@@ -1431,6 +1440,27 @@ config("compiler_deterministic") {
|
||||
@@ -1452,6 +1459,27 @@ config("compiler_deterministic") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -94,16 +84,16 @@
|
||||
config("rustc_revision") {
|
||||
if (rustc_revision != "") {
|
||||
# Similar to the above config, this is here so that all files get recompiled
|
||||
@@ -1675,7 +1705,7 @@ config("default_warnings") {
|
||||
"-Wno-ignored-pragma-optimize",
|
||||
]
|
||||
@@ -1725,7 +1753,7 @@ config("default_warnings") {
|
||||
]
|
||||
}
|
||||
|
||||
- if (!is_nacl) {
|
||||
+ if (!is_nacl && !is_bsd) {
|
||||
cflags += [
|
||||
# TODO(crbug.com/1343975) Evaluate and possibly enable.
|
||||
"-Wno-deprecated-builtins",
|
||||
@@ -1867,7 +1897,7 @@ config("no_chromium_code") {
|
||||
@@ -1897,7 +1925,7 @@ config("no_chromium_code") {
|
||||
# third-party libraries.
|
||||
"-Wno-c++11-narrowing",
|
||||
]
|
||||
@ -112,7 +102,7 @@
|
||||
cflags += [
|
||||
# Disabled for similar reasons as -Wunused-variable.
|
||||
"-Wno-unused-but-set-variable",
|
||||
@@ -2151,8 +2181,7 @@ config("default_stack_frames") {
|
||||
@@ -2200,8 +2228,7 @@ config("default_stack_frames") {
|
||||
}
|
||||
|
||||
# Default "optimization on" config.
|
||||
@ -122,7 +112,7 @@
|
||||
if (is_win) {
|
||||
if (chrome_pgo_phase != 2) {
|
||||
# Favor size over speed, /O1 must be before the common flags.
|
||||
@@ -2211,8 +2240,7 @@ config("xoptimize") {
|
||||
@@ -2260,8 +2287,7 @@ config("xoptimize") {
|
||||
}
|
||||
|
||||
# Turn off optimizations.
|
||||
@ -132,7 +122,7 @@
|
||||
if (is_win) {
|
||||
cflags = [
|
||||
"/Od", # Disable optimization.
|
||||
@@ -2252,8 +2280,7 @@ config("xno_optimize") {
|
||||
@@ -2301,8 +2327,7 @@ config("xno_optimize") {
|
||||
# Turns up the optimization level. On Windows, this implies whole program
|
||||
# optimization and link-time code generation which is very expensive and should
|
||||
# be used sparingly.
|
||||
@ -142,7 +132,7 @@
|
||||
if (is_nacl && is_nacl_irt) {
|
||||
# The NaCl IRT is a special case and always wants its own config.
|
||||
# Various components do:
|
||||
@@ -2286,8 +2313,7 @@ config("xoptimize_max") {
|
||||
@@ -2335,8 +2360,7 @@ config("xoptimize_max") {
|
||||
#
|
||||
# TODO(crbug.com/621335) - rework how all of these configs are related
|
||||
# so that we don't need this disclaimer.
|
||||
@ -152,7 +142,7 @@
|
||||
if (is_nacl && is_nacl_irt) {
|
||||
# The NaCl IRT is a special case and always wants its own config.
|
||||
# Various components do:
|
||||
@@ -2313,8 +2339,7 @@ config("xoptimize_speed") {
|
||||
@@ -2362,8 +2386,7 @@ config("xoptimize_speed") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -162,7 +152,7 @@
|
||||
cflags = [ "-O1" ] + common_optimize_on_cflags
|
||||
rustflags = [ "-Copt-level=1" ]
|
||||
ldflags = common_optimize_on_ldflags
|
||||
@@ -2382,7 +2407,7 @@ config("afdo_optimize_size") {
|
||||
@@ -2431,7 +2454,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") {
|
||||
@ -171,7 +161,7 @@
|
||||
cflags = []
|
||||
if (clang_emit_debug_info_for_profiling) {
|
||||
# Add the following flags to generate debug info for profiling.
|
||||
@@ -2409,7 +2434,7 @@ config("afdo") {
|
||||
@@ -2458,7 +2481,7 @@ config("afdo") {
|
||||
cflags += [ "-Wno-backend-plugin" ]
|
||||
inputs = [ _clang_sample_profile ]
|
||||
}
|
||||
@ -180,7 +170,7 @@
|
||||
cflags = [ "-fauto-profile=${auto_profile_path}" ]
|
||||
inputs = [ auto_profile_path ]
|
||||
}
|
||||
@@ -2447,8 +2472,7 @@ config("win_pdbaltpath") {
|
||||
@@ -2496,8 +2519,7 @@ config("win_pdbaltpath") {
|
||||
}
|
||||
|
||||
# Full symbols.
|
||||
@ -190,7 +180,7 @@
|
||||
rustflags = []
|
||||
if (is_win) {
|
||||
if (is_clang) {
|
||||
@@ -2574,7 +2598,8 @@ config("xsymbols") {
|
||||
@@ -2623,7 +2645,8 @@ config("xsymbols") {
|
||||
configs += [ "//build/config:compress_debug_sections" ]
|
||||
}
|
||||
|
||||
@ -200,7 +190,7 @@
|
||||
if (is_apple) {
|
||||
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
|
||||
# Make sure we don't use constructor homing on mac.
|
||||
@@ -2597,8 +2622,7 @@ config("xsymbols") {
|
||||
@@ -2646,8 +2669,7 @@ config("xsymbols") {
|
||||
# Minimal symbols.
|
||||
# This config guarantees to hold symbol for stack trace which are shown to user
|
||||
# when crash happens in unittests running on buildbot.
|
||||
@ -210,7 +200,7 @@
|
||||
rustflags = []
|
||||
if (is_win) {
|
||||
# Functions, files, and line tables only.
|
||||
@@ -2683,8 +2707,7 @@ config("xminimal_symbols") {
|
||||
@@ -2732,8 +2754,7 @@ config("xminimal_symbols") {
|
||||
# This configuration contains function names only. That is, the compiler is
|
||||
# told to not generate debug information and the linker then just puts function
|
||||
# names in the final debug information.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/config/compiler/pgo/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- build/config/compiler/pgo/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ build/config/compiler/pgo/BUILD.gn
|
||||
@@ -143,13 +143,14 @@ config("pgo_optimization_flags") {
|
||||
@@ -139,13 +139,14 @@ config("pgo_optimization_flags") {
|
||||
|
||||
# Enable basic block layout based on the extended TSP problem. This aims to
|
||||
# improve icache utilization and reduce the binary size.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2023-10-21 11:51:27 UTC
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2023-11-22 14:00:11 UTC
|
||||
+++ build/toolchain/gcc_toolchain.gni
|
||||
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
|
||||
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
|
||||
@ -14,7 +14,7 @@
|
||||
# This template defines a toolchain for something that works like gcc
|
||||
# (including clang).
|
||||
#
|
||||
@@ -874,22 +881,12 @@ template("gcc_toolchain") {
|
||||
@@ -875,22 +882,12 @@ template("gcc_toolchain") {
|
||||
# use_gold too.
|
||||
template("clang_toolchain") {
|
||||
gcc_toolchain(target_name) {
|
||||
@ -40,5 +40,5 @@
|
||||
+ ar = "ar"
|
||||
+ nm = "nm"
|
||||
|
||||
forward_variables_from(invoker,
|
||||
[
|
||||
forward_variables_from(invoker, "*", [ "toolchain_args" ])
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/toolchain/toolchain.gni.orig 2023-10-21 11:51:27 UTC
|
||||
--- build/toolchain/toolchain.gni.orig 2023-11-22 14:00:11 UTC
|
||||
+++ build/toolchain/toolchain.gni
|
||||
@@ -67,7 +67,7 @@ if (host_os == "mac") {
|
||||
@@ -72,7 +72,7 @@ if (host_os == "mac") {
|
||||
host_shlib_extension = ".dylib"
|
||||
} else if (host_os == "win") {
|
||||
host_shlib_extension = ".dll"
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- cc/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- cc/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ cc/BUILD.gn
|
||||
@@ -674,7 +674,7 @@ cc_test_static_library("test_support") {
|
||||
@@ -675,7 +675,7 @@ cc_test_static_library("test_support") {
|
||||
if (enable_vulkan) {
|
||||
deps += [ "//gpu/vulkan/init" ]
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
data_deps = [ "//third_party/mesa_headers" ]
|
||||
}
|
||||
if (skia_use_dawn) {
|
||||
@@ -929,7 +929,6 @@ cc_test("cc_unittests") {
|
||||
@@ -930,7 +930,6 @@ cc_test("cc_unittests") {
|
||||
data = [ "//components/test/data/viz/" ]
|
||||
data_deps = [
|
||||
"//testing/buildbot/filters:cc_unittests_filters",
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- cc/base/features.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- cc/base/features.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ cc/base/features.cc
|
||||
@@ -85,7 +85,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
|
||||
@@ -84,7 +84,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
|
||||
// be using a separate flag to control the launch on GL.
|
||||
BASE_FEATURE(kUseDMSAAForTiles,
|
||||
"UseDMSAAForTiles",
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/app/chrome_main.cc.orig 2023-07-24 14:27:53 UTC
|
||||
--- chrome/app/chrome_main.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/app/chrome_main.cc
|
||||
@@ -27,11 +27,11 @@
|
||||
@@ -29,11 +29,11 @@
|
||||
#include "chrome/app/notification_metrics.h"
|
||||
#endif
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
#include "chrome/app/chrome_main_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) {
|
||||
@@ -138,7 +138,7 @@ int ChromeMain(int argc, const char** argv) {
|
||||
SetUpBundleOverrides();
|
||||
#endif
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
AppendExtraArgumentsToCommandLine(command_line);
|
||||
#endif
|
||||
|
||||
@@ -164,7 +164,7 @@ int ChromeMain(int argc, const char** argv) {
|
||||
headless::SetUpCommandLine(command_line);
|
||||
@@ -167,7 +167,7 @@ int ChromeMain(int argc, const char** argv) {
|
||||
headless_mode_handle = headless::InitHeadlessMode();
|
||||
} else {
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
- BUILDFLAG(IS_WIN)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -143,7 +143,7 @@
|
||||
@@ -145,7 +145,7 @@
|
||||
#include "components/about_ui/credit_utils.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "components/nacl/common/nacl_paths.h"
|
||||
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
|
||||
#endif
|
||||
@@ -186,16 +186,16 @@
|
||||
@@ -188,16 +188,16 @@
|
||||
#include "v8/include/v8.h"
|
||||
#endif
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "chrome/browser/policy/policy_path_parser.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -334,7 +334,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
@@ -336,7 +336,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
|
||||
// and resources loaded.
|
||||
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
|
||||
return
|
||||
@ -38,7 +38,7 @@
|
||||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
||||
@@ -419,7 +419,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
@@ -421,7 +421,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -47,7 +47,7 @@
|
||||
// Show the man page if --help or -h is on the command line.
|
||||
void HandleHelpSwitches(const base::CommandLine& command_line) {
|
||||
if (command_line.HasSwitch(switches::kHelp) ||
|
||||
@@ -546,7 +546,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
@@ -593,7 +593,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
// On Linux, Chrome does not support running multiple copies under different
|
||||
// DISPLAYs, so the profile directory can be specified in the environment to
|
||||
// support the virtual desktop use-case.
|
||||
@@ -636,7 +636,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
|
||||
@@ -683,7 +683,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -65,7 +65,7 @@
|
||||
// Record the startup process creation time on supported platforms. On Android
|
||||
// this is recorded in ChromeMainDelegateAndroid.
|
||||
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
|
||||
@@ -994,7 +994,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
|
||||
@@ -1012,7 +1012,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
|
||||
base::InitializeCpuReductionExperiment();
|
||||
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
|
||||
base::sequence_manager::internal::ThreadController::InitializeFeatures();
|
||||
@ -74,7 +74,7 @@
|
||||
base::MessagePumpLibevent::InitializeFeatures();
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
base::PlatformThread::InitFeaturesPostFieldTrial();
|
||||
@@ -1141,7 +1141,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
|
||||
@@ -1159,7 +1159,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
@ -83,7 +83,7 @@
|
||||
// This will directly exit if the user asked for help.
|
||||
HandleHelpSwitches(command_line);
|
||||
#endif
|
||||
@@ -1171,7 +1171,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
|
||||
@@ -1189,7 +1189,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
chromeos::dbus_paths::RegisterPathProvider();
|
||||
#endif
|
||||
@ -92,7 +92,7 @@
|
||||
nacl::RegisterPathProvider();
|
||||
#endif
|
||||
|
||||
@@ -1561,7 +1561,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1589,7 +1589,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
||||
}
|
||||
|
||||
@ -101,7 +101,7 @@
|
||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
|
||||
@@ -1663,7 +1663,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
|
||||
@@ -1691,7 +1691,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.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/app/chromium_strings.grd.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/app/chromium_strings.grd.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/app/chromium_strings.grd
|
||||
@@ -315,7 +315,7 @@ If you update this file, be sure also to update google
|
||||
Welcome to Iridium; new browser window opened
|
||||
@ -18,7 +18,7 @@
|
||||
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
|
||||
The browser may not function correctly because it is no longer supported on this Linux distribution
|
||||
</message>
|
||||
@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps
|
||||
@@ -896,7 +896,7 @@ Permissions you've already given to websites and apps
|
||||
</message>
|
||||
</if>
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
<message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
|
||||
Not used in Chromium. Placeholder to keep resource maps in sync.
|
||||
</message>
|
||||
@@ -1247,7 +1247,7 @@ Permissions you've already given to websites and apps
|
||||
@@ -1264,7 +1264,7 @@ Permissions you've already given to websites and apps
|
||||
</message>
|
||||
</if>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/app/generated_resources.grd.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/app/generated_resources.grd.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
for making strings OS specific. Other platform defines such as use_titlecase
|
||||
are declared in tools/grit/grit_rule.gni.
|
||||
-->
|
||||
@@ -3601,7 +3601,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
@@ -3605,7 +3605,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
</if>
|
||||
|
||||
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
|
||||
@ -18,7 +18,7 @@
|
||||
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
|
||||
Device Credentials
|
||||
</message>
|
||||
@@ -5432,7 +5432,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
@@ -5445,7 +5445,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
Read information about your browser, OS, device, installed software, registry values and files
|
||||
</message>
|
||||
</if>
|
||||
@ -27,7 +27,7 @@
|
||||
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
|
||||
Read information about your browser, OS, device, installed software and files
|
||||
</message>
|
||||
@@ -6145,7 +6145,7 @@ Keep your key file in a safe place. You will need it t
|
||||
@@ -6158,7 +6158,7 @@ Keep your key file in a safe place. You will need it t
|
||||
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
|
||||
</message>
|
||||
</if>
|
||||
@ -36,7 +36,7 @@
|
||||
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
|
||||
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
|
||||
</message>
|
||||
@@ -6191,7 +6191,7 @@ Keep your key file in a safe place. You will need it t
|
||||
@@ -6204,7 +6204,7 @@ Keep your key file in a safe place. You will need it t
|
||||
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
|
||||
</message>
|
||||
</if>
|
||||
@ -63,7 +63,7 @@
|
||||
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
|
||||
Use system title bar and borders
|
||||
</message>
|
||||
@@ -11728,7 +11728,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
|
||||
@@ -11734,7 +11734,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
|
||||
</message>
|
||||
|
||||
<!-- Device Trust Consent dialog -->
|
||||
@ -72,7 +72,7 @@
|
||||
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
|
||||
Share information about your device?
|
||||
</message>
|
||||
@@ -12136,7 +12136,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
@@ -12142,7 +12142,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
Set as default
|
||||
</message>
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
|
||||
Minimize
|
||||
</message>
|
||||
@@ -14346,7 +14346,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
@@ -14349,7 +14349,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
Open Anyway
|
||||
</message>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/app/google_chrome_strings.grd.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/app/google_chrome_strings.grd.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/app/google_chrome_strings.grd
|
||||
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
|
||||
Welcome to Chrome; new browser window opened
|
||||
@ -18,7 +18,7 @@
|
||||
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
|
||||
Google Chrome may not function correctly because it is no longer supported on this Linux distribution
|
||||
</message>
|
||||
@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps
|
||||
@@ -881,7 +881,7 @@ Permissions you've already given to websites and apps
|
||||
</if>
|
||||
</if>
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
<if expr="use_titlecase">
|
||||
<message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
|
||||
Relaunch to Update - Your tabs will reopen
|
||||
@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps
|
||||
@@ -1297,7 +1297,7 @@ Permissions you've already given to websites and apps
|
||||
</message>
|
||||
</if>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/app/settings_strings.grdp.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/app/settings_strings.grdp.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/app/settings_strings.grdp
|
||||
@@ -183,12 +183,12 @@
|
||||
Manage accessibility features
|
||||
@ -13,7 +13,7 @@
|
||||
- <if expr="is_win or is_linux">
|
||||
+ <if expr="is_win or is_posix">
|
||||
<message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
|
||||
Navigate back and forward with swipe gesture
|
||||
Navigate back and forward with a swipe gesture
|
||||
</message>
|
||||
@@ -222,7 +222,7 @@
|
||||
Theme
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -6390,6 +6390,13 @@ static_library("browser") {
|
||||
@@ -6486,6 +6486,13 @@ static_library("browser") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/about_flags.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/about_flags.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/about_flags.cc
|
||||
@@ -225,7 +225,7 @@
|
||||
@@ -226,7 +226,7 @@
|
||||
#include "ui/ui_features.h"
|
||||
#include "url/url_features.h"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "base/allocator/buildflags.h"
|
||||
#endif
|
||||
|
||||
@@ -324,7 +324,7 @@
|
||||
@@ -326,7 +326,7 @@
|
||||
#include "device/vr/public/cpp/features.h"
|
||||
#endif
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#include "ui/ozone/buildflags.h"
|
||||
#include "ui/ozone/public/ozone_switches.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -338,7 +338,7 @@
|
||||
@@ -340,7 +340,7 @@
|
||||
#include "chrome/browser/win/titlebar_config.h"
|
||||
#endif
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
@@ -438,7 +438,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
|
||||
@@ -470,7 +470,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
|
||||
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
|
||||
#endif
|
||||
|
||||
@ -36,8 +36,8 @@
|
||||
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
|
||||
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
|
||||
{flag_descriptions::kOzonePlatformHintChoiceAuto,
|
||||
@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
|
||||
std::size(kChromeRefresh2023Level1), nullptr}};
|
||||
@@ -1562,7 +1562,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
|
||||
nullptr}};
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
|
||||
@ -45,7 +45,7 @@
|
||||
const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
|
||||
{"ShortcutBoostSearchScore", "1414"},
|
||||
{"ShortcutBoostUrlScore", "1414"}};
|
||||
@@ -5039,13 +5039,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5312,13 +5312,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kWebShare)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
{"skip-undecryptable-passwords",
|
||||
flag_descriptions::kSkipUndecryptablePasswordsName,
|
||||
flag_descriptions::kSkipUndecryptablePasswordsDescription,
|
||||
@@ -5347,7 +5347,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5629,7 +5629,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(feed::kFeedSportsCard)},
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
@ -70,8 +70,8 @@
|
||||
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
|
||||
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
|
||||
@@ -6025,7 +6025,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
|
||||
@@ -6296,7 +6296,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
||||
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
|
||||
@ -79,7 +79,7 @@
|
||||
{"omnibox-actions-ui-simplification",
|
||||
flag_descriptions::kOmniboxActionsUISimplificationName,
|
||||
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
|
||||
@@ -6853,7 +6853,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7131,7 +7131,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kParallelDownloadingDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
|
||||
|
||||
@ -88,7 +88,7 @@
|
||||
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
|
||||
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
|
||||
FEATURE_VALUE_TYPE(features::kAsyncDns)},
|
||||
@@ -7848,7 +7848,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8143,7 +8143,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
|
||||
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
{"enable-network-service-sandbox",
|
||||
flag_descriptions::kEnableNetworkServiceSandboxName,
|
||||
flag_descriptions::kEnableNetworkServiceSandboxDescription,
|
||||
@@ -8553,7 +8553,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8836,7 +8836,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -106,7 +106,7 @@
|
||||
{"quick-commands", flag_descriptions::kQuickCommandsName,
|
||||
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kQuickCommands)},
|
||||
@@ -8844,7 +8844,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9140,7 +9140,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kWallpaperRefreshRevamp)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -115,7 +115,7 @@
|
||||
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
|
||||
flag_descriptions::kGetAllScreensMediaDescription,
|
||||
kOsCrOS | kOsLacros | kOsLinux,
|
||||
@@ -8900,7 +8900,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9196,7 +9196,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -124,7 +124,7 @@
|
||||
{
|
||||
"ui-debug-tools",
|
||||
flag_descriptions::kUIDebugToolsName,
|
||||
@@ -9443,7 +9443,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9760,7 +9760,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -133,7 +133,7 @@
|
||||
{"document-picture-in-picture-api",
|
||||
flag_descriptions::kDocumentPictureInPictureApiName,
|
||||
flag_descriptions::kDocumentPictureInPictureApiDescription,
|
||||
@@ -10060,7 +10060,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10359,7 +10359,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
{"webui-system-font", flag_descriptions::kWebUiSystemFontName,
|
||||
flag_descriptions::kWebUiSystemFontDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
|
||||
@@ -10263,7 +10263,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10560,7 +10560,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
|
||||
@ -151,16 +151,16 @@
|
||||
{"data-retention-policies-disable-sync-types-needed",
|
||||
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
|
||||
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
|
||||
@@ -10657,7 +10657,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10966,7 +10966,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
|
||||
|
||||
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
{"camera-mic-preview", flag_descriptions::kCameraMicPreviewName,
|
||||
flag_descriptions::kCameraMicPreviewDescription,
|
||||
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
|
||||
flag_descriptions::kCameraMicEffectsDescription,
|
||||
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia),
|
||||
@@ -10834,7 +10834,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11153,7 +11153,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)},
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/browser_process_impl.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/browser_process_impl.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -215,7 +215,7 @@
|
||||
@@ -216,7 +216,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
|
||||
|
||||
@@ -1206,7 +1206,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
@@ -1208,7 +1208,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
|
||||
ApplyMetricsReportingPolicy();
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
ChromeJsErrorReportProcessor::Create();
|
||||
#endif
|
||||
|
||||
@@ -1460,7 +1460,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
@@ -1462,7 +1462,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
// Mac is currently not supported.
|
||||
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/chrome_browser_interface_binders.cc
|
||||
@@ -129,13 +129,13 @@
|
||||
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
@ -16,16 +16,16 @@
|
||||
#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
|
||||
@@ -217,7 +217,7 @@
|
||||
@@ -218,7 +218,7 @@
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/companion/visual_search/visual_search_suggestions_service_factory.h"
|
||||
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
|
||||
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
|
||||
#include "chrome/browser/ui/webui/discards/discards_ui.h"
|
||||
@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor(
|
||||
@@ -841,7 +841,7 @@ void BindScreen2xMainContentExtractor(
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -34,7 +34,7 @@
|
||||
void BindVisualSuggestionsModelProvider(
|
||||
content::RenderFrameHost* frame_host,
|
||||
mojo::PendingReceiver<
|
||||
@@ -977,7 +977,7 @@ void PopulateChromeFrameBinders(
|
||||
@@ -988,7 +988,7 @@ void PopulateChromeFrameBinders(
|
||||
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -43,16 +43,16 @@
|
||||
if (!render_frame_host->GetParent()) {
|
||||
map->Add<chrome::mojom::DraggableRegions>(
|
||||
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
|
||||
@@ -985,7 +985,7 @@ void PopulateChromeFrameBinders(
|
||||
@@ -996,7 +996,7 @@ void PopulateChromeFrameBinders(
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
- BUILDFLAG(IS_WIN)
|
||||
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
|
||||
!render_frame_host->GetParentOrOuterDocument()) {
|
||||
// The service binder will reject non-primary main frames, but we still need
|
||||
@@ -1065,7 +1065,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1076,7 +1076,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
commerce::CommerceInternalsUI>(map);
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -61,7 +61,7 @@
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
connectors_internals::mojom::PageHandler,
|
||||
enterprise_connectors::ConnectorsInternalsUI>(map);
|
||||
@@ -1080,7 +1080,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1092,7 +1092,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -70,7 +70,7 @@
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
|
||||
#endif
|
||||
@@ -1578,7 +1578,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -1601,7 +1601,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -247,11 +247,11 @@
|
||||
@@ -248,11 +248,11 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -14,7 +14,7 @@
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
|
||||
@@ -286,14 +286,14 @@
|
||||
@@ -287,14 +287,14 @@
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -31,7 +31,7 @@
|
||||
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
|
||||
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
|
||||
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
|
||||
@@ -1033,7 +1033,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1040,7 +1040,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
|
||||
}
|
||||
|
||||
@ -40,7 +40,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 .
|
||||
@@ -1089,7 +1089,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1096,7 +1096,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -49,7 +49,7 @@
|
||||
metrics::DesktopSessionDurationTracker::Initialize();
|
||||
ProfileActivityMetricsRecorder::Initialize();
|
||||
TouchModeStatsTracker::Initialize(
|
||||
@@ -1325,7 +1325,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
@@ -1332,7 +1332,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
|
||||
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
if (headless::IsHeadlessMode()) {
|
||||
headless::ReportHeadlessActionMetrics();
|
||||
}
|
||||
@@ -1431,7 +1431,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
@@ -1438,7 +1438,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
// In headless mode provide alternate SelectFileDialog factory overriding
|
||||
// any platform specific SelectFileDialog implementation that may have been
|
||||
// set.
|
||||
@ -67,3 +67,12 @@
|
||||
if (headless::IsHeadlessMode()) {
|
||||
headless::HeadlessSelectFileDialogFactory::SetUp();
|
||||
}
|
||||
@@ -2026,7 +2026,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
|
||||
|
||||
// Drop the request if headless mode is in effect or the request is from
|
||||
// a headless Chrome process.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
if (headless::IsHeadlessMode() ||
|
||||
command_line.HasSwitch(switches::kHeadless)) {
|
||||
return false;
|
||||
|
@ -1,15 +1,15 @@
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -436,7 +436,7 @@
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
|
||||
@@ -443,7 +443,7 @@
|
||||
#include "storage/browser/file_system/external_mount_points.h"
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
#include "base/android/application_status_listener.h"
|
||||
@@ -530,12 +530,12 @@
|
||||
@@ -543,12 +543,12 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -24,8 +24,8 @@
|
||||
#include "components/crash/core/app/crash_switches.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -544,14 +544,14 @@
|
||||
#include "components/crash/content/browser/crash_handler_host_linux.h"
|
||||
@@ -559,14 +559,14 @@
|
||||
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
@ -41,13 +41,8 @@
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -580,11 +580,11 @@
|
||||
|
||||
// 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 "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
||||
@@ -582,7 +582,7 @@
|
||||
#include "components/lens/lens_features.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
@ -56,9 +51,9 @@
|
||||
#elif BUILDFLAG(IS_OZONE)
|
||||
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
|
||||
@@ -1598,7 +1598,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
|
||||
registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed,
|
||||
true);
|
||||
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
|
||||
registry->RegisterBooleanPref(
|
||||
policy::policy_prefs::kPPAPISharedImagesForVideoDecoderAllowed, true);
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
@ -73,7 +68,7 @@
|
||||
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
|
||||
is_integration_test, &startup_data_);
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -82,7 +77,7 @@
|
||||
main_parts->AddParts(
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
|
||||
#else
|
||||
@@ -1780,7 +1780,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1778,7 +1778,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
|
||||
#endif
|
||||
|
||||
@ -91,7 +86,7 @@
|
||||
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
|
||||
#elif BUILDFLAG(IS_OZONE)
|
||||
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
|
||||
@@ -1799,7 +1799,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
@@ -1797,7 +1797,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
|
||||
|
||||
chrome::AddMetricsExtraParts(main_parts.get());
|
||||
|
||||
@ -100,7 +95,7 @@
|
||||
main_parts->AddParts(
|
||||
std::make_unique<
|
||||
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
|
||||
@@ -2629,6 +2629,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -2627,6 +2627,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
#elif BUILDFLAG(IS_POSIX)
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
bool enable_crash_reporter = true;
|
||||
@ -109,7 +104,7 @@
|
||||
#elif BUILDFLAG(IS_CHROMEOS)
|
||||
bool enable_crash_reporter = false;
|
||||
if (crash_reporter::IsCrashpadEnabled()) {
|
||||
@@ -3006,7 +3008,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -3010,7 +3012,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
|
||||
command_line);
|
||||
|
||||
@ -118,7 +113,7 @@
|
||||
// Opt into a hardened stack canary mitigation if it hasn't already been
|
||||
// force-disabled.
|
||||
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
|
||||
@@ -4614,7 +4616,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
@@ -4641,7 +4643,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
}
|
||||
}
|
||||
|
||||
@ -127,7 +122,7 @@
|
||||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -5161,7 +5163,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5188,7 +5190,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
&throttles);
|
||||
}
|
||||
|
||||
@ -136,7 +131,7 @@
|
||||
MaybeAddThrottle(
|
||||
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -5171,7 +5173,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5198,7 +5200,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
@ -145,7 +140,7 @@
|
||||
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -5210,7 +5212,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -5237,7 +5239,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
handle));
|
||||
}
|
||||
|
||||
@ -154,7 +149,7 @@
|
||||
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -7054,7 +7056,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
|
||||
@@ -7124,7 +7126,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
|
||||
}
|
||||
|
||||
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.h
|
||||
@@ -478,7 +478,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
@@ -482,7 +482,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
void OverridePageVisibilityState(
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
content::PageVisibilityState* visibility_state) override;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/download/download_commands.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/download/download_commands.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/download/download_commands.h
|
||||
@@ -60,7 +60,7 @@ class DownloadCommands {
|
||||
@@ -62,7 +62,7 @@ class DownloadCommands {
|
||||
void ExecuteCommand(Command command);
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/download/download_item_model.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/download/download_item_model.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/download/download_item_model.cc
|
||||
@@ -769,7 +769,7 @@ bool DownloadItemModel::IsCommandChecked(
|
||||
@@ -757,7 +757,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,8 +9,8 @@
|
||||
if (download_commands->CanOpenPdfInSystemViewer()) {
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
|
||||
return prefs->ShouldOpenPdfInSystemReader();
|
||||
@@ -815,7 +815,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
|
||||
base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
|
||||
@@ -803,7 +803,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
|
||||
DownloadCommands::ALWAYS_OPEN_TYPE);
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_MAC)
|
||||
@ -18,7 +18,7 @@
|
||||
if (download_commands->CanOpenPdfInSystemViewer()) {
|
||||
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
|
||||
SetShouldPreferOpeningInBrowser(is_checked);
|
||||
@@ -1200,7 +1200,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
|
||||
@@ -1174,7 +1174,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/download/download_prefs.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/download/download_prefs.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/download/download_prefs.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <vector>
|
||||
@ -37,7 +37,7 @@
|
||||
should_open_pdf_in_system_reader_ =
|
||||
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
|
||||
#endif
|
||||
@@ -314,7 +319,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
||||
@@ -312,7 +317,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
||||
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
|
||||
/*default_value=*/base::Time());
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
@ -46,7 +46,7 @@
|
||||
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
|
||||
#endif
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -487,7 +492,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
|
||||
@@ -485,7 +490,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
@ -55,7 +55,7 @@
|
||||
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
|
||||
if (should_open_pdf_in_system_reader_ == should_open)
|
||||
return;
|
||||
@@ -519,7 +524,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
||||
@@ -517,7 +522,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
||||
|
||||
void DownloadPrefs::ResetAutoOpenByUser() {
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
@ -64,7 +64,7 @@
|
||||
SetShouldOpenPdfInSystemReader(false);
|
||||
#endif
|
||||
auto_open_by_user_.clear();
|
||||
@@ -550,7 +555,7 @@ void DownloadPrefs::SaveAutoOpenState() {
|
||||
@@ -548,7 +553,7 @@ void DownloadPrefs::SaveAutoOpenState() {
|
||||
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
return false; // There is no UI for auto-open on ChromeOS.
|
||||
@ -73,7 +73,7 @@
|
||||
return ShouldOpenPdfInSystemReader();
|
||||
#else
|
||||
return false;
|
||||
@@ -674,7 +679,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
|
||||
@@ -672,7 +677,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
|
||||
#else
|
||||
// If the stored download directory is an absolute path, we presume it's
|
||||
// correct; there's not really much more validation we can do here.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/download/download_prefs.h.orig 2023-04-22 17:45:15 UTC
|
||||
--- chrome/browser/download/download_prefs.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/download/download_prefs.h
|
||||
@@ -118,7 +118,7 @@ class DownloadPrefs {
|
||||
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
|
||||
@ -9,7 +9,7 @@
|
||||
// Store the user preference to disk. If |should_open| is true, also disable
|
||||
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
|
||||
void SetShouldOpenPdfInSystemReader(bool should_open);
|
||||
@@ -183,7 +183,7 @@ class DownloadPrefs {
|
||||
@@ -182,7 +182,7 @@ class DownloadPrefs {
|
||||
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/enterprise/connectors/connectors_service.cc
|
||||
@@ -543,7 +543,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
|
||||
@@ -548,7 +548,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
|
||||
|
||||
Profile* profile = Profile::FromBrowserContext(context_);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
||||
@@ -55,7 +55,7 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
|
||||
#include "components/device_signals/core/browser/signals_aggregator.h"
|
||||
#include "components/device_signals/core/common/signals_constants.h"
|
||||
@@ -140,7 +140,7 @@ void UploadSecurityEventReport(base::Value::Dict event
|
||||
@@ -129,7 +129,7 @@ void UploadSecurityEventReport(base::Value::Dict event
|
||||
std::move(upload_callback));
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
void PopulateSignals(base::Value::Dict event,
|
||||
policy::CloudPolicyClient* client,
|
||||
std::string name,
|
||||
@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
|
||||
@@ -416,7 +416,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
|
||||
/*include_profile_user_name=*/false);
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
void AddCrowdstrikeSignalsToEvent(
|
||||
base::Value::Dict& event,
|
||||
@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
|
||||
@@ -475,7 +475,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
|
||||
if (include_profile_user_name) {
|
||||
event.Set(kKeyProfileUserName, GetProfileUserName());
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/BUILD.gn.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/extensions/BUILD.gn.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/extensions/BUILD.gn
|
||||
@@ -1372,6 +1372,10 @@ static_library("extensions") {
|
||||
@@ -1375,6 +1375,10 @@ static_library("extensions") {
|
||||
deps += [ "//chrome/services/printing/public/mojom" ]
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
||||
@@ -43,7 +43,7 @@
|
||||
#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
|
||||
#endif
|
||||
|
||||
@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
|
||||
@@ -115,7 +115,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
|
||||
extensions::SettingsPrivateEventRouterFactory::GetInstance();
|
||||
extensions::SettingsOverridesAPI::GetFactoryInstance();
|
||||
extensions::SidePanelService::GetFactoryInstance();
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
|
||||
@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
|
||||
@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
|
||||
}
|
||||
|
||||
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
@@ -199,7 +199,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
|
||||
settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
|
||||
settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
||||
#endif
|
||||
@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -207,7 +207,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
settings_api::PrefType::PREF_TYPE_STRING;
|
||||
(*s_allowlist)[::prefs::kPolicyThemeColor] =
|
||||
settings_api::PrefType::PREF_TYPE_NUMBER;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
|
||||
@@ -860,7 +860,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
|
||||
@@ -861,7 +861,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
|
||||
// ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as
|
||||
// minimized.
|
||||
// TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -924,7 +924,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
|
||||
@@ -919,7 +919,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
|
||||
RequestExtensionApproval(contents);
|
||||
return;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
@@ -314,7 +314,7 @@ const struct {
|
||||
@@ -324,7 +324,7 @@ const struct {
|
||||
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
|
||||
kDontBlockChildren},
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/flag_descriptions.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/flag_descriptions.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/flag_descriptions.cc
|
||||
@@ -2588,7 +2588,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
|
||||
@@ -2599,7 +2599,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
|
||||
const char kWebUIOmniboxPopupDescription[] =
|
||||
"If enabled, shows the omnibox suggestions popup in WebUI.";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
const char kWebUiSystemFontName[] = "WebUI System font";
|
||||
const char kWebUiSystemFontDescription[] =
|
||||
"If enabled, all WebUI surfaces will use the default UI font of the "
|
||||
@@ -7151,7 +7151,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
|
||||
@@ -7264,7 +7264,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
|
||||
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
|
||||
const char kGetAllScreensMediaDescription[] =
|
||||
"When enabled, the getAllScreensMedia API for capturing multiple screens "
|
||||
@@ -7366,7 +7366,7 @@ const char kSearchWebInSidePanelDescription[] =
|
||||
@@ -7481,7 +7481,7 @@ const char kSearchWebInSidePanelDescription[] =
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -27,7 +27,7 @@
|
||||
const char kQuickCommandsName[] = "Quick Commands";
|
||||
const char kQuickCommandsDescription[] =
|
||||
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
|
||||
@@ -7375,7 +7375,7 @@ const char kQuickCommandsDescription[] =
|
||||
@@ -7490,7 +7490,7 @@ const char kQuickCommandsDescription[] =
|
||||
// BUILDFLAG(IS_FUCHSIA)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -36,7 +36,7 @@
|
||||
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
|
||||
const char kFollowingFeedSidepanelDescription[] =
|
||||
"Enables the following feed in the sidepanel.";
|
||||
@@ -7390,7 +7390,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
|
||||
@@ -7505,7 +7505,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
|
||||
"instead of JSON.";
|
||||
#endif
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
const char kEnableNetworkServiceSandboxName[] =
|
||||
"Enable the network service sandbox.";
|
||||
const char kEnableNetworkServiceSandboxDescription[] =
|
||||
@@ -7414,7 +7414,7 @@ const char kWebShareDescription[] =
|
||||
@@ -7529,7 +7529,7 @@ const char kWebShareDescription[] =
|
||||
"platforms.";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
const char kOzonePlatformHintChoiceDefault[] = "Default";
|
||||
const char kOzonePlatformHintChoiceAuto[] = "Auto";
|
||||
const char kOzonePlatformHintChoiceX11[] = "X11";
|
||||
@@ -7434,7 +7434,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
@@ -7549,7 +7549,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
|
||||
"Bluetooth";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
const char kSkipUndecryptablePasswordsName[] =
|
||||
"Skip undecryptable passwords to use the available decryptable "
|
||||
"passwords.";
|
||||
@@ -7448,7 +7448,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
|
||||
@@ -7563,7 +7563,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
|
||||
"storage and requests initial sync.";
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
|
||||
@ -72,7 +72,7 @@
|
||||
const char kAsyncDnsName[] = "Async DNS resolver";
|
||||
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
@@ -7555,7 +7555,7 @@ const char kElasticOverscrollDescription[] =
|
||||
@@ -7662,7 +7662,7 @@ const char kElasticOverscrollDescription[] =
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -81,7 +81,7 @@
|
||||
const char kUIDebugToolsName[] = "Debugging tools for UI";
|
||||
const char kUIDebugToolsDescription[] =
|
||||
"Enables additional keyboard shortcuts to help debugging.";
|
||||
@@ -7567,7 +7567,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
|
||||
@@ -7674,7 +7674,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
|
||||
@ -90,7 +90,7 @@
|
||||
const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
|
||||
"Data Retention Policies Disable Sync Types";
|
||||
const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
|
||||
@@ -7612,7 +7612,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
|
||||
@@ -7719,7 +7719,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
|
||||
"any one time. Requires #enable-media-session-service to be enabled too.";
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/flag_descriptions.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/flag_descriptions.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/flag_descriptions.h
|
||||
@@ -1472,7 +1472,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit
|
||||
@@ -1485,7 +1485,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit
|
||||
extern const char kWebUIOmniboxPopupName[];
|
||||
extern const char kWebUIOmniboxPopupDescription[];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
extern const char kWebUiSystemFontName[];
|
||||
extern const char kWebUiSystemFontDescription[];
|
||||
#endif
|
||||
@@ -4103,7 +4103,7 @@ extern const char kLacrosMergeIcuDataFileName[];
|
||||
@@ -4172,7 +4172,7 @@ extern const char kLacrosMergeIcuDataFileName[];
|
||||
extern const char kLacrosMergeIcuDataFileDescription[];
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
extern const char kGetAllScreensMediaName[];
|
||||
extern const char kGetAllScreensMediaDescription[];
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
@@ -4233,14 +4233,14 @@ extern const char kSearchWebInSidePanelDescription[];
|
||||
@@ -4302,14 +4302,14 @@ extern const char kSearchWebInSidePanelDescription[];
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -35,7 +35,7 @@
|
||||
extern const char kWebShareName[];
|
||||
extern const char kWebShareDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
||||
@@ -4250,7 +4250,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
||||
@@ -4319,7 +4319,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
||||
extern const char kWebBluetoothConfirmPairingSupportDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
extern const char kOzonePlatformHintChoiceDefault[];
|
||||
extern const char kOzonePlatformHintChoiceAuto[];
|
||||
extern const char kOzonePlatformHintChoiceX11[];
|
||||
@@ -4260,7 +4260,7 @@ extern const char kOzonePlatformHintName[];
|
||||
@@ -4329,7 +4329,7 @@ extern const char kOzonePlatformHintName[];
|
||||
extern const char kOzonePlatformHintDescription[];
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
extern const char kSkipUndecryptablePasswordsName[];
|
||||
extern const char kSkipUndecryptablePasswordsDescription[];
|
||||
|
||||
@@ -4268,13 +4268,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
|
||||
@@ -4337,13 +4337,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
|
||||
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
extern const char kFollowingFeedSidepanelName[];
|
||||
extern const char kFollowingFeedSidepanelDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
@@ -4285,7 +4285,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
|
||||
@@ -4354,7 +4354,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
|
||||
extern const char kEnableProtoApiForClassifyUrlDescription[];
|
||||
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
extern const char kEnableNetworkServiceSandboxName[];
|
||||
extern const char kEnableNetworkServiceSandboxDescription[];
|
||||
|
||||
@@ -4367,7 +4367,7 @@ extern const char kElasticOverscrollDescription[];
|
||||
@@ -4431,7 +4431,7 @@ extern const char kElasticOverscrollDescription[];
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || \
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -87,7 +87,7 @@
|
||||
extern const char kUIDebugToolsName[];
|
||||
extern const char kUIDebugToolsDescription[];
|
||||
|
||||
@@ -4376,7 +4376,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe
|
||||
@@ -4440,7 +4440,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
|
||||
@ -96,7 +96,7 @@
|
||||
extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
|
||||
extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
|
||||
#endif
|
||||
@@ -4403,7 +4403,7 @@ extern const char kEnableAudioFocusEnforcementName[];
|
||||
@@ -4467,7 +4467,7 @@ extern const char kEnableAudioFocusEnforcementName[];
|
||||
extern const char kEnableAudioFocusEnforcementDescription[];
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
@ -1,26 +1,20 @@
|
||||
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/headless/headless_mode_util.cc
|
||||
@@ -10,12 +10,12 @@
|
||||
// New headless mode is available on Linux, Windows and Mac platforms.
|
||||
// More platforms will be added later, so avoid function level clutter
|
||||
// by providing stub implementations at the end of the file.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
|
||||
#include "base/base_switches.h"
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "ui/gl/gl_switches.h" // nogncheck
|
||||
#include "ui/ozone/public/ozone_switches.h" // nogncheck
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
@@ -73,7 +73,7 @@ void SetUpCommandLine(const base::CommandLine* command
|
||||
::switches::kNoErrorDialogs);
|
||||
}
|
||||
@@ -81,7 +81,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
|
||||
command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir());
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// Headless mode on Linux relies on ozone/headless platform.
|
||||
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
|
||||
::switches::kOzonePlatform, switches::kHeadless);
|
||||
command_line->AppendSwitchASCII(::switches::kOzonePlatform,
|
||||
switches::kHeadless);
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-24 14:27:53 UTC
|
||||
--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
|
||||
@@ -21,7 +21,7 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -36,9 +36,9 @@
|
||||
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
|
||||
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
|
||||
g_desktop_capturer_for_testing.Get() = std::move(capturer);
|
||||
@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
|
||||
@@ -142,7 +142,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
|
||||
ScreensCallback screens_callback) const {
|
||||
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
||||
DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
@@ -78,8 +78,10 @@
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
shell_integration::DefaultWebClientState default_state =
|
||||
shell_integration::GetDefaultBrowser();
|
||||
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
|
||||
@@ -1227,11 +1229,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
|
||||
@@ -1239,11 +1241,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -183,7 +183,7 @@
|
||||
@@ -184,7 +184,7 @@
|
||||
#include "chrome/notification_helper/notification_helper_constants.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "components/metrics/motherboard_metrics_provider.h"
|
||||
#endif
|
||||
|
||||
@@ -209,7 +209,7 @@
|
||||
@@ -210,7 +210,7 @@
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -18,7 +18,7 @@
|
||||
#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
|
||||
@@ -809,7 +809,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -810,7 +810,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<metrics::CPUMetricsProvider>());
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<metrics::MotherboardMetricsProvider>());
|
||||
#endif
|
||||
@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -892,7 +892,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -36,7 +36,7 @@
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
|
||||
@@ -1007,7 +1007,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -1011,7 +1011,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
std::make_unique<PowerMetricsProvider>());
|
||||
#endif
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
metrics::CreateDesktopSessionMetricsProvider());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
|
||||
@@ -1206,7 +1206,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
@@ -1210,7 +1210,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
#endif
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -92,7 +92,7 @@
|
||||
|
||||
@ -7,9 +7,27 @@
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/common/chrome_paths_internal.h"
|
||||
#include "chrome/grit/chromium_strings.h"
|
||||
#include "chrome/grit/branded_strings.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
@@ -183,7 +183,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
@@ -136,7 +136,7 @@ SystemNetworkContextManager* g_system_network_context_
|
||||
// received a failed launch for a sandboxed network service.
|
||||
bool g_previously_failed_to_launch_sandboxed_service = false;
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// Whether kerberos library loading will work in the network service due to the
|
||||
// sandbox.
|
||||
bool g_network_service_will_allow_gssapi_library_load = false;
|
||||
@@ -144,7 +144,7 @@ bool g_network_service_will_allow_gssapi_library_load
|
||||
const char* kGssapiDesiredPref =
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
prefs::kKerberosEnabled;
|
||||
-#elif BUILDFLAG(IS_LINUX)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
prefs::kReceivedHttpAuthNegotiateHeader;
|
||||
#endif
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
@@ -190,7 +190,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
auth_dynamic_params->basic_over_http_enabled =
|
||||
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
|
||||
|
||||
@ -18,7 +36,25 @@
|
||||
auth_dynamic_params->delegate_by_kdc_policy =
|
||||
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -241,7 +241,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
|
||||
@@ -205,7 +205,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
auth_dynamic_params->allow_gssapi_library_load =
|
||||
local_state->GetBoolean(kGssapiDesiredPref);
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
|
||||
void OnNewHttpAuthDynamicParams(
|
||||
network::mojom::HttpAuthDynamicParamsPtr& params) {
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// The kerberos library is incompatible with the network service sandbox, so
|
||||
// if library loading is now enabled, the network service needs to be
|
||||
// restarted. It will be restarted unsandboxed because is
|
||||
@@ -257,11 +257,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
|
||||
if (g_previously_failed_to_launch_sandboxed_service) {
|
||||
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
|
||||
}
|
||||
@ -27,7 +63,12 @@
|
||||
auto* local_state = g_browser_process->local_state();
|
||||
#endif
|
||||
|
||||
@@ -262,7 +262,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
|
||||
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// The network service sandbox and the kerberos library are incompatible.
|
||||
// If kerberos is enabled by policy, disable the network service sandbox.
|
||||
if (g_network_service_will_allow_gssapi_library_load ||
|
||||
@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
|
||||
}
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@ -36,7 +77,7 @@
|
||||
if (local_state &&
|
||||
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
|
||||
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
|
||||
@@ -457,7 +457,7 @@ void SystemNetworkContextManager::DeleteInstance() {
|
||||
@@ -473,7 +473,7 @@ void SystemNetworkContextManager::DeleteInstance() {
|
||||
g_system_network_context_manager = nullptr;
|
||||
}
|
||||
|
||||
@ -45,7 +86,7 @@
|
||||
SystemNetworkContextManager::GssapiLibraryLoadObserver::
|
||||
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
|
||||
: owner_(owner) {}
|
||||
@@ -515,7 +515,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
@@ -531,7 +531,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
|
||||
auth_pref_callback);
|
||||
|
||||
@ -54,7 +95,7 @@
|
||||
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
auth_pref_callback);
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -562,7 +562,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
@@ -578,7 +578,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -63,7 +104,7 @@
|
||||
pref_change_registrar_.Add(
|
||||
prefs::kEnforceLocalAnchorConstraintsEnabled,
|
||||
base::BindRepeating(&SystemNetworkContextManager::
|
||||
@@ -611,7 +611,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
@@ -627,7 +627,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@ -72,7 +113,7 @@
|
||||
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
false);
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -640,7 +640,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
|
||||
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -81,7 +122,7 @@
|
||||
// Note that the default value is not relevant because the pref is only
|
||||
// evaluated when it is managed.
|
||||
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
|
||||
@@ -649,11 +649,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
@@ -665,11 +665,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
|
||||
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
|
||||
|
||||
@ -94,8 +135,8 @@
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
}
|
||||
@@ -702,7 +702,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
|
||||
|
||||
@@ -720,7 +720,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
|
||||
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
|
||||
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
|
||||
|
||||
@ -104,7 +145,7 @@
|
||||
gssapi_library_loader_observer_.Install(network_service);
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -1009,7 +1009,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
|
||||
@@ -1028,7 +1028,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
|
||||
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,12 +1,13 @@
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -214,17 +214,17 @@
|
||||
@@ -218,19 +218,20 @@
|
||||
#include "components/spellcheck/browser/pref_names.h"
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/enterprise/idle/action.h"
|
||||
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
|
||||
#include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -16,12 +17,14 @@
|
||||
#include "components/enterprise/idle/idle_timeout_policy_handler.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
|
||||
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || \
|
||||
+ BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
@@ -811,7 +811,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
|
||||
@@ -816,7 +817,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kManagedDefaultGeolocationSetting,
|
||||
base::Value::Type::INTEGER },
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
|
||||
@ -30,7 +33,7 @@
|
||||
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
|
||||
prefs::kCertRevocationCheckingRequiredLocalAnchors,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -821,7 +821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -826,7 +827,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
|
||||
@ -39,7 +42,7 @@
|
||||
{ key::kFullscreenAllowed,
|
||||
prefs::kFullscreenAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1532,7 +1532,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1546,7 +1547,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::INTEGER },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -48,7 +51,7 @@
|
||||
{ key::kGSSAPILibraryName,
|
||||
prefs::kGSSAPILibraryName,
|
||||
base::Value::Type::STRING },
|
||||
@@ -1580,7 +1580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1588,7 +1589,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
@ -57,7 +60,7 @@
|
||||
{ key::kNetworkServiceSandboxEnabled,
|
||||
prefs::kNetworkServiceSandboxEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1606,12 +1606,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1614,12 +1615,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kTotalMemoryLimitMb,
|
||||
base::Value::Type::INTEGER },
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
|
||||
@ -72,7 +75,7 @@
|
||||
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
|
||||
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1620,7 +1620,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1628,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::LIST },
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
|
||||
@ -81,7 +84,7 @@
|
||||
{ key::kDefaultBrowserSettingEnabled,
|
||||
prefs::kDefaultBrowserSettingEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1633,7 +1633,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1641,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
// || BUILDFLAG(IS_FUCHSIA)
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
|
||||
@ -90,7 +93,7 @@
|
||||
{ key::kAutoplayAllowed,
|
||||
prefs::kAutoplayAllowed,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1737,7 +1737,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1745,7 +1746,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@ -99,7 +102,7 @@
|
||||
{ key::kAlternativeBrowserPath,
|
||||
browser_switcher::prefs::kAlternativeBrowserPath,
|
||||
base::Value::Type::STRING },
|
||||
@@ -1833,7 +1833,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1841,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@ -108,7 +111,7 @@
|
||||
// TODO(crbug.com/1454054): replace the
|
||||
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
|
||||
// matches the name of the new `getAllScreensMedia` API.
|
||||
@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1850,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::LIST },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@ -117,7 +120,7 @@
|
||||
{ key::kAuthNegotiateDelegateByKdcPolicy,
|
||||
prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1873,7 +1873,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1881,7 +1882,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -126,7 +129,7 @@
|
||||
{ key::kEnforceLocalAnchorConstraintsEnabled,
|
||||
prefs::kEnforceLocalAnchorConstraintsEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1952,7 +1952,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1957,7 +1958,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
ash::prefs::kUrlParameterToAutofillSAMLUsername,
|
||||
base::Value::Type::STRING },
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -135,7 +138,7 @@
|
||||
{ key::kBatterySaverModeAvailability,
|
||||
performance_manager::user_tuning::prefs::kBatterySaverModeState,
|
||||
base::Value::Type::INTEGER },
|
||||
@@ -1983,7 +1983,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1988,7 +1989,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
prefs::kCloudApAuthEnabled,
|
||||
base::Value::Type::INTEGER },
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
@ -144,7 +147,7 @@
|
||||
{ key::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
prefs::kOutOfProcessSystemDnsResolutionEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -2097,7 +2097,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2112,7 +2113,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
// Policies for all platforms - End
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -153,7 +156,7 @@
|
||||
handlers->AddHandler(
|
||||
std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2314,7 +2315,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -162,7 +165,7 @@
|
||||
handlers->AddHandler(
|
||||
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
@@ -2357,7 +2357,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2372,7 +2373,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
|
||||
chrome_schema));
|
||||
|
||||
@ -171,7 +174,7 @@
|
||||
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
|
||||
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
@@ -2413,7 +2413,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2433,7 +2434,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
|
||||
signin_legacy_policies;
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
|
||||
@ -180,7 +183,7 @@
|
||||
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
|
||||
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
|
||||
base::Value::Type::BOOLEAN));
|
||||
@@ -2774,7 +2774,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2795,7 +2796,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
@ -189,7 +192,7 @@
|
||||
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
|
||||
handlers->AddHandler(
|
||||
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
|
||||
@@ -2782,7 +2782,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2803,7 +2804,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
@ -198,7 +201,7 @@
|
||||
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
|
||||
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
|
||||
base::Value::Type::BOOLEAN));
|
||||
@@ -2795,7 +2795,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2816,7 +2817,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
handlers->AddHandler(
|
||||
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
|
||||
chrome_schema));
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -478,13 +478,13 @@
|
||||
@@ -485,18 +485,18 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -16,7 +16,13 @@
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
|
||||
#endif
|
||||
@@ -517,7 +517,7 @@
|
||||
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
|
||||
#endif
|
||||
|
||||
@@ -528,7 +528,7 @@
|
||||
#include "chrome/browser/sessions/session_service_log.h"
|
||||
#endif
|
||||
|
||||
@ -25,7 +31,7 @@
|
||||
#include "ui/color/system_theme.h"
|
||||
#endif
|
||||
|
||||
@@ -662,7 +662,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
|
||||
@@ -674,7 +674,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
|
||||
const char kPluginsShowDetails[] = "plugins.show_details";
|
||||
|
||||
// Deprecated 02/2023.
|
||||
@ -34,7 +40,7 @@
|
||||
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -948,7 +948,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
|
||||
@@ -995,7 +995,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
// Deprecated 02/2023.
|
||||
@ -43,7 +49,7 @@
|
||||
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -1863,12 +1863,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
@@ -1950,12 +1950,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -56,9 +62,9 @@
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
|
||||
enterprise_signin::RegisterProfilePrefs(registry);
|
||||
#endif
|
||||
|
||||
@@ -2018,7 +2018,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
|
||||
@@ -2110,7 +2110,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
// Added 02/2023
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/printing/printer_query.cc.orig 2023-07-24 14:27:53 UTC
|
||||
--- chrome/browser/printing/printer_query.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/printing/printer_query.cc
|
||||
@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
|
||||
@@ -339,7 +339,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
|
||||
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
|
||||
print_backend->GetPrinterDriverInfo(printer_name));
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -385,18 +385,18 @@
|
||||
@@ -393,18 +393,18 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -22,7 +22,7 @@
|
||||
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
|
||||
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
|
||||
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
|
||||
@@ -596,7 +596,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -607,7 +607,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
if (breadcrumbs::IsEnabled()) {
|
||||
BreadcrumbManagerKeyedServiceFactory::GetInstance();
|
||||
}
|
||||
@ -31,9 +31,9 @@
|
||||
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
|
||||
#endif
|
||||
browser_sync::UserEventServiceFactory::GetInstance();
|
||||
@@ -689,26 +689,26 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -707,29 +707,29 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
|
||||
#endif
|
||||
enterprise::ProfileIdServiceFactory::GetInstance();
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
||||
@ -62,8 +62,12 @@
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
|
||||
enterprise_signals::UserPermissionServiceFactory::GetInstance();
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
|
||||
@@ -817,7 +817,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -844,7 +844,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#endif
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -72,7 +76,7 @@
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -912,7 +912,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -940,7 +940,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
policy::PolicyCertServiceFactory::GetInstance();
|
||||
#endif
|
||||
@ -81,7 +85,7 @@
|
||||
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
|
||||
#endif
|
||||
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
|
||||
@@ -953,7 +953,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -981,7 +981,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
ProfileThemeUpdateServiceFactory::GetInstance();
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/renderer_preferences_util.cc.orig 2023-07-24 14:27:53 UTC
|
||||
--- chrome/browser/renderer_preferences_util.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/renderer_preferences_util.cc
|
||||
@@ -36,7 +36,7 @@
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "ui/views/controls/textfield/textfield.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/themes/theme_service.h"
|
||||
#include "chrome/browser/themes/theme_service_factory.h"
|
||||
#include "ui/linux/linux_ui.h"
|
||||
@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
|
||||
@@ -152,7 +152,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
|
||||
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
|
||||
#endif
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
|
||||
if (linux_ui_theme) {
|
||||
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
|
||||
@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
|
||||
@@ -175,7 +175,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/resources/settings/route.ts.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/resources/settings/route.ts.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/resources/settings/route.ts
|
||||
@@ -236,7 +236,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
|
||||
@@ -240,7 +240,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
|
||||
r.ACCESSIBILITY = r.ADVANCED.createSection(
|
||||
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/signin/signin_util.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/signin/signin_util.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/signin/signin_util.cc
|
||||
@@ -74,7 +74,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
|
||||
@@ -75,7 +75,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
|
||||
CookiesMover::~CookiesMover() = default;
|
||||
|
||||
void CookiesMover::StartMovingCookies() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/sync/sync_service_factory.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/sync/sync_service_factory.cc
|
||||
@@ -82,7 +82,7 @@
|
||||
@@ -81,7 +81,7 @@
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
|
||||
// BUILDFLAG(IS_WIN)
|
||||
@@ -131,7 +131,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
@@ -126,7 +126,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
|
||||
// included in lacros-chrome once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
@ -18,7 +18,7 @@
|
||||
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
syncer::SyncPrefs prefs(profile->GetPrefs());
|
||||
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
|
||||
@@ -256,7 +256,7 @@ SyncServiceFactory::SyncServiceFactory()
|
||||
@@ -252,7 +252,7 @@ SyncServiceFactory::SyncServiceFactory()
|
||||
DependsOn(PasswordStoreFactory::GetInstance());
|
||||
DependsOn(PowerBookmarkServiceFactory::GetInstance());
|
||||
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/themes/theme_service.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/themes/theme_service.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/themes/theme_service.cc
|
||||
@@ -74,7 +74,7 @@
|
||||
@@ -75,7 +75,7 @@
|
||||
#include "extensions/browser/extension_registry_observer.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "ui/linux/linux_ui.h"
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#endif
|
||||
@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
|
||||
@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
|
||||
}
|
||||
|
||||
bool ThemeService::ShouldUseCustomFrame() const {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/actions/chrome_action_id.h
|
||||
@@ -532,7 +532,7 @@
|
||||
@@ -542,7 +542,7 @@
|
||||
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
|
||||
E(kActionContentContextQuickAnswersInlineQuery, \
|
||||
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- chrome/browser/ui/browser.h.orig 2023-04-22 17:45:15 UTC
|
||||
--- chrome/browser/ui/browser.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/browser.h
|
||||
@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver,
|
||||
int32_t restore_id = kDefaultRestoreId;
|
||||
@@ -293,7 +293,7 @@ class Browser : public TabStripModelObserver,
|
||||
absl::optional<int64_t> display_id;
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -124,7 +124,7 @@
|
||||
@@ -125,7 +125,7 @@
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "ui/linux/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -305,7 +305,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
@@ -306,7 +306,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
// If this key was registered by the user as a content editing hotkey, then
|
||||
// it is not reserved.
|
||||
auto* linux_ui = ui::LinuxUi::instance();
|
||||
@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -557,7 +557,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;
|
||||
@@ -568,7 +568,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -569,7 +569,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
break;
|
||||
#endif
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
case IDC_USE_SYSTEM_TITLE_BAR: {
|
||||
PrefService* prefs = profile()->GetPrefs();
|
||||
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
|
||||
@@ -1211,12 +1211,12 @@ void BrowserCommandController::InitCommandState() {
|
||||
@@ -1215,12 +1215,12 @@ void BrowserCommandController::InitCommandState() {
|
||||
#endif
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
29
www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h
Normal file
29
www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h
Normal file
@ -0,0 +1,29 @@
|
||||
--- chrome/browser/ui/browser_dialogs.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/browser_dialogs.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "ui/gfx/native_widget_types.h"
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
#include "chrome/browser/web_applications/web_app_callback_app_identity.h"
|
||||
#include "chrome/browser/web_applications/web_app_id.h"
|
||||
#include "chrome/browser/web_applications/web_app_install_info.h"
|
||||
@@ -84,7 +84,7 @@ class Widget;
|
||||
} // namespace views
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
namespace webapps {
|
||||
class MlInstallOperationTracker;
|
||||
struct Screenshot;
|
||||
@@ -162,7 +162,7 @@ void ShowBluetoothDevicePairConfirmDialog(
|
||||
#endif // PAIR_BLUETOOTH_ON_DEMAND()
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
// Callback used to indicate whether a user has accepted the installation of a
|
||||
// web app. The boolean parameter is true when the user accepts the dialog. The
|
||||
// WebAppInstallInfo parameter contains the information about the app,
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/chrome_pages.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/chrome_pages.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/chrome_pages.cc
|
||||
@@ -78,7 +78,7 @@
|
||||
@@ -79,7 +79,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/web_applications/web_app_utils.h"
|
||||
#endif
|
||||
|
||||
@@ -668,7 +668,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
@@ -674,7 +674,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/chrome_pages.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/chrome_pages.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/chrome_pages.h
|
||||
@@ -38,7 +38,7 @@ enum class ConsentLevel;
|
||||
} // namespace signin
|
||||
@ -9,7 +9,7 @@
|
||||
namespace web_app {
|
||||
enum class AppSettingsPageEntryPoint;
|
||||
} // namespace web_app
|
||||
@@ -249,7 +249,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
@@ -250,7 +250,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2022-03-28 18:11:04 UTC
|
||||
--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
|
||||
@@ -16,7 +16,7 @@
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
// NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
|
||||
// here.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
|
||||
@@ -1961,7 +1961,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
|
||||
@@ -1981,7 +1981,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
|
||||
OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
|
||||
? omnibox::kShareWinChromeRefreshIcon
|
||||
: omnibox::kShareWinIcon;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -100,7 +100,7 @@ const char* const kBadFlags[] = {
|
||||
@@ -104,7 +104,7 @@ const char* const kBadFlags[] = {
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
@@ -133,7 +133,7 @@
|
||||
#include "chrome/credential_provider/common/gcp_strings.h"
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/headless/headless_mode_util.h"
|
||||
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
|
||||
#include "components/headless/policy/headless_mode_policy.h"
|
||||
@@ -921,7 +921,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -925,7 +925,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
|
||||
ComputeAndRecordLaunchMode(command_line);
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
if (headless::IsHeadlessMode() &&
|
||||
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
|
||||
g_browser_process->local_state())) {
|
||||
@@ -1025,7 +1025,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -1029,7 +1029,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
silent_launch = true;
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
// Writes open and installed web apps to the specified file without
|
||||
// launching a new browser window or tab.
|
||||
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
|
||||
@@ -1238,7 +1238,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -1242,7 +1242,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
|
||||
<< "Failed launch with app: couldn't pick a profile";
|
||||
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/tab_helpers.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/tab_helpers.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/tab_helpers.cc
|
||||
@@ -221,7 +221,7 @@
|
||||
@@ -224,7 +224,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
#include "chrome/browser/ui/hats/hats_helper.h"
|
||||
@@ -610,12 +610,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
@@ -629,12 +629,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/ui_features.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/ui_features.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/ui_features.cc
|
||||
@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
|
||||
@@ -311,7 +311,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
|
||||
"TopChromeWebUIUsesSpareRenderer",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/ui_features.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/ui_features.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/ui_features.h
|
||||
@@ -194,7 +194,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
|
||||
@@ -195,7 +195,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
|
||||
|
||||
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/accelerator_table.cc
|
||||
@@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
|
||||
@ -23,7 +23,7 @@
|
||||
{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
|
||||
{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
|
||||
{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
|
||||
@@ -149,7 +149,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
IDC_SHOW_AVATAR_MENU},
|
||||
|
||||
// Platform-specific key maps.
|
||||
@ -32,7 +32,7 @@
|
||||
{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},
|
||||
@@ -244,7 +244,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
@@ -249,7 +249,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
#endif // !BUILDFLAG(IS_CHROMEOS)
|
||||
#endif // !BUILDFLAG(IS_MAC)
|
||||
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
|
||||
|
@ -1,20 +1,20 @@
|
||||
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2022-03-28 18:11:04 UTC
|
||||
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "ui/wm/core/wm_state.h"
|
||||
#endif // defined(USE_AURA)
|
||||
|
||||
// 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)
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
return controller;
|
||||
}));
|
||||
|
||||
// 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)
|
||||
// On the Linux desktop, we want to prevent the user from logging in as root,
|
||||
// so that we don't destroy the profile. Now that we have some minimal ui
|
||||
// initialized, check to see if we're running as root and bail if we are.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -2106,7 +2106,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
|
||||
@@ -2134,7 +2134,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.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
@@ -54,7 +54,7 @@
|
||||
#include "ui/views/window/vector_icons/vector_icons.h"
|
||||
@ -9,7 +9,7 @@
|
||||
#include "ui/views/controls/menu/menu_runner.h"
|
||||
#endif
|
||||
|
||||
@@ -568,7 +568,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
|
||||
@@ -566,7 +566,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
|
||||
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -18,7 +18,7 @@
|
||||
return FrameButtonStyle::kMdButton;
|
||||
#else
|
||||
return FrameButtonStyle::kImageButton;
|
||||
@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
|
||||
@@ -589,7 +589,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
|
||||
return frame()->tiled_edges();
|
||||
}
|
||||
@@ -789,7 +789,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
|
||||
@@ -787,7 +787,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
|
||||
}
|
||||
|
||||
void OpaqueBrowserFrameView::WindowIconPressed() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
|
||||
@@ -116,7 +116,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
|
||||
@@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
|
||||
const gfx::Rect& bounding_rect) const override;
|
||||
bool IsTranslucentWindowOpacitySupported() const override;
|
||||
bool ShouldDrawRestoredFrameShadow() const override;
|
||||
@ -9,7 +9,7 @@
|
||||
ui::WindowTiledEdges GetTiledEdges() const override;
|
||||
#endif
|
||||
int WebAppButtonHeight() const override;
|
||||
@@ -233,7 +233,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
|
||||
@@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
|
||||
// Background painter for the window frame.
|
||||
std::unique_ptr<views::FrameBackground> frame_background_;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
|
||||
@@ -53,7 +53,7 @@
|
||||
@@ -55,7 +55,7 @@
|
||||
#include "ui/aura/window.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
|
||||
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
|
||||
#endif
|
||||
@@ -80,7 +80,7 @@ constexpr int kBackToTabImageSize = 16;
|
||||
@@ -82,7 +82,7 @@ constexpr int kBackToTabImageSize = 16;
|
||||
// The height of the controls bar at the top of the window.
|
||||
constexpr int kTopControlsHeight = 30;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
// Frame border when window shadow is not drawn.
|
||||
constexpr int kFrameBorderThickness = 4;
|
||||
#endif
|
||||
@@ -175,7 +175,7 @@ class WindowEventObserver : public ui::EventObserver {
|
||||
@@ -177,7 +177,7 @@ class WindowEventObserver : public ui::EventObserver {
|
||||
|
||||
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
|
||||
|
||||
@ -27,16 +27,16 @@
|
||||
// Calculate input bounds for Linux. This is needed because the input bounds
|
||||
// is not necessary the same as the local bounds on Linux.
|
||||
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
|
||||
@@ -534,7 +534,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
|
||||
@@ -558,7 +558,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
|
||||
AddChildView(std::move(auto_pip_setting_overlay));
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
frame_background_ = std::make_unique<views::FrameBackground>();
|
||||
#endif
|
||||
|
||||
@@ -709,7 +709,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
|
||||
@@ -734,7 +734,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
|
||||
for (ContentSettingImageView* view : content_setting_views_)
|
||||
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
// On Linux the top bar background will be drawn in OnPaint().
|
||||
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
|
||||
color_provider->GetColor(kColorPipWindowTopBarBackground)));
|
||||
@@ -772,7 +772,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
|
||||
@@ -803,7 +803,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
|
||||
BrowserNonClientFrameView::RemovedFromWidget();
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
|
||||
const {
|
||||
auto border = FrameBorderInsets();
|
||||
@@ -1016,7 +1016,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
|
||||
@@ -1052,7 +1052,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
|
||||
// views::View implementations:
|
||||
|
||||
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
|
||||
@ -63,7 +63,7 @@
|
||||
// Draw the PiP window frame borders and shadows, including the top bar
|
||||
// background.
|
||||
if (window_frame_provider_) {
|
||||
@@ -1140,7 +1140,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
|
||||
@@ -1176,7 +1176,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
|
||||
}
|
||||
|
||||
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
|
||||
@ -72,7 +72,7 @@
|
||||
if (window_frame_provider_) {
|
||||
const auto insets = window_frame_provider_->GetFrameThicknessDip();
|
||||
const auto tiled_edges = frame()->tiled_edges();
|
||||
@@ -1161,7 +1161,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
|
||||
@@ -1197,7 +1197,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
|
||||
}
|
||||
|
||||
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
|
||||
@ -81,7 +81,7 @@
|
||||
return FrameBorderInsets();
|
||||
#elif BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
return gfx::Insets(chromeos::kResizeInsideBoundsSize);
|
||||
@@ -1182,7 +1182,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
|
||||
@@ -1218,7 +1218,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
|
||||
top_height + border_thickness.bottom());
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "ui/views/controls/image_view.h"
|
||||
@ -27,7 +27,7 @@
|
||||
gfx::Insets MirroredFrameBorderInsets() const override;
|
||||
gfx::Insets GetInputInsets() const override;
|
||||
SkRRect GetRestoredClipRegion() const override;
|
||||
@@ -186,7 +186,7 @@ class PictureInPictureBrowserFrameView
|
||||
@@ -188,7 +188,7 @@ class PictureInPictureBrowserFrameView
|
||||
// Called when mouse entered or exited the pip window.
|
||||
void OnMouseEnteredOrExitedWindow(bool entered);
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
// Sets the window frame provider so that it will be used for drawing.
|
||||
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
|
||||
|
||||
@@ -349,7 +349,7 @@ class PictureInPictureBrowserFrameView
|
||||
@@ -355,7 +355,7 @@ class PictureInPictureBrowserFrameView
|
||||
// `top_bar_color_animation_`.
|
||||
absl::optional<SkColor> current_foreground_color_;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
|
||||
@@ -170,7 +170,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
|
||||
@@ -195,7 +195,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc
|
||||
@@ -89,7 +89,7 @@ void DiceWebSigninInterceptionBackdropLayer::DrawDarkB
|
||||
// The dark layer should be drawn on top of this region, but it's not easily
|
||||
// accessible in code, and requires specific implementations.
|
||||
// After the 2023 refresh, this drag area no longer exists.
|
||||
-#if BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// On linux, the drag area is accessible through the
|
||||
// `MirroredFrameBorderInsets()` function, which crashes on non-Linux
|
||||
// platforms.
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
|
||||
@@ -53,7 +53,7 @@ namespace {
|
||||
@@ -56,7 +56,7 @@ namespace {
|
||||
|
||||
const int kModalDialogWidth = 448;
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -9,7 +9,7 @@
|
||||
const int kEnterpriseConfirmationDialogWidth = 512;
|
||||
const int kEnterpriseConfirmationDialogHeight = 576;
|
||||
#endif
|
||||
@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
|
||||
@@ -182,7 +182,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
|
||||
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
@ -18,7 +18,25 @@
|
||||
// static
|
||||
std::unique_ptr<views::WebView>
|
||||
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
|
||||
@@ -454,7 +454,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
|
||||
@@ -327,7 +327,7 @@ SigninViewControllerDelegateViews::SigninViewControlle
|
||||
SetButtons(ui::DIALOG_BUTTON_NONE);
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
// On the local profile creation dialog, cancelling the dialog (for instance
|
||||
// through the VKEY_ESCAPE accelerator) should delete the profile.
|
||||
if (delete_profile_on_cancel) {
|
||||
@@ -417,7 +417,7 @@ void SigninViewControllerDelegateViews::DisplayModal()
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
void SigninViewControllerDelegateViews::DeleteProfileOnCancel() {
|
||||
ProfileAttributesEntry* entry =
|
||||
g_browser_process->profile_manager()
|
||||
@@ -490,7 +490,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
|
||||
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
|
||||
@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
|
||||
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@ -9,3 +9,12 @@
|
||||
static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView(
|
||||
Browser* browser,
|
||||
const AccountInfo& account_info,
|
||||
@@ -137,7 +137,7 @@ class SigninViewControllerDelegateViews
|
||||
InitializeSigninWebDialogUI initialize_signin_web_dialog_ui);
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
// Deletes the ephemeral profile when cancelling the local profile creation
|
||||
// dialog.
|
||||
void DeleteProfileOnCancel();
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/tab_search_bubble_host.cc
|
||||
@@ -184,7 +184,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
|
||||
@@ -186,7 +186,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
|
||||
// Mac should have tabsearch on the right side. Windows >= Win10 has the
|
||||
// Tab Search button as a FrameCaptionButton, but it still needs to be on the
|
||||
// left if it exists.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -605,7 +605,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
|
||||
@@ -610,7 +610,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
|
||||
if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
|
||||
return;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
@@ -89,7 +89,7 @@
|
||||
@@ -91,7 +91,7 @@
|
||||
#include "components/remote_cocoa/browser/window.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "ui/aura/client/drag_drop_client.h"
|
||||
#endif
|
||||
|
||||
@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
|
||||
@@ -208,7 +208,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
|
||||
|
||||
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
|
||||
const gfx::ImageSkia& image) {
|
||||
@ -18,7 +18,7 @@
|
||||
aura::Window* root_window =
|
||||
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
|
||||
if (aura::client::GetDragDropClient(root_window)) {
|
||||
@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co
|
||||
@@ -388,7 +388,7 @@ void TabDragController::Init(TabDragContext* source_co
|
||||
// synchronous on desktop Linux, so use that.
|
||||
// - ChromeOS Ash
|
||||
// Releasing capture on Ash cancels gestures so avoid it.
|
||||
@ -27,7 +27,7 @@
|
||||
can_release_capture_ = false;
|
||||
#endif
|
||||
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
|
||||
@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
|
||||
@@ -1013,7 +1013,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -36,7 +36,7 @@
|
||||
// EndMoveLoop is going to snap the window back to its original location.
|
||||
// Hide it so users don't see this. Hiding a window in Linux aura causes
|
||||
// it to lose capture so skip it.
|
||||
@@ -2051,7 +2051,7 @@ void TabDragController::CompleteDrag() {
|
||||
@@ -2053,7 +2053,7 @@ void TabDragController::CompleteDrag() {
|
||||
}
|
||||
|
||||
// If source window was maximized - maximize the new window as well.
|
||||
@ -45,7 +45,7 @@
|
||||
// Keeping maximized state breaks snap to Grid on Windows when dragging
|
||||
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
|
||||
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
|
||||
@@ -2465,7 +2465,7 @@ TabDragController::Liveness TabDragController::GetLoca
|
||||
@@ -2485,7 +2485,7 @@ TabDragController::Liveness TabDragController::GetLoca
|
||||
}
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
|
||||
@@ -464,7 +464,7 @@ std::string GetFileExtension(FileExtension file_extens
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
|
||||
SiteConfig config;
|
||||
bool is_app_found = false;
|
||||
@@ -1933,7 +1933,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
|
||||
@@ -1936,7 +1936,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
|
||||
if (app_name.empty()) {
|
||||
app_name = GetSiteConfiguration(site).app_name;
|
||||
}
|
||||
@ -18,7 +18,7 @@
|
||||
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
|
||||
profile(), app_id, app_name));
|
||||
ASSERT_TRUE(
|
||||
@@ -3249,7 +3249,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
|
||||
@@ -3253,7 +3253,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
|
||||
app_state->id, app_state->name);
|
||||
ASSERT_TRUE(icon_color.has_value());
|
||||
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
|
||||
@ -27,7 +27,7 @@
|
||||
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
|
||||
profile(), app_state->id, app_state->name));
|
||||
#endif
|
||||
@@ -3264,7 +3264,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
|
||||
@@ -3268,7 +3268,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
|
||||
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
|
||||
ASSERT_TRUE(app_state);
|
||||
base::ScopedAllowBlockingForTesting allow_blocking;
|
||||
@ -36,7 +36,7 @@
|
||||
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
|
||||
profile(), app_state->id, app_state->name));
|
||||
#endif
|
||||
@@ -3274,7 +3274,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
|
||||
@@ -3278,7 +3278,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
|
||||
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
|
||||
Site site,
|
||||
FileExtension file_extension) {
|
||||
@ -45,7 +45,7 @@
|
||||
if (!BeforeStateCheckAction(__FUNCTION__)) {
|
||||
return;
|
||||
}
|
||||
@@ -3290,7 +3290,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
|
||||
@@ -3294,7 +3294,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
|
||||
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
|
||||
Site site,
|
||||
FileExtension file_extension) {
|
||||
@ -54,17 +54,17 @@
|
||||
if (!BeforeStateCheckAction(__FUNCTION__)) {
|
||||
return;
|
||||
}
|
||||
@@ -4073,7 +4073,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
|
||||
@@ -4079,7 +4079,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
|
||||
base::FilePath shortcut_dir,
|
||||
const std::string& app_name,
|
||||
const AppId& app_id) {
|
||||
const webapps::AppId& app_id) {
|
||||
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
||||
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
||||
return override_registration_->test_override->GetShortcutPath(
|
||||
profile(), shortcut_dir, app_id, app_name);
|
||||
#else
|
||||
@@ -4260,7 +4260,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
|
||||
const AppId& id) {
|
||||
@@ -4273,7 +4273,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
|
||||
const webapps::AppId& id) {
|
||||
base::ScopedAllowBlockingForTesting allow_blocking;
|
||||
bool is_shortcut_and_icon_correct = false;
|
||||
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
@ -72,7 +72,7 @@
|
||||
bool is_shortcut_correct =
|
||||
override_registration_->test_override->IsShortcutCreated(profile, id,
|
||||
name);
|
||||
@@ -4304,7 +4304,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
|
||||
@@ -4317,7 +4317,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
|
||||
do_icon_colors_match =
|
||||
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
|
||||
}
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-10-21 11:51:27 UTC
|
||||
+++ chrome/browser/ui/webauthn/sheet_models.cc
|
||||
@@ -1499,7 +1499,11 @@ AuthenticatorMultiSourcePickerSheetModel::
|
||||
using ICloudKeychainMech =
|
||||
AuthenticatorRequestDialogModel::Mechanism::ICloudKeychain;
|
||||
bool has_local_passkeys =
|
||||
+#if (_LIBCPP_VERSION >= 160000)
|
||||
std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) {
|
||||
+#else
|
||||
+ base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) {
|
||||
+#endif
|
||||
return absl::holds_alternative<CredentialMech>(mech.type) &&
|
||||
absl::get<CredentialMech>(mech.type).value().source !=
|
||||
device::AuthenticatorType::kPhone;
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
@@ -210,7 +210,7 @@
|
||||
@@ -212,7 +212,7 @@
|
||||
#include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h"
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -236,17 +236,17 @@
|
||||
@@ -238,17 +238,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
|
||||
|
||||
@@ -399,7 +399,7 @@ bool IsAboutUI(const GURL& url) {
|
||||
@@ -401,7 +401,7 @@ bool IsAboutUI(const GURL& url) {
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
|| url.host_piece() == chrome::kChromeUITermsHost
|
||||
#endif
|
||||
@ -48,7 +48,7 @@
|
||||
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
|
||||
return &NewWebUI<WebUIJsErrorUI>;
|
||||
#endif
|
||||
@@ -722,7 +722,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -723,7 +723,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)
|
||||
@@ -789,27 +789,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -794,27 +794,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
}
|
||||
#endif
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-03-13 07:33:08 UTC
|
||||
--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "base/base64url.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
|
||||
@@ -24,7 +24,7 @@ namespace utils {
|
||||
@@ -29,7 +29,7 @@ namespace utils {
|
||||
|
||||
namespace {
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
|
||||
BPKUR::KeyTrustLevel trust_level) {
|
||||
@@ -92,7 +92,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu
|
||||
@@ -97,7 +97,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu
|
||||
} // namespace
|
||||
|
||||
connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-10-21 11:51:27 UTC
|
||||
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-11-22 14:00:11 UTC
|
||||
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
||||
@@ -320,7 +320,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
|
||||
@@ -312,7 +312,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) || \
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user