update to 2021.12.96
This commit is contained in:
parent
a27043fd75
commit
9f20642feb
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.127 2021/12/20 19:00:26 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.128 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
BROKEN-powerpc64 = Check failed: false. OS architecture not handled. (powerpc64)
|
||||
|
||||
@ -8,13 +8,11 @@ DPB_PROPERTIES= parallel parallel2
|
||||
|
||||
COMMENT= Iridium browser
|
||||
|
||||
V= 2021.10.95
|
||||
REVISION= 5
|
||||
V= 2021.12.96
|
||||
|
||||
DISTNAME= iridium-browser-${V}
|
||||
PKGNAME= iridium-${V}.1
|
||||
PKGNAME= iridium-${V}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
|
||||
PATCHFILES= iridium-browser-2021.10.95.1.patch
|
||||
|
||||
CATEGORIES= www
|
||||
|
||||
@ -176,7 +174,7 @@ GN_ARGS+= google_api_key=\"AIzaSyA015yecfJyWi8UQpneQVrNzIKlxjv4MhI\" \
|
||||
DWZ = :
|
||||
|
||||
.if ${FLAVOR:Mdebug}
|
||||
GN_ARGS+= symbol_level=2
|
||||
GN_ARGS+= symbol_level=1
|
||||
DEBUG_PACKAGES= ${BUILD_PACKAGES}
|
||||
.else
|
||||
GN_ARGS+= symbol_level=0
|
||||
|
@ -1,4 +1,2 @@
|
||||
SHA256 (iridium-browser-2021.10.95.1.patch) = uF1bs00VrlXHj6NMBtEYkse/5gMznLRPhmKh38/yxZk=
|
||||
SHA256 (iridium-browser-2021.10.95.tar.xz) = BqmEChIZhxYzy7H468GskSNuQJS+cE7xShcB2YuQsWw=
|
||||
SIZE (iridium-browser-2021.10.95.1.patch) = 413029
|
||||
SIZE (iridium-browser-2021.10.95.tar.xz) = 1217537508
|
||||
SHA256 (iridium-browser-2021.12.96.tar.xz) = 6M+LZla5hgcu42dBr2/BVNJ9G2jmcqHZ1Ky1XYRHId8=
|
||||
SIZE (iridium-browser-2021.12.96.tar.xz) = 1195553144
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-BUILD_gn,v 1.17 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-BUILD_gn,v 1.18 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: BUILD.gn
|
||||
--- BUILD.gn.orig
|
||||
+++ BUILD.gn
|
||||
@@ -52,7 +52,7 @@ declare_args() {
|
||||
@@ -55,7 +55,7 @@ declare_args() {
|
||||
if (is_official_build) {
|
||||
# An official (maximally optimized!) component (optimized for build times)
|
||||
# build doesn't make sense and usually doesn't work.
|
||||
@ -12,7 +12,7 @@ Index: BUILD.gn
|
||||
}
|
||||
|
||||
# This file defines the following two main targets:
|
||||
@@ -452,7 +452,7 @@ group("gn_all") {
|
||||
@@ -454,7 +454,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ Index: BUILD.gn
|
||||
deps += [
|
||||
"//third_party/breakpad:breakpad_unittests",
|
||||
"//third_party/breakpad:core-2-minidump",
|
||||
@@ -498,8 +498,6 @@ group("gn_all") {
|
||||
@@ -500,8 +500,6 @@ group("gn_all") {
|
||||
"//net:disk_cache_memory_test",
|
||||
"//net:quic_client",
|
||||
"//net:quic_server",
|
||||
@ -30,7 +30,7 @@ Index: BUILD.gn
|
||||
"//testing:empty_main",
|
||||
]
|
||||
|
||||
@@ -554,10 +552,6 @@ group("gn_all") {
|
||||
@@ -556,10 +554,6 @@ group("gn_all") {
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:sync_performance_tests",
|
||||
"//chrome/test/chromedriver:chromedriver",
|
||||
@ -41,7 +41,7 @@ Index: BUILD.gn
|
||||
"//media/cast:generate_barcode_video",
|
||||
"//media/cast:generate_timecode_audio",
|
||||
"//net:crash_cache",
|
||||
@@ -616,10 +610,6 @@ group("gn_all") {
|
||||
@@ -618,10 +612,6 @@ group("gn_all") {
|
||||
"//mojo:mojo_perftests",
|
||||
"//services/service_manager/public/cpp",
|
||||
"//testing/gmock:gmock_main",
|
||||
@ -52,7 +52,7 @@ Index: BUILD.gn
|
||||
]
|
||||
|
||||
if (!is_android) {
|
||||
@@ -697,7 +687,7 @@ group("gn_all") {
|
||||
@@ -699,7 +689,7 @@ group("gn_all") {
|
||||
host_os == "win") {
|
||||
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
|
||||
}
|
||||
@ -61,7 +61,7 @@ Index: BUILD.gn
|
||||
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1144,7 +1134,7 @@ if (!is_ios) {
|
||||
@@ -1147,7 +1137,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@ Index: BUILD.gn
|
||||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
@@ -1153,7 +1143,7 @@ if (!is_ios) {
|
||||
@@ -1156,7 +1146,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ Index: BUILD.gn
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1533,9 +1523,6 @@ group("chromium_builder_perf") {
|
||||
@@ -1537,9 +1527,6 @@ group("chromium_builder_perf") {
|
||||
|
||||
if (is_win) {
|
||||
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.20 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.21 2021/12/28 15:49:54 robert Exp $
|
||||
Index: ash/display/mirror_window_controller.cc
|
||||
--- ash/display/mirror_window_controller.cc.orig
|
||||
+++ ash/display/mirror_window_controller.cc
|
||||
@@ -287,7 +287,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
@@ -283,7 +283,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
return info.id() == iter->first;
|
||||
}) == display_info_list.end()) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-base_BUILD_gn,v 1.19 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_BUILD_gn,v 1.20 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/BUILD.gn
|
||||
--- base/BUILD.gn.orig
|
||||
+++ base/BUILD.gn
|
||||
@@ -947,7 +947,7 @@ component("base") {
|
||||
@@ -958,7 +958,7 @@ component("base") {
|
||||
"timer/hi_res_timer_manager_posix.cc",
|
||||
]
|
||||
|
||||
@ -12,7 +12,7 @@ Index: base/BUILD.gn
|
||||
sources += [
|
||||
"cpu_affinity_posix.cc",
|
||||
"cpu_affinity_posix.h",
|
||||
@@ -958,6 +958,12 @@ component("base") {
|
||||
@@ -969,6 +969,12 @@ component("base") {
|
||||
"profiler/thread_delegate_posix.h",
|
||||
]
|
||||
}
|
||||
@ -25,7 +25,7 @@ Index: base/BUILD.gn
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
@@ -1381,11 +1387,16 @@ component("base") {
|
||||
@@ -1393,11 +1399,16 @@ component("base") {
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
if (!use_sysroot &&
|
||||
@ -43,7 +43,7 @@ Index: base/BUILD.gn
|
||||
if (use_allocator_shim) {
|
||||
sources += [
|
||||
"allocator/allocator_shim.cc",
|
||||
@@ -1407,7 +1418,7 @@ component("base") {
|
||||
@@ -1419,7 +1430,7 @@ component("base") {
|
||||
"allocator/allocator_shim_override_mac_symbols.h",
|
||||
]
|
||||
}
|
||||
@ -52,7 +52,7 @@ Index: base/BUILD.gn
|
||||
sources += [
|
||||
"allocator/allocator_shim_override_cpp_symbols.h",
|
||||
"allocator/allocator_shim_override_glibc_weak_symbols.h",
|
||||
@@ -2118,6 +2129,30 @@ component("base") {
|
||||
@@ -2134,6 +2145,30 @@ component("base") {
|
||||
"linux_util.h",
|
||||
]
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-base_allocator_partition_allocator_partition_alloc_config_h,v 1.2 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_allocator_partition_allocator_partition_alloc_config_h,v 1.3 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/allocator/partition_allocator/partition_alloc_config.h
|
||||
--- base/allocator/partition_allocator/partition_alloc_config.h.orig
|
||||
+++ base/allocator/partition_allocator/partition_alloc_config.h
|
||||
@@ -57,7 +57,7 @@ static_assert(sizeof(void*) != 8, "");
|
||||
@@ -53,7 +53,7 @@ static_assert(sizeof(void*) != 8, "");
|
||||
|
||||
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
|
||||
// features such as futex(2).
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-base_compiler_specific_h,v 1.2 2021/10/29 14:49:39 robert Exp $
|
||||
|
||||
Index: base/compiler_specific.h
|
||||
--- base/compiler_specific.h.orig
|
||||
+++ base/compiler_specific.h
|
||||
@@ -366,7 +366,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
|
||||
|
||||
// Use nomerge attribute to disable optimization of merging multiple same calls.
|
||||
#if defined(__clang__) && (__clang_major__ >= 12) && \
|
||||
- __has_attribute(nomerge) && !defined(OS_CHROMEOS)
|
||||
+ __has_attribute(nomerge) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
|
||||
#define NOMERGE [[clang::nomerge]]
|
||||
#else
|
||||
#define NOMERGE
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-base_cpu_h,v 1.3 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_cpu_h,v 1.4 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/cpu.h
|
||||
--- base/cpu.h.orig
|
||||
+++ base/cpu.h
|
||||
@@ -97,7 +97,7 @@ class BASE_EXPORT CPU final {
|
||||
@@ -104,7 +104,7 @@ class BASE_EXPORT CPU final {
|
||||
const std::string& cpu_brand() const { return cpu_brand_; }
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.18 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.19 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/debug/debugger_posix.cc
|
||||
--- base/debug/debugger_posix.cc.orig
|
||||
+++ base/debug/debugger_posix.cc
|
||||
@@ -37,6 +37,10 @@
|
||||
@@ -36,6 +36,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
@ -14,7 +14,7 @@ Index: base/debug/debugger_posix.cc
|
||||
#if defined(OS_FREEBSD)
|
||||
#include <sys/user.h>
|
||||
#endif
|
||||
@@ -100,32 +104,47 @@ bool BeingDebugged() {
|
||||
@@ -95,32 +99,47 @@ bool BeingDebugged() {
|
||||
|
||||
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
||||
// binary interfaces may change.
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.22 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.23 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/debug/stack_trace_posix.cc
|
||||
--- base/debug/stack_trace_posix.cc.orig
|
||||
@ -12,7 +12,7 @@ Index: base/debug/stack_trace_posix.cc
|
||||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -686,6 +686,9 @@ class SandboxSymbolizeHelper {
|
||||
@@ -692,6 +692,9 @@ class SandboxSymbolizeHelper {
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
@ -22,7 +22,7 @@ Index: base/debug/stack_trace_posix.cc
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -703,6 +706,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -709,6 +712,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
@ -30,7 +30,7 @@ Index: base/debug/stack_trace_posix.cc
|
||||
}
|
||||
|
||||
// Opens all object files and caches their file descriptors.
|
||||
@@ -861,7 +865,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
|
||||
@@ -865,7 +869,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
|
||||
// If we do not have unwind tables, then try tracing using frame pointers.
|
||||
return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
|
||||
count, 0);
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-base_memory_platform_shared_memory_region_h,v 1.6 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_memory_platform_shared_memory_region_h,v 1.7 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/memory/platform_shared_memory_region.h
|
||||
--- base/memory/platform_shared_memory_region.h.orig
|
||||
+++ base/memory/platform_shared_memory_region.h
|
||||
@@ -25,7 +25,7 @@
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "base/files/scoped_file.h"
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ Index: base/memory/platform_shared_memory_region.h
|
||||
namespace content {
|
||||
class SandboxIPCHandler;
|
||||
}
|
||||
@@ -118,7 +118,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
|
||||
@@ -117,7 +117,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
|
||||
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
|
||||
};
|
||||
|
||||
@ -21,7 +21,7 @@ Index: base/memory/platform_shared_memory_region.h
|
||||
// Structure to limit access to executable region creation.
|
||||
struct ExecutableRegion {
|
||||
private:
|
||||
@@ -262,7 +262,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
|
||||
@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
|
||||
CheckPlatformHandlePermissionsCorrespondToMode);
|
||||
static PlatformSharedMemoryRegion Create(Mode mode,
|
||||
size_t size
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-base_process_kill_posix_cc,v 1.9 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_process_kill_posix_cc,v 1.10 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/process/kill_posix.cc
|
||||
--- base/process/kill_posix.cc.orig
|
||||
+++ base/process/kill_posix.cc
|
||||
@@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) {
|
||||
0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
|
||||
@@ -162,7 +162,7 @@ void EnsureProcessTerminated(Process process) {
|
||||
0, new BackgroundReaper(std::move(process), Seconds(2)));
|
||||
}
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-base_process_launch_h,v 1.18 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_process_launch_h,v 1.19 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/process/launch.h
|
||||
--- base/process/launch.h.orig
|
||||
+++ base/process/launch.h
|
||||
@@ -191,7 +191,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
bool clear_environment = false;
|
||||
#endif // OS_WIN || OS_POSIX || OS_FUCHSIA
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_process_process_metrics_h,v 1.18 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_process_process_metrics_h,v 1.19 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/process/process_metrics.h
|
||||
--- base/process/process_metrics.h.orig
|
||||
@ -21,7 +21,7 @@ Index: base/process/process_metrics.h
|
||||
// Minor and major page fault counts since the process creation.
|
||||
// Both counts are process-wide, and exclude child processes.
|
||||
//
|
||||
@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
// convenience wrapper for CreateProcessMetrics().
|
||||
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
|
||||
|
||||
@ -30,7 +30,7 @@ Index: base/process/process_metrics.h
|
||||
// Resident Set Size is a Linux/Android specific memory concept. Do not
|
||||
// attempt to extend this to other platforms.
|
||||
BASE_EXPORT size_t GetResidentSetSize() const;
|
||||
@@ -132,7 +132,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -135,7 +135,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
TimeDelta GetCumulativeCPUUsage() WARN_UNUSED_RESULT;
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
|
||||
@ -39,7 +39,7 @@ Index: base/process/process_metrics.h
|
||||
// Emits the cumulative CPU usage for all currently active threads since they
|
||||
// were started into the output parameter (replacing its current contents).
|
||||
// Threads that have already terminated will not be reported. Thus, the sum of
|
||||
@@ -215,7 +215,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
int GetOpenFdSoftLimit() const;
|
||||
#endif // defined(OS_POSIX)
|
||||
|
||||
@ -48,7 +48,7 @@ Index: base/process/process_metrics.h
|
||||
// Bytes of swap as reported by /proc/[pid]/status.
|
||||
uint64_t GetVmSwapBytes() const;
|
||||
|
||||
@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif // !defined(OS_MAC)
|
||||
|
||||
#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -57,7 +57,7 @@ Index: base/process/process_metrics.h
|
||||
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
|
||||
#endif
|
||||
#if defined(OS_APPLE)
|
||||
@@ -246,7 +246,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -249,7 +249,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
|
||||
@ -66,7 +66,7 @@ Index: base/process/process_metrics.h
|
||||
CPU::CoreType GetCoreType(int core_index);
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ||
|
||||
// defined(OS_AIX)
|
||||
@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -274,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
uint64_t last_cumulative_disk_usage_ = 0;
|
||||
|
||||
#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -75,7 +75,7 @@ Index: base/process/process_metrics.h
|
||||
// Same thing for idle wakeups.
|
||||
TimeTicks last_idle_wakeups_time_;
|
||||
uint64_t last_absolute_idle_wakeups_;
|
||||
@@ -316,7 +316,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
|
||||
@@ -317,7 +317,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
|
||||
defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \
|
||||
@ -84,7 +84,7 @@ Index: base/process/process_metrics.h
|
||||
// Data about system-wide memory consumption. Values are in KB. Available on
|
||||
// Windows, Mac, Linux, Android and Chrome OS.
|
||||
//
|
||||
@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
@@ -352,7 +352,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
#endif
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
|
||||
@ -93,7 +93,7 @@ Index: base/process/process_metrics.h
|
||||
// This provides an estimate of available memory as described here:
|
||||
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
|
||||
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
|
||||
@@ -366,7 +366,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
@@ -367,7 +367,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
#endif
|
||||
|
||||
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -102,7 +102,7 @@ Index: base/process/process_metrics.h
|
||||
int buffers = 0;
|
||||
int cached = 0;
|
||||
int active_anon = 0;
|
||||
@@ -403,7 +403,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
|
||||
@@ -404,7 +404,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
|
||||
// defined(OS_FUCHSIA)
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
|
||||
@ -111,7 +111,7 @@ Index: base/process/process_metrics.h
|
||||
// Parse the data found in /proc/<pid>/stat and return the sum of the
|
||||
// CPU-related ticks. Returns -1 on parse error.
|
||||
// Exposed for testing.
|
||||
@@ -590,7 +590,7 @@ class BASE_EXPORT SystemMetrics {
|
||||
@@ -591,7 +591,7 @@ class BASE_EXPORT SystemMetrics {
|
||||
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
|
||||
|
||||
size_t committed_memory_;
|
||||
|
@ -1,20 +1,20 @@
|
||||
$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.15 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.16 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
XXX pledge(2)
|
||||
|
||||
Index: base/threading/platform_thread_posix.cc
|
||||
--- base/threading/platform_thread_posix.cc.orig
|
||||
+++ base/threading/platform_thread_posix.cc
|
||||
@@ -71,7 +71,7 @@ void* ThreadFunc(void* params) {
|
||||
@@ -72,7 +72,7 @@ void* ThreadFunc(void* params) {
|
||||
if (!thread_params->joinable)
|
||||
base::ThreadRestrictions::SetSingletonAllowed(false);
|
||||
base::DisallowSingleton();
|
||||
|
||||
-#if !defined(OS_NACL)
|
||||
+#if !defined(OS_NACL) && !defined(OS_BSD)
|
||||
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
|
||||
internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
|
||||
#endif
|
||||
@@ -327,6 +327,9 @@ bool PlatformThread::CanIncreaseThreadPriority(ThreadP
|
||||
@@ -328,6 +328,9 @@ bool PlatformThread::CanIncreaseThreadPriority(ThreadP
|
||||
// static
|
||||
void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) {
|
||||
#if defined(OS_NACL)
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_trace_event_malloc_dump_provider_cc,v 1.15 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-base_trace_event_malloc_dump_provider_cc,v 1.16 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: base/trace_event/malloc_dump_provider.cc
|
||||
--- base/trace_event/malloc_dump_provider.cc.orig
|
||||
@ -12,7 +12,7 @@ Index: base/trace_event/malloc_dump_provider.cc
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
@@ -213,6 +215,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
|
||||
@@ -217,6 +219,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
|
||||
&allocated_objects_count);
|
||||
#elif defined(OS_FUCHSIA)
|
||||
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.22 2021/11/01 17:53:42 robert Exp $
|
||||
$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.23 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: build/config/compiler/BUILD.gn
|
||||
--- build/config/compiler/BUILD.gn.orig
|
||||
@ -12,7 +12,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
!is_official_build && !(is_component_build && !is_debug) &&
|
||||
((is_mac && target_cpu == "x64" && !use_system_xcode) ||
|
||||
(is_linux && !is_chromeos && target_cpu == "x64") ||
|
||||
@@ -239,12 +239,8 @@ config("default_include_dirs") {
|
||||
@@ -240,12 +240,8 @@ 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,7 +27,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,6 +288,8 @@ config("compiler") {
|
||||
@@ -293,6 +289,8 @@ config("compiler") {
|
||||
|
||||
configs += [
|
||||
# See the definitions below.
|
||||
@ -36,7 +36,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
":compiler_codegen",
|
||||
":compiler_deterministic",
|
||||
]
|
||||
@@ -438,6 +436,7 @@ config("compiler") {
|
||||
@@ -439,6 +437,7 @@ config("compiler") {
|
||||
}
|
||||
|
||||
ldflags += [
|
||||
@ -44,7 +44,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
"-Wl,-z,noexecstack",
|
||||
"-Wl,-z,relro",
|
||||
]
|
||||
@@ -866,7 +865,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -870,7 +869,7 @@ config("compiler_cpu_abi") {
|
||||
]
|
||||
}
|
||||
} else if (current_cpu == "arm") {
|
||||
@ -53,7 +53,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags += [ "--target=arm-linux-gnueabihf" ]
|
||||
ldflags += [ "--target=arm-linux-gnueabihf" ]
|
||||
}
|
||||
@@ -880,7 +879,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -884,7 +883,7 @@ config("compiler_cpu_abi") {
|
||||
cflags += [ "-mtune=$arm_tune" ]
|
||||
}
|
||||
} else if (current_cpu == "arm64") {
|
||||
@ -62,7 +62,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags += [ "--target=aarch64-linux-gnu" ]
|
||||
ldflags += [ "--target=aarch64-linux-gnu" ]
|
||||
}
|
||||
@@ -1587,11 +1586,6 @@ config("default_warnings") {
|
||||
@@ -1451,11 +1450,6 @@ config("default_warnings") {
|
||||
cflags += [
|
||||
"-Wenum-compare-conditional",
|
||||
|
||||
@ -74,7 +74,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
# Ignore warnings about MSVC optimization pragmas.
|
||||
# TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
|
||||
"-Wno-ignored-pragma-optimize",
|
||||
@@ -1601,7 +1595,7 @@ config("default_warnings") {
|
||||
@@ -1465,7 +1459,7 @@ config("default_warnings") {
|
||||
]
|
||||
|
||||
# NaCl does not support flags from ToT.
|
||||
@ -83,7 +83,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags += [
|
||||
# TODO(https://crbug.com/1203071): Clean up and enable.
|
||||
"-Wno-unused-but-set-parameter",
|
||||
@@ -1743,7 +1737,7 @@ config("no_chromium_code") {
|
||||
@@ -1612,7 +1606,7 @@ config("no_chromium_code") {
|
||||
# third-party libraries.
|
||||
"-Wno-c++11-narrowing",
|
||||
]
|
||||
@ -92,7 +92,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags += [
|
||||
# TODO(https://crbug.com/1202159): Clean up and enable.
|
||||
"-Wno-misleading-indentation",
|
||||
@@ -1823,7 +1817,7 @@ config("thin_archive") {
|
||||
@@ -1692,7 +1686,7 @@ config("thin_archive") {
|
||||
# archives.
|
||||
# TODO(crbug.com/1221615): Enable on is_apple if use_lld once that no longer
|
||||
# confuses lldb.
|
||||
@ -101,7 +101,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
arflags = [ "-T" ]
|
||||
} else if (is_win && use_lld) {
|
||||
arflags = [ "/llvmlibthin" ]
|
||||
@@ -2020,8 +2014,7 @@ config("default_stack_frames") {
|
||||
@@ -1889,8 +1883,7 @@ config("default_stack_frames") {
|
||||
}
|
||||
|
||||
# Default "optimization on" config.
|
||||
@ -111,7 +111,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_win) {
|
||||
if (chrome_pgo_phase != 2) {
|
||||
# Favor size over speed, /O1 must be before the common flags.
|
||||
@@ -2061,8 +2054,7 @@ config("xoptimize") {
|
||||
@@ -1930,8 +1923,7 @@ config("xoptimize") {
|
||||
}
|
||||
|
||||
# Turn off optimizations.
|
||||
@ -121,7 +121,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_win) {
|
||||
cflags = [
|
||||
"/Od", # Disable optimization.
|
||||
@@ -2102,8 +2094,7 @@ config("xno_optimize") {
|
||||
@@ -1971,8 +1963,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.
|
||||
@ -131,7 +131,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_nacl && is_nacl_irt) {
|
||||
# The NaCl IRT is a special case and always wants its own config.
|
||||
# Various components do:
|
||||
@@ -2136,8 +2127,7 @@ config("xoptimize_max") {
|
||||
@@ -2005,8 +1996,7 @@ config("xoptimize_max") {
|
||||
#
|
||||
# TODO(crbug.com/621335) - rework how all of these configs are related
|
||||
# so that we don't need this disclaimer.
|
||||
@ -141,7 +141,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_nacl && is_nacl_irt) {
|
||||
# The NaCl IRT is a special case and always wants its own config.
|
||||
# Various components do:
|
||||
@@ -2163,8 +2153,7 @@ config("xoptimize_speed") {
|
||||
@@ -2032,8 +2022,7 @@ config("xoptimize_speed") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -151,7 +151,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags = [ "-O1" ] + common_optimize_on_cflags
|
||||
rustflags = [ "-Copt-level=1" ]
|
||||
ldflags = common_optimize_on_ldflags
|
||||
@@ -2230,7 +2219,7 @@ config("afdo_optimize_size") {
|
||||
@@ -2099,7 +2088,7 @@ config("afdo_optimize_size") {
|
||||
# between //base/allocator:tcmalloc and AFDO on GCC), so we provide a separate
|
||||
# config to allow AFDO to be disabled per-target.
|
||||
config("afdo") {
|
||||
@ -160,7 +160,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags = []
|
||||
if (clang_emit_debug_info_for_profiling) {
|
||||
# Add the following flags to generate debug info for profiling.
|
||||
@@ -2246,7 +2235,7 @@ config("afdo") {
|
||||
@@ -2115,7 +2104,7 @@ config("afdo") {
|
||||
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
|
||||
inputs = [ _clang_sample_profile ]
|
||||
}
|
||||
@ -169,7 +169,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
cflags = [ "-fauto-profile=${auto_profile_path}" ]
|
||||
inputs = [ auto_profile_path ]
|
||||
}
|
||||
@@ -2284,8 +2273,7 @@ config("win_pdbaltpath") {
|
||||
@@ -2153,8 +2142,7 @@ config("win_pdbaltpath") {
|
||||
}
|
||||
|
||||
# Full symbols.
|
||||
@ -179,7 +179,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_win) {
|
||||
if (is_clang) {
|
||||
cflags = [ "/Z7" ] # Debug information in the .obj files.
|
||||
@@ -2376,7 +2364,7 @@ config("xsymbols") {
|
||||
@@ -2245,7 +2233,7 @@ config("xsymbols") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -188,7 +188,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_apple) {
|
||||
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
|
||||
# Make sure we don't use constructor homing on mac.
|
||||
@@ -2399,8 +2387,7 @@ config("xsymbols") {
|
||||
@@ -2268,8 +2256,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.
|
||||
@ -198,7 +198,7 @@ Index: build/config/compiler/BUILD.gn
|
||||
if (is_win) {
|
||||
# Functions, files, and line tables only.
|
||||
cflags = []
|
||||
@@ -2472,8 +2459,7 @@ config("xminimal_symbols") {
|
||||
@@ -2341,8 +2328,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,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.26 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.27 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/app/chrome_main_delegate.cc
|
||||
--- chrome/app/chrome_main_delegate.cc.orig
|
||||
@ -63,7 +63,7 @@ Index: chrome/app/chrome_main_delegate.cc
|
||||
// Record the startup process creation time on supported platforms. On Android
|
||||
// this is recorded in ChromeMainDelegateAndroid.
|
||||
startup_metric_utils::RecordStartupProcessCreationTime(
|
||||
@@ -673,6 +673,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
|
||||
@@ -677,6 +677,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
|
||||
// not always enabled on Linux/ChromeOS.
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
|
||||
@ -72,7 +72,7 @@ Index: chrome/app/chrome_main_delegate.cc
|
||||
#else
|
||||
bool enable_gwp_asan = true;
|
||||
#endif
|
||||
@@ -794,7 +796,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
@@ -798,7 +800,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
}
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -81,7 +81,7 @@ Index: chrome/app/chrome_main_delegate.cc
|
||||
// This will directly exit if the user asked for help.
|
||||
HandleHelpSwitches(command_line);
|
||||
#endif
|
||||
@@ -825,7 +827,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
@@ -829,7 +831,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
chromeos::dbus_paths::RegisterPathProvider();
|
||||
#endif
|
||||
@ -90,7 +90,7 @@ Index: chrome/app/chrome_main_delegate.cc
|
||||
nacl::RegisterPathProvider();
|
||||
#endif
|
||||
|
||||
@@ -1136,7 +1138,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1140,7 +1142,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
locale;
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@ Index: chrome/app/chrome_main_delegate.cc
|
||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -1219,7 +1221,7 @@ int ChromeMainDelegate::RunProcess(
|
||||
@@ -1223,7 +1225,7 @@ int ChromeMainDelegate::RunProcess(
|
||||
|
||||
// This entry is not needed on Linux, where the NaCl loader
|
||||
// process is launched via nacl_helper instead.
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.28 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.29 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/app/chromium_strings.grd
|
||||
--- chrome/app/chromium_strings.grd.orig
|
||||
@ -16,8 +16,8 @@ Index: chrome/app/chromium_strings.grd
|
||||
</if>
|
||||
|
||||
<!-- about:browser-switch strings -->
|
||||
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
|
||||
+ <if expr="is_win or is_macosx or (is_posix and not chromeos)">
|
||||
- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
|
||||
+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)">
|
||||
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
|
||||
Your system administrator has configured the browser to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
|
||||
</message>
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.20 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.21 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/app/generated_resources.grd
|
||||
--- chrome/app/generated_resources.grd.orig
|
||||
@ -12,25 +12,34 @@ Index: chrome/app/generated_resources.grd
|
||||
for making strings OS specific. Other platform defines such as use_titlecase
|
||||
are declared in tools/grit/grit_rule.gni.
|
||||
-->
|
||||
@@ -296,7 +296,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
<if expr="not is_android">
|
||||
<part file="protocol_handler_intent_picker_strings.grdp" />
|
||||
</if>
|
||||
@@ -293,7 +293,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
<part file="profiles_strings.grdp" />
|
||||
|
||||
<!-- Web app intent picker strings -->
|
||||
- <if expr="is_win or is_macosx or is_linux">
|
||||
+ <if expr="is_win or is_macosx or is_posix">
|
||||
<part file="url_handler_intent_picker_strings.grdp" />
|
||||
</if>
|
||||
|
||||
@@ -5474,7 +5474,7 @@ Keep your key file in a safe place. You will need it t
|
||||
@@ -2799,7 +2799,7 @@ are declared in tools/grit/grit_rule.gni.
|
||||
</if>
|
||||
|
||||
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
|
||||
- <if expr="is_win or is_linux">
|
||||
+ <if expr="is_win or is_posix">
|
||||
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
|
||||
Device Credentials
|
||||
</message>
|
||||
@@ -5528,7 +5528,7 @@ Keep your key file in a safe place. You will need it t
|
||||
</if>
|
||||
|
||||
<!-- chrome://browser-switch strings -->
|
||||
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
|
||||
+ <if expr="is_win or is_macosx or (is_posix and not chromeos)">
|
||||
- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
|
||||
+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)">
|
||||
<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
|
||||
Legacy Browser Support
|
||||
</message>
|
||||
@@ -7772,7 +7772,7 @@ Keep your key file in a safe place. You will need it t
|
||||
@@ -7904,7 +7904,7 @@ Keep your key file in a safe place. You will need it t
|
||||
Google Pay
|
||||
</message>
|
||||
|
||||
@ -39,7 +48,7 @@ Index: chrome/app/generated_resources.grd
|
||||
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
|
||||
Use system title bar and borders
|
||||
</message>
|
||||
@@ -8843,7 +8843,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
@@ -8981,7 +8981,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
Set as default
|
||||
</message>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.27 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.28 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/app/google_chrome_strings.grd
|
||||
--- chrome/app/google_chrome_strings.grd.orig
|
||||
@ -16,8 +16,8 @@ Index: chrome/app/google_chrome_strings.grd
|
||||
</if>
|
||||
|
||||
<!-- about:browser-switch strings -->
|
||||
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
|
||||
+ <if expr="is_win or is_macosx or (is_posix and not chromeos)">
|
||||
- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
|
||||
+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)">
|
||||
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
|
||||
Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
|
||||
</message>
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.27 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.28 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/about_flags.cc
|
||||
--- chrome/browser/about_flags.cc.orig
|
||||
+++ chrome/browser/about_flags.cc
|
||||
@@ -202,7 +202,7 @@
|
||||
@@ -206,7 +206,7 @@
|
||||
#include "ui/native_theme/native_theme_features.h"
|
||||
#include "ui/ui_features.h"
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/about_flags.cc
|
||||
#include "base/allocator/buildflags.h"
|
||||
#endif
|
||||
|
||||
@@ -998,7 +998,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio
|
||||
@@ -960,7 +960,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
|
||||
};
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/about_flags.cc
|
||||
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
|
||||
{"DocumentUseServerScore", "true"},
|
||||
{"DocumentUseClientScore", "false"},
|
||||
@@ -2543,7 +2543,7 @@ const FeatureEntry::FeatureVariation kPasswordChangeFe
|
||||
@@ -2481,7 +2481,7 @@ const FeatureEntry::FeatureVariation kPasswordChangeFe
|
||||
nullptr}};
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/about_flags.cc
|
||||
const FeatureEntry::FeatureParam
|
||||
kSendWebUIJavaScriptErrorReportsVariationSendToStaging[] = {
|
||||
{features::kSendWebUIJavaScriptErrorReportsSendToProductionVariation,
|
||||
@@ -2822,7 +2822,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -2786,7 +2786,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebKioskEnableLacrosDescription, kOsCrOS,
|
||||
FEATURE_VALUE_TYPE(features::kWebKioskEnableLacros)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -39,7 +39,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"send-webui-javascript-error-reports",
|
||||
flag_descriptions::kSendWebUIJavaScriptErrorReportsName,
|
||||
flag_descriptions::kSendWebUIJavaScriptErrorReportsDescription,
|
||||
@@ -3275,7 +3275,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3241,7 +3241,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)},
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
|
||||
@ -48,7 +48,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{
|
||||
"enable-accelerated-video-decode",
|
||||
flag_descriptions::kAcceleratedVideoDecodeName,
|
||||
@@ -3669,7 +3669,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3622,7 +3622,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
|
||||
flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
|
||||
@ -57,7 +57,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"enable-save-data", flag_descriptions::kEnableSaveDataName,
|
||||
flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
|
||||
SINGLE_VALUE_TYPE(
|
||||
@@ -4534,7 +4534,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4485,7 +4485,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)},
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
@ -66,7 +66,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"omnibox-experimental-keyword-mode",
|
||||
flag_descriptions::kOmniboxExperimentalKeywordModeName,
|
||||
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
|
||||
@@ -4915,7 +4915,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4858,7 +4858,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif // !defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -75,7 +75,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"webui-feedback", flag_descriptions::kWebuiFeedbackName,
|
||||
flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
|
||||
@@ -5557,7 +5557,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5486,7 +5486,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kSharingSendViaSyncDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(kSharingSendViaSync)},
|
||||
|
||||
@ -84,7 +84,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"sharing-hub-desktop-app-menu",
|
||||
flag_descriptions::kSharingHubDesktopAppMenuName,
|
||||
flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop,
|
||||
@@ -6027,7 +6027,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5964,7 +5964,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -93,7 +93,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
|
||||
flag_descriptions::kGlobalMediaControlsDescription,
|
||||
kOsWin | kOsMac | kOsLinux,
|
||||
@@ -6969,7 +6969,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6878,7 +6878,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(language::kForceAppLanguagePrompt)},
|
||||
#endif
|
||||
|
||||
@ -102,16 +102,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"commander", flag_descriptions::kCommanderName,
|
||||
flag_descriptions::kCommanderDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kCommander)},
|
||||
@@ -6997,7 +6997,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)},
|
||||
|
||||
#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- defined(OS_CHROMEOS)) && \
|
||||
+ defined(OS_CHROMEOS) || defined(OS_BSD)) && \
|
||||
BUILDFLAG(ENABLE_PRINTING)
|
||||
{"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName,
|
||||
flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop,
|
||||
@@ -7285,7 +7285,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7125,7 +7125,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
@ -120,7 +111,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{
|
||||
"ui-debug-tools",
|
||||
flag_descriptions::kUIDebugToolsName,
|
||||
@@ -7420,7 +7420,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7268,7 +7268,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(chromeos::features::kLauncherAppSort)},
|
||||
#endif
|
||||
|
||||
@ -129,7 +120,7 @@ Index: chrome/browser/about_flags.cc
|
||||
{"enable-desktop-pwas-app-icon-shortcuts-menu-ui",
|
||||
flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName,
|
||||
flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription,
|
||||
@@ -7684,7 +7684,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7513,7 +7513,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.17 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.18 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/browser_process_impl.cc
|
||||
--- chrome/browser/browser_process_impl.cc.orig
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -204,7 +204,7 @@
|
||||
@@ -208,7 +208,7 @@
|
||||
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/browser_process_impl.cc
|
||||
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
|
||||
#endif
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
@@ -220,7 +220,7 @@
|
||||
#include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
|
||||
#endif
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/browser_process_impl.cc
|
||||
// How often to check if the persistent instance of Chrome needs to restart
|
||||
// to install an update.
|
||||
static const int kUpdateCheckIntervalHours = 6;
|
||||
@@ -1174,7 +1174,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
@@ -1179,7 +1179,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
ApplyMetricsReportingPolicy();
|
||||
#endif
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/browser_process_impl.cc
|
||||
ChromeJsErrorReportProcessor::Create();
|
||||
#endif
|
||||
|
||||
@@ -1433,7 +1433,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
@@ -1438,7 +1438,7 @@ void BrowserProcessImpl::Unpin() {
|
||||
// Mac is currently not supported.
|
||||
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.16 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.17 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/browser_process_impl.h
|
||||
--- chrome/browser/browser_process_impl.h.orig
|
||||
+++ chrome/browser/browser_process_impl.h
|
||||
@@ -374,7 +374,7 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
@@ -378,7 +378,7 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,18 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_interface_binders_cc,v 1.5 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_interface_binders_cc,v 1.6 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/chrome_browser_interface_binders.cc
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig
|
||||
+++ chrome/browser/chrome_browser_interface_binders.cc
|
||||
@@ -152,7 +152,7 @@
|
||||
@@ -95,7 +95,7 @@
|
||||
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
|
||||
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
|
||||
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
|
||||
#endif
|
||||
@@ -158,7 +158,7 @@
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -12,7 +21,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
|
||||
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
|
||||
#include "chrome/browser/ui/webui/discards/discards_ui.h"
|
||||
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
|
||||
@@ -639,7 +639,7 @@ void PopulateChromeFrameBinders(
|
||||
@@ -648,7 +648,7 @@ void PopulateChromeFrameBinders(
|
||||
base::BindRepeating(&BindSpeechRecognitionRecognizerClientHandler));
|
||||
#endif
|
||||
|
||||
@ -21,7 +30,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
|
||||
if (!render_frame_host->GetParent()) {
|
||||
map->Add<chrome::mojom::DraggableRegions>(
|
||||
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
|
||||
@@ -647,7 +647,7 @@ void PopulateChromeFrameBinders(
|
||||
@@ -656,7 +656,7 @@ void PopulateChromeFrameBinders(
|
||||
#endif
|
||||
|
||||
#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MAC) || \
|
||||
@ -30,7 +39,16 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
|
||||
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
|
||||
!render_frame_host->GetParent()) {
|
||||
map->Add<blink::mojom::SubAppsProvider>(
|
||||
@@ -962,7 +962,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -691,7 +691,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
FlocInternalsUI>(map);
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
|
||||
RegisterWebUIControllerInterfaceBinder<
|
||||
connectors_internals::mojom::PageHandler,
|
||||
enterprise_connectors::ConnectorsInternalsUI>(map);
|
||||
@@ -983,7 +983,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.23 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.24 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/chrome_browser_main.cc
|
||||
--- chrome/browser/chrome_browser_main.cc.orig
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -219,11 +219,11 @@
|
||||
@@ -220,11 +220,11 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -17,7 +17,7 @@ Index: chrome/browser/chrome_browser_main.cc
|
||||
#include "components/crash/core/app/breakpad_linux.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -259,7 +259,7 @@
|
||||
@@ -260,7 +260,7 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -26,7 +26,7 @@ Index: chrome/browser/chrome_browser_main.cc
|
||||
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
|
||||
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
|
||||
@@ -943,7 +943,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ Index: chrome/browser/chrome_browser_main.cc
|
||||
// Create directory for user-level Native Messaging manifest files. This
|
||||
// makes it less likely that the directory will be created by third-party
|
||||
// software with incorrect owner or permission. See crbug.com/725513 .
|
||||
@@ -956,7 +956,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -964,7 +964,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
}
|
||||
#endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -44,7 +44,7 @@ Index: chrome/browser/chrome_browser_main.cc
|
||||
// Set the product channel for crash reports.
|
||||
if (!crash_reporter::IsCrashpadEnabled()) {
|
||||
breakpad::SetChannelCrashKey(
|
||||
@@ -976,7 +976,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -984,7 +984,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.12 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.13 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/chrome_browser_main_posix.cc
|
||||
--- chrome/browser/chrome_browser_main_posix.cc.orig
|
||||
+++ chrome/browser/chrome_browser_main_posix.cc
|
||||
@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
|
||||
@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
|
||||
} else {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.28 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.29 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/chrome_content_browser_client.cc
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -360,7 +360,7 @@
|
||||
@@ -365,7 +365,7 @@
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
|
||||
#include "storage/browser/file_system/external_mount_points.h"
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#elif defined(OS_ANDROID)
|
||||
#include "base/android/application_status_listener.h"
|
||||
@@ -423,12 +423,12 @@
|
||||
@@ -428,12 +428,12 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -27,7 +27,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
#include "components/crash/core/app/crash_switches.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -442,7 +442,7 @@
|
||||
@@ -447,7 +447,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
|
||||
@ -36,7 +36,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
|
||||
#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -463,7 +463,7 @@
|
||||
@@ -468,7 +468,7 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -45,7 +45,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -846,7 +846,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
|
||||
@@ -851,7 +851,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
|
||||
int GetCrashSignalFD(const base::CommandLine& command_line) {
|
||||
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
|
||||
}
|
||||
@ -54,7 +54,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
|
||||
const std::string& process_type) {
|
||||
base::FilePath dumps_path;
|
||||
@@ -1272,7 +1272,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
@@ -1339,7 +1339,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters,
|
||||
&startup_data_);
|
||||
@ -63,7 +63,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
main_parts =
|
||||
std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_);
|
||||
#elif defined(OS_ANDROID)
|
||||
@@ -1306,7 +1306,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
@@ -1373,7 +1373,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -72,7 +72,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
main_parts->AddParts(
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
|
||||
#else
|
||||
@@ -2075,6 +2075,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -2164,6 +2164,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
#elif defined(OS_POSIX)
|
||||
#if defined(OS_ANDROID)
|
||||
bool enable_crash_reporter = true;
|
||||
@ -81,7 +81,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
#else
|
||||
bool enable_crash_reporter = false;
|
||||
if (crash_reporter::IsCrashpadEnabled()) {
|
||||
@@ -2379,7 +2381,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -2478,7 +2480,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
|
||||
command_line);
|
||||
|
||||
@ -90,7 +90,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
// Processes may only query perf_event_open with the BPF sandbox disabled.
|
||||
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
|
||||
command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
|
||||
@@ -3662,7 +3664,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
@@ -3836,7 +3838,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
}
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -4073,7 +4075,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -4243,7 +4245,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
}
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
|
||||
@ -108,7 +108,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
|
||||
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
|
||||
MaybeCreateThrottleFor(handle),
|
||||
&throttles);
|
||||
@@ -4105,7 +4107,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
@@ -4275,7 +4277,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.26 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.27 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/chrome_content_browser_client.h
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig
|
||||
+++ chrome/browser/chrome_content_browser_client.h
|
||||
@@ -399,7 +399,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
@@ -410,7 +410,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
void OverridePageVisibilityState(
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
content::PageVisibilityState* visibility_state) override;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_defaults_cc,v 1.18 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_defaults_cc,v 1.19 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/defaults.cc
|
||||
--- chrome/browser/defaults.cc.orig
|
||||
+++ chrome/browser/defaults.cc
|
||||
@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;
|
||||
@@ -50,7 +50,7 @@ const bool kSyncAutoStarts = false;
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_devtools_devtools_eye_dropper_cc,v 1.12 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_devtools_devtools_eye_dropper_cc,v 1.13 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/devtools/devtools_eye_dropper.cc
|
||||
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig
|
||||
+++ chrome/browser/devtools/devtools_eye_dropper.cc
|
||||
@@ -188,7 +188,7 @@ void DevToolsEyeDropper::UpdateCursor() {
|
||||
@@ -187,7 +187,7 @@ void DevToolsEyeDropper::UpdateCursor() {
|
||||
// magnified projection only with centered hotspot.
|
||||
// Mac Retina requires cursor to be > 120px in order to render smoothly.
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.22 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.23 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -1402,7 +1402,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -1530,7 +1530,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
target_info->is_filetype_handled_safely)
|
||||
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
|
||||
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
|
||||
#endif
|
||||
@@ -1458,7 +1458,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -1599,7 +1599,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
|
||||
const base::FilePath& path) {
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
|
||||
return !download_prefs_->ShouldOpenPdfInSystemReader();
|
||||
}
|
||||
@@ -1562,7 +1562,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
|
||||
@@ -1707,7 +1707,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
|
||||
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
// Don't download pdf if it is a file URL, as that might cause an infinite
|
||||
// download loop if Chrome is not the system pdf viewer.
|
||||
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
|
||||
@@ -1604,7 +1604,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
|
||||
@@ -1749,7 +1749,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
|
||||
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
|
||||
download::DownloadItem* download_item) {
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -39,3 +39,12 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
|
||||
download_item);
|
||||
#else
|
||||
@@ -1765,7 +1765,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
|
||||
DCHECK(download_item->IsSavePackageDownload());
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
- defined(OS_MAC)
|
||||
+ defined(OS_MAC) || defined(OS_BSD)
|
||||
if (!base::FeatureList::IsEnabled(
|
||||
download::features::kAllowSavePackageScanning)) {
|
||||
std::move(callback).Run(true);
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.19 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.20 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/download/download_commands.cc
|
||||
--- chrome/browser/download/download_commands.cc.orig
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/download/download_commands.cc
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
|
||||
@@ -166,7 +166,7 @@ void DownloadCommands::ExecuteCommand(Command command)
|
||||
@@ -169,7 +169,7 @@ void DownloadCommands::ExecuteCommand(Command command)
|
||||
}
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.16 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.17 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/download/download_commands.h
|
||||
--- chrome/browser/download/download_commands.h.orig
|
||||
+++ chrome/browser/download/download_commands.h
|
||||
@@ -49,7 +49,7 @@ class DownloadCommands {
|
||||
@@ -54,7 +54,7 @@ class DownloadCommands {
|
||||
void ExecuteCommand(Command command);
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_item_model_cc,v 1.8 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_item_model_cc,v 1.9 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/download/download_item_model.cc
|
||||
--- chrome/browser/download/download_item_model.cc.orig
|
||||
+++ chrome/browser/download/download_item_model.cc
|
||||
@@ -626,7 +626,7 @@ bool DownloadItemModel::IsCommandChecked(
|
||||
@@ -635,7 +635,7 @@ bool DownloadItemModel::IsCommandChecked(
|
||||
download_crx_util::IsExtensionDownload(*download_);
|
||||
case DownloadCommands::ALWAYS_OPEN_TYPE:
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/download/download_item_model.cc
|
||||
if (download_commands->CanOpenPdfInSystemViewer()) {
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
|
||||
return prefs->ShouldOpenPdfInSystemReader();
|
||||
@@ -667,7 +667,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
|
||||
@@ -676,7 +676,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
|
||||
DownloadCommands::ALWAYS_OPEN_TYPE);
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.21 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.22 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/download/download_prefs.cc
|
||||
--- chrome/browser/download/download_prefs.cc.orig
|
||||
@ -29,7 +29,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
base::FilePath home_dir = base::GetHomeDir();
|
||||
if (download_path == home_dir) {
|
||||
return true;
|
||||
@@ -176,7 +179,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
|
||||
@@ -177,7 +180,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -38,7 +38,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
should_open_pdf_in_system_reader_ =
|
||||
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
|
||||
#endif
|
||||
@@ -295,7 +298,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
||||
@@ -296,7 +299,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
||||
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
|
||||
default_download_path);
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -47,7 +47,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
|
||||
#endif
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -429,7 +432,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
|
||||
@@ -430,7 +433,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
|
||||
|
||||
bool DownloadPrefs::IsAutoOpenByUserUsed() const {
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -56,7 +56,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
if (ShouldOpenPdfInSystemReader())
|
||||
return true;
|
||||
#endif
|
||||
@@ -444,7 +447,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
|
||||
@@ -445,7 +448,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
|
||||
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
|
||||
extension.erase(0, 1);
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -65,7 +65,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
if (base::FilePath::CompareEqualIgnoreCase(extension,
|
||||
FILE_PATH_LITERAL("pdf")) &&
|
||||
ShouldOpenPdfInSystemReader())
|
||||
@@ -499,7 +502,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
|
||||
@@ -500,7 +503,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
|
||||
}
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -74,7 +74,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
|
||||
if (should_open_pdf_in_system_reader_ == should_open)
|
||||
return;
|
||||
@@ -521,7 +524,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
||||
@@ -522,7 +525,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
||||
|
||||
void DownloadPrefs::ResetAutoOpenByUser() {
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -83,7 +83,7 @@ Index: chrome/browser/download/download_prefs.cc
|
||||
SetShouldOpenPdfInSystemReader(false);
|
||||
#endif
|
||||
auto_open_by_user_.clear();
|
||||
@@ -638,9 +641,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
|
||||
@@ -639,9 +642,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
|
||||
// Fall back to the default download directory for all other paths.
|
||||
return GetDefaultDownloadDirectoryForProfile();
|
||||
#else
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.18 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.19 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/download/download_prefs.h
|
||||
--- chrome/browser/download/download_prefs.h.orig
|
||||
+++ chrome/browser/download/download_prefs.h
|
||||
@@ -118,7 +118,7 @@ class DownloadPrefs {
|
||||
@@ -122,7 +122,7 @@ class DownloadPrefs {
|
||||
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/download/download_prefs.h
|
||||
// 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);
|
||||
@@ -177,7 +177,7 @@ class DownloadPrefs {
|
||||
@@ -181,7 +181,7 @@ class DownloadPrefs {
|
||||
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc,v 1.1 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc,v 1.2 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
|
||||
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig
|
||||
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "components/keyed_service/content/browser_context_dependency_manager.h"
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "components/keyed_service/core/keyed_service.h"
|
||||
#include "components/policy/content/policy_blocklist_service.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
|
||||
|
@ -1,20 +1,20 @@
|
||||
$OpenBSD: patch-chrome_browser_enterprise_connectors_device_trust_signals_signals_service_factory_cc,v 1.1 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_enterprise_connectors_device_trust_signals_signals_service_factory_cc,v 1.2 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
|
||||
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig
|
||||
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service.h"
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
|
||||
#include "base/check.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
|
||||
@@ -27,7 +27,7 @@ std::unique_ptr<SignalsService> CreateSignalsService()
|
||||
|
||||
decorators.push_back(std::make_unique<CommonSignalsDecorator>());
|
||||
#include "chrome/browser/enterprise/signals/device_info_fetcher.h"
|
||||
@@ -43,7 +43,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(
|
||||
g_browser_process->local_state(), profile->GetPrefs(),
|
||||
policy_blocklist_service));
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_enterprise_signals_device_info_fetcher_cc,v 1.2 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_enterprise_signals_device_info_fetcher_cc,v 1.3 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/enterprise/signals/device_info_fetcher.cc
|
||||
--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/enterprise/signals/device_info_fetcher.cc
|
||||
#include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -61,7 +61,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
|
||||
@@ -69,7 +69,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
|
||||
return std::make_unique<DeviceInfoFetcherMac>();
|
||||
#elif defined(OS_WIN)
|
||||
return std::make_unique<DeviceInfoFetcherWin>();
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.17 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.18 2021/12/28 15:49:54 robert Exp $
|
||||
Index: chrome/browser/extensions/BUILD.gn
|
||||
--- chrome/browser/extensions/BUILD.gn.orig
|
||||
+++ chrome/browser/extensions/BUILD.gn
|
||||
@@ -1274,6 +1274,10 @@ static_library("extensions") {
|
||||
@@ -1281,6 +1281,10 @@ static_library("extensions") {
|
||||
deps += [ "//chrome/services/printing/public/mojom" ]
|
||||
}
|
||||
|
||||
|
@ -1,32 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_enterprise_reporting_private_chrome_desktop_report_request_helper_cc,v 1.6 2021/10/29 14:49:39 robert Exp $
|
||||
|
||||
Index: chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
|
||||
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig
|
||||
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "base/win/registry.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
#include "base/environment.h"
|
||||
#include "base/nix/xdg_util.h"
|
||||
#endif
|
||||
@@ -241,7 +241,7 @@ base::FilePath GetEndpointVerificationDir() {
|
||||
bool got_path = false;
|
||||
#if defined(OS_WIN)
|
||||
got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
|
||||
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
|
||||
base::nix::kDotConfigDir);
|
||||
@@ -252,7 +252,7 @@ base::FilePath GetEndpointVerificationDir() {
|
||||
if (!got_path)
|
||||
return path;
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
path = path.AppendASCII("google");
|
||||
#else
|
||||
path = path.AppendASCII("Google");
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_h,v 1.1 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_h,v 1.2 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
|
||||
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig
|
||||
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
|
||||
@@ -41,7 +41,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
|
||||
DISALLOW_COPY_AND_ASSIGN(EnterpriseReportingPrivateGetDeviceIdFunction);
|
||||
@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
|
||||
~EnterpriseReportingPrivateGetDeviceIdFunction() override;
|
||||
};
|
||||
|
||||
-#if !defined(OS_LINUX)
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.17 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.18 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/extensions/external_provider_impl.cc
|
||||
--- chrome/browser/extensions/external_provider_impl.cc.orig
|
||||
+++ chrome/browser/extensions/external_provider_impl.cc
|
||||
@@ -796,7 +796,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
@@ -813,7 +813,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/extensions/external_provider_impl.cc
|
||||
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
|
||||
service,
|
||||
base::MakeRefCounted<ExternalPrefLoader>(
|
||||
@@ -824,7 +824,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
@@ -841,7 +841,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
bundled_extension_creation_flags));
|
||||
|
||||
// Define a per-user source of external extensions.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc,v 1.2 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc,v 1.3 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig
|
||||
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
@@ -213,7 +213,7 @@ const struct {
|
||||
@@ -211,7 +211,7 @@ const struct {
|
||||
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
|
||||
kDontBlockChildren},
|
||||
#endif
|
||||
|
@ -1,18 +1,18 @@
|
||||
$OpenBSD: patch-chrome_browser_flag_descriptions_cc,v 1.14 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_flag_descriptions_cc,v 1.15 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/flag_descriptions.cc
|
||||
--- chrome/browser/flag_descriptions.cc.orig
|
||||
+++ chrome/browser/flag_descriptions.cc
|
||||
@@ -5242,7 +5242,7 @@ const char kDownloadShelfWebUIDescription[] =
|
||||
@@ -5283,7 +5283,7 @@ const char kDownloadShelfWebUIDescription[] =
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
|
||||
+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
|
||||
|
||||
const char kEnableOopPrintDriversName[] =
|
||||
"Enables Out-of-Process Printer Drivers";
|
||||
@@ -5268,7 +5268,7 @@ const char kSettingsLandingPageRedesignDescription[] =
|
||||
const char kWebUIBrandingUpdateName[] = "WebUI Branding Update";
|
||||
const char kWebUIBrandingUpdateDescription[] =
|
||||
@@ -5303,7 +5303,7 @@ const char kSettingsLandingPageRedesignDescription[] =
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
|
||||
// defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/flag_descriptions.cc
|
||||
|
||||
const char kCommanderName[] = "Commander";
|
||||
const char kCommanderDescription[] =
|
||||
@@ -5286,7 +5286,7 @@ const char kDesktopDetailedLanguageSettingsDescription
|
||||
@@ -5321,7 +5321,7 @@ const char kDesktopDetailedLanguageSettingsDescription
|
||||
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/flag_descriptions.cc
|
||||
#if BUILDFLAG(USE_TCMALLOC)
|
||||
const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning";
|
||||
const char kDynamicTcmallocDescription[] =
|
||||
@@ -5390,7 +5390,7 @@ const char kElasticOverscrollDescription[] =
|
||||
@@ -5449,7 +5449,7 @@ const char kElasticOverscrollDescription[] =
|
||||
#endif // defined(OS_WIN) || defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_flag_descriptions_h,v 1.14 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_flag_descriptions_h,v 1.15 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/flag_descriptions.h
|
||||
--- chrome/browser/flag_descriptions.h.orig
|
||||
@ -12,16 +12,16 @@ Index: chrome/browser/flag_descriptions.h
|
||||
#include "base/allocator/buildflags.h"
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
|
||||
@@ -3046,7 +3046,7 @@ extern const char kDownloadShelfWebUIDescription[];
|
||||
@@ -3056,7 +3056,7 @@ extern const char kDownloadShelfWebUIDescription[];
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
|
||||
+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
|
||||
|
||||
extern const char kEnableOopPrintDriversName[];
|
||||
extern const char kEnableOopPrintDriversDescription[];
|
||||
@@ -3063,7 +3063,7 @@ extern const char kSettingsLandingPageRedesignDescript
|
||||
extern const char kWebUIBrandingUpdateName[];
|
||||
extern const char kWebUIBrandingUpdateDescription[];
|
||||
@@ -3070,7 +3070,7 @@ extern const char kSettingsLandingPageRedesignDescript
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
|
||||
// defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/flag_descriptions.h
|
||||
|
||||
extern const char kCommanderName[];
|
||||
extern const char kCommanderDescription[];
|
||||
@@ -3076,7 +3076,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc
|
||||
@@ -3083,7 +3083,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc
|
||||
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
|
||||
|
||||
@ -39,7 +39,7 @@ Index: chrome/browser/flag_descriptions.h
|
||||
#if BUILDFLAG(USE_TCMALLOC)
|
||||
extern const char kDynamicTcmallocName[];
|
||||
extern const char kDynamicTcmallocDescription[];
|
||||
@@ -3148,7 +3148,7 @@ extern const char kElasticOverscrollDescription[];
|
||||
@@ -3171,7 +3171,7 @@ extern const char kElasticOverscrollDescription[];
|
||||
#endif // defined(OS_WIN) || defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.23 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.24 2021/12/28 15:49:54 robert Exp $
|
||||
Index: chrome/browser/media_galleries/media_file_system_registry.cc
|
||||
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig
|
||||
+++ chrome/browser/media_galleries/media_file_system_registry.cc
|
||||
@@ -736,7 +736,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
|
||||
@@ -743,7 +743,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
|
||||
// Constructor in 'private' section because depends on private class definition.
|
||||
MediaFileSystemRegistry::MediaFileSystemRegistry()
|
||||
: file_system_context_(new MediaFileSystemContextImpl) {
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_media_webrtc_webrtc_logging_controller_h,v 1.6 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_media_webrtc_webrtc_logging_controller_h,v 1.7 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/media/webrtc/webrtc_logging_controller.h
|
||||
--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig
|
||||
+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
|
||||
@@ -129,7 +129,7 @@ class WebRtcLoggingController
|
||||
@@ -132,7 +132,7 @@ class WebRtcLoggingController
|
||||
size_t web_app_id,
|
||||
const StartEventLoggingCallback& callback);
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/media/webrtc/webrtc_logging_controller.h
|
||||
// Ensures that the WebRTC Logs directory exists and then grants render
|
||||
// process access to the 'WebRTC Logs' directory, and invokes |callback| with
|
||||
// the ids necessary to create a DirectoryEntry object.
|
||||
@@ -188,7 +188,7 @@ class WebRtcLoggingController
|
||||
@@ -191,7 +191,7 @@ class WebRtcLoggingController
|
||||
bool success,
|
||||
const std::string& error_message);
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.23 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.24 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/memory_details.cc
|
||||
--- chrome/browser/memory_details.cc.orig
|
||||
+++ chrome/browser/memory_details.cc
|
||||
@@ -39,7 +39,7 @@
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/memory_details.cc
|
||||
#include "content/public/browser/zygote_host/zygote_host_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -347,7 +347,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
@@ -321,7 +321,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
process.titles.push_back(title);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.16 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.17 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig
|
||||
@ -15,7 +15,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
|
||||
#include "base/linux_util.h"
|
||||
#include "base/strings/string_split.h"
|
||||
@@ -226,6 +228,7 @@ void RecordStartupMetrics() {
|
||||
@@ -222,6 +224,7 @@ void RecordStartupMetrics() {
|
||||
base::UmaHistogramBoolean("Windows.ApplockerRunning", IsApplockerRunning());
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
@ -23,7 +23,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
// TODO(crbug.com/1216328) Remove logging.
|
||||
LOG(ERROR) << "crbug.com/1216328: Checking Bluetooth availability started. "
|
||||
"Please report if there is no report that this ends.";
|
||||
@@ -235,6 +238,7 @@ void RecordStartupMetrics() {
|
||||
@@ -231,6 +234,7 @@ void RecordStartupMetrics() {
|
||||
// Record whether Chrome is the default browser or not.
|
||||
LOG(ERROR) << "crbug.com/1216328: Checking default browser status started. "
|
||||
"Please report if there is no report that this ends.";
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_metrics_chrome_metrics_service_client_cc,v 1.10 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_metrics_chrome_metrics_service_client_cc,v 1.11 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig
|
||||
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -737,7 +737,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -742,7 +742,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
|
||||
@@ -836,7 +836,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -841,7 +841,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
std::make_unique<PowerMetricsProvider>());
|
||||
#endif
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
metrics::CreateDesktopSessionMetricsProvider());
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX)
|
||||
@@ -1012,7 +1012,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
@@ -1017,7 +1017,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
#endif
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_net_system_network_context_manager_cc,v 1.10 2021/10/29 14:49:39 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_net_system_network_context_manager_cc,v 1.11 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/net/system_network_context_manager.cc
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig
|
||||
+++ chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -81,7 +81,7 @@
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
|
||||
#include "chrome/common/chrome_paths_internal.h"
|
||||
#include "chrome/grit/chromium_strings.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
@@ -146,7 +146,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
@@ -147,7 +147,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
auth_dynamic_params->basic_over_http_enabled =
|
||||
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
|
||||
auth_dynamic_params->delegate_by_kdc_policy =
|
||||
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
|
||||
#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
@@ -375,7 +375,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
@@ -378,7 +378,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled,
|
||||
auth_pref_callback);
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
|
||||
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
auth_pref_callback);
|
||||
#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
@@ -433,7 +433,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
@@ -436,7 +436,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
|
||||
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
|
||||
std::string());
|
||||
@ -39,7 +39,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
|
||||
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
false);
|
||||
#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
@@ -565,7 +565,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
|
||||
@@ -574,7 +574,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_password_manager_password_reuse_manager_factory_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_password_manager_password_reuse_manager_factory_cc,v 1.2 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/password_manager/password_reuse_manager_factory.cc
|
||||
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig
|
||||
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
|
||||
@@ -93,7 +93,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
|
||||
@@ -94,7 +94,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_performance_monitor_process_metrics_recorder_util_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_performance_monitor_process_metrics_recorder_util_cc,v 1.2 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/performance_monitor/process_metrics_recorder_util.cc
|
||||
--- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig
|
||||
+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc
|
||||
@@ -38,7 +38,7 @@ void RecordProcessHistograms(const char* histogram_suf
|
||||
@@ -42,7 +42,7 @@ void RecordProcessHistograms(const char* histogram_suf
|
||||
metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin,
|
||||
kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
|
||||
#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_performance_monitor_process_monitor_cc,v 1.2 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_performance_monitor_process_monitor_cc,v 1.3 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/performance_monitor/process_monitor.cc
|
||||
--- chrome/browser/performance_monitor/process_monitor.cc.orig
|
||||
+++ chrome/browser/performance_monitor/process_monitor.cc
|
||||
@@ -77,7 +77,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
|
||||
@@ -76,7 +76,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
|
||||
lhs.cpu_usage += rhs.cpu_usage;
|
||||
|
||||
#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_performance_monitor_process_monitor_h,v 1.2 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_performance_monitor_process_monitor_h,v 1.3 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/performance_monitor/process_monitor.h
|
||||
--- chrome/browser/performance_monitor/process_monitor.h.orig
|
||||
+++ chrome/browser/performance_monitor/process_monitor.h
|
||||
@@ -58,7 +58,7 @@ class ProcessMonitor {
|
||||
@@ -57,7 +57,7 @@ class ProcessMonitor {
|
||||
double cpu_usage = 0.0;
|
||||
|
||||
#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc,v 1.8 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc,v 1.9 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
|
||||
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -1373,7 +1373,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1399,7 +1399,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // !defined(OS_MAC) && !defined(OS_CHROMEOS)
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
{ key::kAuthNegotiateDelegateByKdcPolicy,
|
||||
prefs::kAuthNegotiateDelegateByKdcPolicy,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1479,7 +1479,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1517,7 +1517,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::INTEGER },
|
||||
#endif
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
{ key::kChromeAppsEnabled,
|
||||
extensions::pref_names::kChromeAppsEnabled,
|
||||
base::Value::Type::BOOLEAN },
|
||||
@@ -1739,7 +1739,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -1781,7 +1781,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
handlers->AddHandler(
|
||||
std::make_unique<
|
||||
enterprise_connectors::EnterpriseConnectorsPolicyHandler>(
|
||||
@@ -2102,7 +2102,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2146,7 +2146,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -39,7 +39,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
|
||||
key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema,
|
||||
SCHEMA_ALLOW_UNKNOWN,
|
||||
@@ -2133,7 +2133,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
@@ -2177,7 +2177,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
|
||||
policy::key::kSpellcheckLanguageBlocklist));
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.10 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.11 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/prefs/browser_prefs.cc
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -403,14 +403,14 @@
|
||||
@@ -410,14 +410,14 @@
|
||||
#include "components/os_crypt/os_crypt.h"
|
||||
#endif
|
||||
|
||||
@ -20,7 +20,25 @@ Index: chrome/browser/prefs/browser_prefs.cc
|
||||
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
|
||||
#endif
|
||||
@@ -1036,7 +1036,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
@@ -485,7 +485,7 @@ const char kLocalDiscoveryNotificationsEnabled[] =
|
||||
#endif
|
||||
|
||||
// Deprecated 11/2020
|
||||
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
|
||||
const char kMigrationToLoginDBStep[] = "profile.migration_to_logindb_step";
|
||||
#endif
|
||||
|
||||
@@ -736,7 +736,7 @@ void RegisterProfilePrefsForMigration(
|
||||
|
||||
registry->RegisterBooleanPref(prefs::kWebAppsUserDisplayModeCleanedUp, false);
|
||||
|
||||
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
|
||||
registry->RegisterIntegerPref(kMigrationToLoginDBStep, 0);
|
||||
#endif
|
||||
|
||||
@@ -1056,7 +1056,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
// TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the
|
||||
// migration is complete.
|
||||
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
|
||||
@ -29,7 +47,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
|
||||
enterprise_connectors::RegisterLocalPrefs(registry);
|
||||
#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN)
|
||||
|
||||
@@ -1067,7 +1067,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
@@ -1087,7 +1087,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
||||
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
@ -38,7 +56,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
|
||||
(defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
|
||||
#endif
|
||||
@@ -1358,7 +1358,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
@@ -1383,7 +1383,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -47,3 +65,12 @@ Index: chrome/browser/prefs/browser_prefs.cc
|
||||
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
|
||||
#endif
|
||||
@@ -1524,7 +1524,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
|
||||
profile_prefs);
|
||||
|
||||
// Added 11/2020
|
||||
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
|
||||
profile_prefs->ClearPref(kMigrationToLoginDBStep);
|
||||
#endif
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_printing_print_job_worker_cc,v 1.4 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_printing_print_job_worker_cc,v 1.5 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/printing/print_job_worker.cc
|
||||
--- chrome/browser/printing/print_job_worker.cc.orig
|
||||
+++ chrome/browser/printing/print_job_worker.cc
|
||||
@@ -224,7 +224,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
|
||||
@@ -287,7 +287,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
|
||||
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
|
||||
print_backend->GetPrinterDriverInfo(printer_name));
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.23 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.24 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/process_singleton_posix.cc
|
||||
--- chrome/browser/process_singleton_posix.cc.orig
|
||||
+++ chrome/browser/process_singleton_posix.cc
|
||||
@@ -95,12 +95,12 @@
|
||||
@@ -97,12 +97,12 @@
|
||||
#include "net/base/network_interfaces.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
@ -18,7 +18,7 @@ Index: chrome/browser/process_singleton_posix.cc
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -297,7 +297,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
|
||||
@@ -356,7 +356,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
|
||||
if (g_disable_prompt)
|
||||
return g_user_opted_unlock_in_use_profile;
|
||||
|
||||
@ -27,7 +27,7 @@ Index: chrome/browser/process_singleton_posix.cc
|
||||
std::u16string relaunch_button_text =
|
||||
l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
|
||||
return ShowProcessSingletonDialog(error, relaunch_button_text);
|
||||
@@ -874,7 +874,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
|
||||
@@ -935,7 +935,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
|
||||
return PROCESS_NONE;
|
||||
} else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
|
||||
#if defined(TOOLKIT_VIEWS) && \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc,v 1.10 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc,v 1.11 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
|
||||
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -363,7 +363,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -374,7 +374,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#endif
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_profiles_profile_impl_cc,v 1.9 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_profiles_profile_impl_cc,v 1.10 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/profiles/profile_impl.cc
|
||||
--- chrome/browser/profiles/profile_impl.cc.orig
|
||||
+++ chrome/browser/profiles/profile_impl.cc
|
||||
@@ -179,6 +179,7 @@
|
||||
@@ -181,6 +181,7 @@
|
||||
#include "services/preferences/public/mojom/preferences.mojom.h"
|
||||
#include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom.h"
|
||||
#include "services/service_manager/public/cpp/service.h"
|
||||
@ -11,7 +11,7 @@ Index: chrome/browser/profiles/profile_impl.cc
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -874,7 +875,13 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
|
||||
@@ -845,7 +846,13 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
|
||||
}
|
||||
|
||||
base::FilePath ProfileImpl::last_selected_directory() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_new_tab_page_new_tab_page_js,v 1.3 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_resources_new_tab_page_new_tab_page_js,v 1.4 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/resources/new_tab_page/new_tab_page.js
|
||||
--- chrome/browser/resources/new_tab_page/new_tab_page.js.orig
|
||||
@ -12,5 +12,5 @@ Index: chrome/browser/resources/new_tab_page/new_tab_page.js
|
||||
-export {dummyDescriptor} from './modules/dummy/module.js';
|
||||
-// </if>
|
||||
export {InfoDialogElement} from './modules/info_dialog.js';
|
||||
export {Module, ModuleDescriptor} from './modules/module_descriptor.js';
|
||||
export {InitializeModuleCallback, Module, ModuleDescriptor} from './modules/module_descriptor.js';
|
||||
export {ModuleHeaderElement} from './modules/module_header.js';
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts,v 1.2 2021/12/28 15:49:54 robert Exp $
|
||||
|
||||
Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig
|
||||
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
@@ -149,7 +149,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
@@ -144,7 +144,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
'prefs.autogenerated.theme.policy.color.controlledBy)',
|
||||
},
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
/**
|
||||
* Whether to show the "Custom Chrome Frame" setting.
|
||||
*/
|
||||
@@ -171,7 +171,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
@@ -166,7 +166,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
'themeChanged_(' +
|
||||
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
// NOTE: this pref only exists on Linux.
|
||||
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
|
||||
// </if>
|
||||
@@ -190,7 +190,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
@@ -185,7 +185,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
private showReaderModeOption_: boolean;
|
||||
private isForcedTheme_: boolean;
|
||||
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
private showCustomChromeFrame_: boolean;
|
||||
// </if>
|
||||
|
||||
@@ -268,7 +268,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
@@ -263,7 +263,7 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
this.appearanceBrowserProxy_.useDefaultTheme();
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
|
||||
this.useSystemTheme_ = useSystemTheme;
|
||||
}
|
||||
@@ -329,10 +329,10 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
@@ -324,10 +324,10 @@ class SettingsAppearancePageElement extends SettingsAp
|
||||
}
|
||||
|
||||
let i18nId;
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_settings_route_js,v 1.3 2021/10/29 14:49:40 robert Exp $
|
||||
|
||||
Index: chrome/browser/resources/settings/route.js
|
||||
--- chrome/browser/resources/settings/route.js.orig
|
||||
+++ chrome/browser/resources/settings/route.js
|
||||
@@ -186,7 +186,7 @@ function createBrowserSettingsRoutes() {
|
||||
|
||||
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
|
||||
|
||||
- // <if expr="is_linux">
|
||||
+ // <if expr="is_posix">
|
||||
r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions');
|
||||
// </if>
|
||||
|
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_settings_route_ts,v 1.1 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/resources/settings/route.ts
|
||||
--- chrome/browser/resources/settings/route.ts.orig
|
||||
+++ chrome/browser/resources/settings/route.ts
|
||||
@@ -184,7 +184,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
|
||||
|
||||
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
|
||||
|
||||
- // <if expr="is_linux">
|
||||
+ // <if expr="is_posix">
|
||||
r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions');
|
||||
// </if>
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/safe_browsing/download_protection/file_analyzer.cc
|
||||
--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/safe_browsing/download_protection/file_analyzer.cc
|
||||
} else if (base::FeatureList::IsEnabled(
|
||||
safe_browsing::kClientSideDetectionDocumentScanning) &&
|
||||
inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
|
||||
@@ -292,7 +292,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
|
||||
@@ -291,7 +291,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
|
||||
}
|
||||
#endif // defined(OS_MAC)
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc,v 1.20 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc,v 1.21 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig
|
||||
+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
@@ -713,7 +713,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
|
||||
@@ -716,7 +716,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
|
||||
|
||||
// Process::Current().CreationTime() is missing on some platforms.
|
||||
#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc,v 1.6 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_send_tab_to_self_receiving_ui_handler_registry_cc,v 1.7 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
|
||||
--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig
|
||||
+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
|
||||
@@ -14,7 +14,7 @@
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "components/send_tab_to_self/features.h"
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
|
||||
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
|
||||
#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
|
||||
#endif
|
||||
@@ -37,7 +37,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry
|
||||
@@ -39,7 +39,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry
|
||||
void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers(
|
||||
Profile* profile) {
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
|
||||
|
||||
// If STTS 2.0 is enabled the handler will be created when the toolbar
|
||||
// button registers itself as the delegate.
|
||||
@@ -56,7 +56,7 @@ SendTabToSelfToolbarIconController*
|
||||
@@ -59,7 +59,7 @@ SendTabToSelfToolbarIconController*
|
||||
ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
|
||||
Profile* profile) {
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc,v 1.6 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_send_tab_to_self_send_tab_to_self_client_service_cc,v 1.7 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
|
||||
--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig
|
||||
+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
|
||||
@@ -16,7 +16,7 @@
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "components/send_tab_to_self/send_tab_to_self_model.h"
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
|
||||
#include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
|
||||
#endif
|
||||
|
||||
@@ -47,7 +47,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
|
||||
@@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely(
|
||||
const std::vector<const SendTabToSelfEntry*>& new_entries) {
|
||||
for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
|
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_service_sandbox_type_h,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
|
||||
Index: chrome/browser/service_sandbox_type.h
|
||||
--- chrome/browser/service_sandbox_type.h.orig
|
||||
+++ chrome/browser/service_sandbox_type.h
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "sandbox/policy/sandbox_type.h"
|
||||
|
||||
#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- defined(OS_CHROMEOS)) && \
|
||||
+ defined(OS_BSD) || defined(OS_CHROMEOS)) && \
|
||||
BUILDFLAG(ENABLE_PRINTING)
|
||||
#include "chrome/browser/printing/print_backend_service_manager.h"
|
||||
#endif
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
// printing::mojom::PrintBackendService
|
||||
#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- defined(OS_CHROMEOS)) && \
|
||||
+ defined(OS_BSD) || defined(OS_CHROMEOS)) && \
|
||||
BUILDFLAG(ENABLE_PRINTING)
|
||||
namespace printing {
|
||||
namespace mojom {
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_sharing_sharing_device_registration_cc,v 1.5 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_sharing_sharing_device_registration_cc,v 1.6 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/sharing/sharing_device_registration.cc
|
||||
--- chrome/browser/sharing/sharing_device_registration.cc.orig
|
||||
+++ chrome/browser/sharing/sharing_device_registration.cc
|
||||
@@ -322,7 +322,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
|
||||
@@ -327,7 +327,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
|
||||
|
||||
bool SharingDeviceRegistration::IsRemoteCopySupported() const {
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_sharing_sharing_handler_registry_impl_cc,v 1.6 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_sharing_sharing_handler_registry_impl_cc,v 1.7 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/sharing/sharing_handler_registry_impl.cc
|
||||
--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig
|
||||
+++ chrome/browser/sharing/sharing_handler_registry_impl.cc
|
||||
@@ -22,7 +22,7 @@
|
||||
@@ -24,7 +24,7 @@
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/sharing/sharing_handler_registry_impl.cc
|
||||
#include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
|
||||
// BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS)
|
||||
@@ -68,7 +68,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
|
||||
@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
|
||||
}
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_shutdown_signal_handlers_posix_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_shutdown_signal_handlers_posix_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/shutdown_signal_handlers_posix.cc
|
||||
--- chrome/browser/shutdown_signal_handlers_posix.cc.orig
|
||||
+++ chrome/browser/shutdown_signal_handlers_posix.cc
|
||||
@@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers(
|
||||
@@ -188,12 +188,18 @@ void InstallShutdownSignalHandlers(
|
||||
g_pipe_pid = getpid();
|
||||
g_shutdown_pipe_read_fd = pipefd[0];
|
||||
g_shutdown_pipe_write_fd = pipefd[1];
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.20 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.21 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/sync/chrome_sync_client.cc
|
||||
--- chrome/browser/sync/chrome_sync_client.cc.orig
|
||||
+++ chrome/browser/sync/chrome_sync_client.cc
|
||||
@@ -462,7 +462,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
|
||||
@@ -461,7 +461,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
|
||||
|
||||
// Chrome prefers OS provided spell checkers where they exist. So only sync the
|
||||
// custom dictionary on platforms that typically don't provide one.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_cc,v 1.14 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_task_manager_sampling_task_group_cc,v 1.15 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/task_manager/sampling/task_group.cc
|
||||
--- chrome/browser/task_manager/sampling/task_group.cc.orig
|
||||
+++ chrome/browser/task_manager/sampling/task_group.cc
|
||||
@@ -38,7 +38,7 @@ const int kBackgroundRefreshTypesMask =
|
||||
@@ -37,7 +37,7 @@ const int kBackgroundRefreshTypesMask =
|
||||
#if defined(OS_WIN)
|
||||
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
|
||||
#endif // defined(OS_WIN)
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
|
||||
REFRESH_TYPE_FD_COUNT |
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
|
||||
#if BUILDFLAG(ENABLE_NACL)
|
||||
@@ -123,7 +123,7 @@ TaskGroup::TaskGroup(
|
||||
@@ -122,7 +122,7 @@ TaskGroup::TaskGroup(
|
||||
#if BUILDFLAG(ENABLE_NACL)
|
||||
nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
|
||||
#endif // BUILDFLAG(ENABLE_NACL)
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
|
||||
open_fd_count_(-1),
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
|
||||
idle_wakeups_per_second_(-1),
|
||||
@@ -142,7 +142,7 @@ TaskGroup::TaskGroup(
|
||||
@@ -141,7 +141,7 @@ TaskGroup::TaskGroup(
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/task_manager/sampling/task_group.cc
|
||||
base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone,
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
|
||||
@@ -329,7 +329,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
|
||||
@@ -321,7 +321,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
|
||||
}
|
||||
#endif // BUILDFLAG(ENABLE_NACL)
|
||||
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.18 2021/10/29 14:49:40 robert Exp $
|
||||
|
||||
Index: chrome/browser/tracing/crash_service_uploader.cc
|
||||
--- chrome/browser/tracing/crash_service_uploader.cc.orig
|
||||
+++ chrome/browser/tracing/crash_service_uploader.cc
|
||||
@@ -164,6 +164,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
|
||||
const char product[] = "Chrome_Android";
|
||||
#elif defined(OS_FUCHSIA)
|
||||
const char product[] = "Chrome_Fuchsia";
|
||||
+#elif defined(OS_OPENBSD)
|
||||
+ const char product[] = "Chrome_OpenBSD";
|
||||
#else
|
||||
#error Platform not supported.
|
||||
#endif
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_dialogs_h,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_dialogs_h,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/browser_dialogs.h
|
||||
--- chrome/browser/ui/browser_dialogs.h.orig
|
||||
+++ chrome/browser/ui/browser_dialogs.h
|
||||
@@ -23,7 +23,7 @@
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "ui/gfx/native_widget_types.h"
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/browser_dialogs.h
|
||||
(defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
#include "chrome/browser/web_applications/web_app_id.h"
|
||||
#endif
|
||||
@@ -77,7 +77,7 @@ class WebDialogDelegate;
|
||||
@@ -78,7 +78,7 @@ class WebDialogDelegate;
|
||||
struct SelectedFileInfo;
|
||||
} // namespace ui
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/browser_dialogs.h
|
||||
(defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
namespace web_app {
|
||||
struct UrlHandlerLaunchParams;
|
||||
@@ -175,7 +175,7 @@ void ShowWebAppProtocolHandlerIntentPicker(
|
||||
@@ -187,7 +187,7 @@ void ShowWebAppProtocolHandlerIntentPicker(
|
||||
WebAppProtocolHandlerAcceptanceCallback close_callback);
|
||||
#endif // !defined(OS_ANDROID)
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.16 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.17 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/browser_view_prefs.cc
|
||||
--- chrome/browser/ui/browser_view_prefs.cc.orig
|
||||
+++ chrome/browser/ui/browser_view_prefs.cc
|
||||
@@ -29,7 +29,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t
|
||||
@@ -24,7 +24,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -11,8 +11,8 @@ Index: chrome/browser/ui/browser_view_prefs.cc
|
||||
+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
|
||||
bool GetCustomFramePrefDefault() {
|
||||
#if defined(USE_OZONE)
|
||||
if (features::IsUsingOzonePlatform()) {
|
||||
@@ -57,7 +57,7 @@ void RegisterBrowserViewProfilePrefs(
|
||||
return ui::OzonePlatform::GetInstance()
|
||||
@@ -47,7 +47,7 @@ void RegisterBrowserViewProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_signin_dice_web_signin_interceptor_delegate_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_signin_dice_web_signin_interceptor_delegate_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc
|
||||
--- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig
|
||||
+++ chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc
|
||||
@@ -57,7 +57,7 @@ class ForcedEnterpriseSigninInterceptionHandle
|
||||
@@ -58,7 +58,7 @@ class ForcedEnterpriseSigninInterceptionHandle
|
||||
void ShowEnterpriseProfileInterceptionDialog(const AccountInfo& account_info,
|
||||
SkColor profile_color) {
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_signin_view_controller_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_signin_view_controller_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/signin_view_controller.cc
|
||||
--- chrome/browser/ui/signin_view_controller.cc.orig
|
||||
+++ chrome/browser/ui/signin_view_controller.cc
|
||||
@@ -241,7 +241,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
|
||||
@@ -242,7 +242,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
|
||||
SkColor profile_color,
|
||||
base::OnceCallback<void(bool)> callback) {
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
|
@ -1,18 +1,18 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.22 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.23 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
@@ -132,7 +132,7 @@
|
||||
|
||||
#include "chrome/browser/ui/startup/web_app_protocol_handling_startup_utils.h"
|
||||
@@ -124,7 +124,7 @@
|
||||
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
|
||||
(defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
|
||||
#include "chrome/browser/ui/startup/web_app_url_handling_startup_utils.h"
|
||||
#endif
|
||||
@@ -485,7 +485,7 @@ bool MaybeLaunchApplication(
|
||||
@@ -478,7 +478,7 @@ bool MaybeLaunchApplication(
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
bool MaybeLaunchUrlHandlerWebAppFromCmd(
|
||||
const base::CommandLine& command_line,
|
||||
const base::FilePath& cur_dir,
|
||||
@@ -1117,7 +1117,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
@@ -1103,7 +1103,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
|
||||
if (command_line.HasSwitch(switches::kAppId)) {
|
||||
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
|
||||
@ -30,7 +30,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
// If Chrome Apps are deprecated and |app_id| is a Chrome App, display the
|
||||
// deprecation UI instead of launching the app.
|
||||
if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id))
|
||||
@@ -1196,7 +1196,7 @@ bool StartupBrowserCreator::StartupLaunchAfterProtocol
|
||||
@@ -1184,7 +1184,7 @@ bool StartupBrowserCreator::ContinueProcessingCommandL
|
||||
}
|
||||
|
||||
// Web app URL handling.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.17 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.18 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/tab_helpers.cc
|
||||
--- chrome/browser/ui/tab_helpers.cc.orig
|
||||
+++ chrome/browser/ui/tab_helpers.cc
|
||||
@@ -161,7 +161,7 @@
|
||||
@@ -166,7 +166,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/tab_helpers.cc
|
||||
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
|
||||
#include "chrome/browser/ui/hats/hats_helper.h"
|
||||
#endif
|
||||
@@ -431,13 +431,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
@@ -445,13 +445,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.19 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.20 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/chrome_views_delegate.h
|
||||
--- chrome/browser/ui/views/chrome_views_delegate.h.orig
|
||||
+++ chrome/browser/ui/views/chrome_views_delegate.h
|
||||
@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
|
||||
@@ -54,7 +54,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
|
||||
base::OnceClosure callback) override;
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_download_download_item_view_cc,v 1.5 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_download_download_item_view_cc,v 1.6 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/download/download_item_view.cc
|
||||
--- chrome/browser/ui/views/download/download_item_view.cc.orig
|
||||
+++ chrome/browser/ui/views/download/download_item_view.cc
|
||||
@@ -195,7 +195,7 @@ bool UseNewWarnings() {
|
||||
@@ -194,7 +194,7 @@ bool UseNewWarnings() {
|
||||
}
|
||||
|
||||
int GetFilenameStyle(const views::Label& label) {
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/download/download_item_view.cc
|
||||
if (UseNewWarnings())
|
||||
return STYLE_EMPHASIZED;
|
||||
#endif
|
||||
@@ -203,7 +203,7 @@ int GetFilenameStyle(const views::Label& label) {
|
||||
@@ -202,7 +202,7 @@ int GetFilenameStyle(const views::Label& label) {
|
||||
}
|
||||
|
||||
int GetFilenameStyle(const views::StyledLabel& label) {
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_first_run_dialog_cc,v 1.19 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_first_run_dialog_cc,v 1.20 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/first_run_dialog.cc
|
||||
--- chrome/browser/ui/views/first_run_dialog.cc.orig
|
||||
+++ chrome/browser/ui/views/first_run_dialog.cc
|
||||
@@ -37,7 +37,7 @@
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
namespace {
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/first_run_dialog.cc
|
||||
void InitCrashReporterIfEnabled(bool enabled) {
|
||||
if (!crash_reporter::IsCrashpadEnabled() && enabled)
|
||||
breakpad::InitCrashReporter(std::string());
|
||||
@@ -125,7 +125,7 @@ bool FirstRunDialog::Accept() {
|
||||
@@ -126,7 +126,7 @@ bool FirstRunDialog::Accept() {
|
||||
|
||||
#if defined(OS_MAC)
|
||||
ChangeMetricsReportingState(report_crashes_->GetChecked());
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_desktop_window_tree_host_linux_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_desktop_window_tree_host_linux_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
|
||||
--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
|
||||
@@ -155,7 +155,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
|
||||
@@ -147,7 +147,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
|
||||
}
|
||||
|
||||
void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() {
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_desktop_window_tree_host_linux_h,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_desktop_window_tree_host_linux_h,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
|
||||
--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
|
||||
@@ -89,7 +89,7 @@ class BrowserDesktopWindowTreeHostLinux
|
||||
@@ -96,7 +96,7 @@ class BrowserDesktopWindowTreeHostLinux
|
||||
// browser_desktop_window_tree_host_lacros.cc.
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.17 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.18 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
--- chrome/browser/ui/views/frame/browser_frame.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_frame.cc
|
||||
@@ -47,11 +47,11 @@
|
||||
@@ -48,11 +48,11 @@
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -17,7 +17,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace {
|
||||
@@ -61,7 +61,7 @@ namespace {
|
||||
bool IsUsingGtkTheme(Profile* profile) {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -26,7 +26,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
|
||||
#else
|
||||
return false;
|
||||
@@ -247,7 +247,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
|
||||
@@ -263,7 +263,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
|
||||
IsVisibleOnAllWorkspaces());
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -35,7 +35,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
// If the window was sent to a different workspace, prioritize it if
|
||||
// it was sent to the current workspace and deprioritize it
|
||||
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
|
||||
@@ -370,7 +370,7 @@ void BrowserFrame::SelectNativeTheme() {
|
||||
@@ -386,7 +386,7 @@ void BrowserFrame::SelectNativeTheme() {
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc
|
||||
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
||||
// Ignore GTK+ for web apps with window-controls-overlay as the
|
||||
// display_override so the web contents can blend with the overlay by using
|
||||
@@ -389,7 +389,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
|
||||
@@ -405,7 +405,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
|
||||
bool need_regenerate = false;
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.14 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.15 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/browser_view.cc
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -1632,7 +1632,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
|
||||
@@ -1686,7 +1686,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 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.26 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.27 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
#include "ui/views/controls/menu/menu_runner.h"
|
||||
#endif
|
||||
|
||||
@@ -516,7 +516,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
|
||||
@@ -520,7 +520,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
|
||||
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
|
||||
return FrameButtonStyle::kMdButton;
|
||||
#else
|
||||
return FrameButtonStyle::kImageButton;
|
||||
@@ -726,7 +726,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
|
||||
@@ -730,7 +730,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
|
||||
}
|
||||
|
||||
void OpaqueBrowserFrameView::WindowIconPressed() {
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.18 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.19 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig
|
||||
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
ui::SimpleMenuModel* model) {
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
|
||||
model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
|
||||
model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
|
||||
@@ -94,7 +94,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
}
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
bool supports_server_side_decorations = true;
|
||||
#if defined(USE_OZONE) && \
|
||||
@@ -151,7 +151,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
|
||||
@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
|
||||
}
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc,v 1.2 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc,v 1.3 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig
|
||||
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
@@ -604,7 +604,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
|
||||
@@ -611,7 +611,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.24 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.25 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig
|
||||
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
@@ -453,7 +453,7 @@ void TabDragController::Init(TabDragContext* source_co
|
||||
@@ -451,7 +451,7 @@ void TabDragController::Init(TabDragContext* source_co
|
||||
// synchronous on desktop Linux, so use that.
|
||||
// - Chrome OS
|
||||
// Releasing capture on Ash cancels gestures so avoid it.
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
can_release_capture_ = false;
|
||||
#endif
|
||||
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
|
||||
@@ -919,7 +919,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
|
||||
@@ -917,7 +917,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
||||
// EndMoveLoop is going to snap the window back to its original location.
|
||||
// Hide it so users don't see this. Hiding a window in Linux aura causes
|
||||
// it to lose capture so skip it.
|
||||
@@ -2214,7 +2214,7 @@ TabDragController::Liveness TabDragController::GetLoca
|
||||
@@ -2212,7 +2212,7 @@ TabDragController::Liveness TabDragController::GetLoca
|
||||
}
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_hover_card_controller_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_hover_card_controller_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
|
||||
--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig
|
||||
+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
|
||||
@@ -304,7 +304,7 @@ void TabHoverCardController::ShowHoverCard(bool is_ini
|
||||
@@ -302,7 +302,7 @@ void TabHoverCardController::ShowHoverCard(bool is_ini
|
||||
slide_animator_->UpdateTargetBounds();
|
||||
MaybeStartThumbnailObservation(target_tab_, is_initial);
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.24 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/webui/about_ui.cc
|
||||
--- chrome/browser/ui/webui/about_ui.cc.orig
|
||||
+++ chrome/browser/ui/webui/about_ui.cc
|
||||
@@ -574,7 +574,7 @@ std::string ChromeURLs() {
|
||||
@@ -577,7 +577,7 @@ std::string ChromeURLs() {
|
||||
return html;
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/webui/about_ui.cc
|
||||
std::string AboutLinuxProxyConfig() {
|
||||
std::string data;
|
||||
AppendHeader(&data, 0,
|
||||
@@ -630,7 +630,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
@@ -633,7 +633,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
response =
|
||||
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.27 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.28 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig
|
||||
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
@@ -267,7 +267,7 @@
|
||||
@@ -269,7 +269,7 @@
|
||||
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -292,12 +292,12 @@
|
||||
@@ -294,17 +294,17 @@
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
@ -27,7 +27,13 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
#include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -559,7 +559,7 @@ bool IsAboutUI(const GURL& url) {
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
|
||||
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -565,7 +565,7 @@ bool IsAboutUI(const GURL& url) {
|
||||
#if !defined(OS_ANDROID)
|
||||
|| url.host_piece() == chrome::kChromeUITermsHost
|
||||
#endif
|
||||
@ -36,7 +42,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
|
||||
#endif
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@@ -948,7 +948,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -959,7 +959,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
}
|
||||
#endif // !defined(OFFICIAL_BUILD)
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
@ -45,7 +51,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
|
||||
return &NewWebUI<WebUIJsErrorUI>;
|
||||
#endif
|
||||
@@ -1013,7 +1013,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -1024,7 +1024,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
if (url.host_piece() == chrome::kChromeUINaClHost)
|
||||
return &NewWebUI<NaClUI>;
|
||||
#endif
|
||||
@ -54,7 +60,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
defined(USE_AURA)
|
||||
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
|
||||
return &NewWebUI<ConstrainedWebDialogUI>;
|
||||
@@ -1068,17 +1068,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
@@ -1079,22 +1079,22 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
}
|
||||
#endif
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
@ -65,6 +71,12 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
}
|
||||
#endif
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
|
||||
if (url.host_piece() == chrome::kChromeUIConnectorsInternalsHost)
|
||||
return &NewWebUI<enterprise_connectors::ConnectorsInternalsUI>;
|
||||
#endif
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
- defined(OS_CHROMEOS)
|
||||
+ defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
if (url.host_piece() == chrome::kChromeUIDiscardsHost)
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc,v 1.1 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc,v 1.2 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
||||
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig
|
||||
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
||||
@@ -313,7 +313,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext
|
||||
@@ -314,7 +314,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext
|
||||
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode));
|
||||
|
||||
bool is_deprecated_app = false;
|
||||
@ -12,7 +12,7 @@ Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
||||
is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(
|
||||
extension_service_->GetBrowserContext(), extension->id());
|
||||
#endif
|
||||
@@ -753,7 +753,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L
|
||||
@@ -754,7 +754,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L
|
||||
|
||||
Profile* profile = extension_service_->profile();
|
||||
|
||||
@ -21,7 +21,7 @@ Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
||||
if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, extension_id)) {
|
||||
// TODO(crbug.com/1225779): Show the deprecated apps dialog.
|
||||
return;
|
||||
@@ -1353,7 +1353,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
|
||||
@@ -1354,7 +1354,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
|
||||
options.os_hooks[web_app::OsHookType::kProtocolHandlers] = true;
|
||||
options.os_hooks[web_app::OsHookType::kRunOnOsLogin] = false;
|
||||
options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = true;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_settings_appearance_handler_h,v 1.10 2021/10/29 14:49:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_settings_appearance_handler_h,v 1.11 2021/12/28 15:49:55 robert Exp $
|
||||
|
||||
Index: chrome/browser/ui/webui/settings/appearance_handler.h
|
||||
--- chrome/browser/ui/webui/settings/appearance_handler.h.orig
|
||||
+++ chrome/browser/ui/webui/settings/appearance_handler.h
|
||||
@@ -39,7 +39,7 @@ class AppearanceHandler : public SettingsPageUIHandler
|
||||
@@ -44,7 +44,7 @@ class AppearanceHandler : public SettingsPageUIHandler
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||
// of lacros-chrome is complete.
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user