MFH: r563103
www/chromium: update to 88.0.4324.96 Submitted by: Matthias Wolf (via github) Security: https://www.vuxml.org/freebsd/4ed0e43c-5cef-11eb-bafd-3065ec8fd3ec.html
This commit is contained in:
parent
c7c79ae036
commit
5ac9881e4f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/branches/2021Q1/; revision=563104
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= chromium
|
||||
PORTVERSION= 87.0.4280.141
|
||||
PORTVERSION= 88.0.4324.96
|
||||
CATEGORIES= www java
|
||||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
||||
LOCAL/rene/chromium/:fonts
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
TIMESTAMP = 1610013360
|
||||
SHA256 (chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
|
||||
SIZE (chromium-87.0.4280.141.tar.xz) = 856467564
|
||||
SHA256 (chromium-87.0.4280.141-testdata.tar.xz) = 210492a8c704bf47b92039e2564f73ebfbcc5ab605d23f66ba16547235a64539
|
||||
SIZE (chromium-87.0.4280.141-testdata.tar.xz) = 257414220
|
||||
TIMESTAMP = 1611041053
|
||||
SHA256 (chromium-88.0.4324.96.tar.xz) = 8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f
|
||||
SIZE (chromium-88.0.4324.96.tar.xz) = 857138392
|
||||
SHA256 (chromium-88.0.4324.96-testdata.tar.xz) = e68ae3559bd1645d4894f3f0712f999cc0e906367adc91615ae9a6d10bc1ee98
|
||||
SIZE (chromium-88.0.4324.96-testdata.tar.xz) = 257480820
|
||||
SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
|
||||
SIZE (test_fonts-85.tar.xz) = 9511984
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
--- build/config/compiler/pgo/pgo.gni.orig 2020-11-24 12:45:30 UTC
|
||||
--- build/config/compiler/pgo/pgo.gni.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/config/compiler/pgo/pgo.gni
|
||||
@@ -12,7 +12,7 @@ declare_args() {
|
||||
@@ -13,7 +13,7 @@ declare_args() {
|
||||
# 2 : Used during the PGO (optimization) phase.
|
||||
chrome_pgo_phase = 0
|
||||
if (is_official_build &&
|
||||
- (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only))) {
|
||||
+ (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only && !is_bsd))) {
|
||||
- (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast))) {
|
||||
+ (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) {
|
||||
chrome_pgo_phase = 2
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:42:21 UTC
|
||||
--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-01-18 21:31:51 UTC
|
||||
+++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
|
||||
@@ -16,7 +16,7 @@
|
||||
#if defined(OS_ANDROID)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- BUILD.gn.orig 2020-11-13 06:36:33 UTC
|
||||
--- BUILD.gn.orig 2021-01-18 21:28:44 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -422,7 +422,7 @@ group("gn_all") {
|
||||
@@ -424,7 +424,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
deps += [
|
||||
"//third_party/breakpad:breakpad_unittests",
|
||||
"//third_party/breakpad:core-2-minidump",
|
||||
@@ -463,8 +463,6 @@ group("gn_all") {
|
||||
@@ -467,8 +467,6 @@ group("gn_all") {
|
||||
"//net:disk_cache_memory_test",
|
||||
"//net:quic_client",
|
||||
"//net:quic_server",
|
||||
|
@ -18,7 +18,7 @@
|
|||
"//testing:empty_main",
|
||||
]
|
||||
|
||||
@@ -519,10 +517,6 @@ group("gn_all") {
|
||||
@@ -523,10 +521,6 @@ group("gn_all") {
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:sync_performance_tests",
|
||||
"//chrome/test/chromedriver:chromedriver",
|
||||
|
@ -29,7 +29,7 @@
|
|||
"//media/cast:generate_barcode_video",
|
||||
"//media/cast:generate_timecode_audio",
|
||||
"//net:crash_cache",
|
||||
@@ -582,10 +576,6 @@ group("gn_all") {
|
||||
@@ -586,10 +580,6 @@ group("gn_all") {
|
||||
"//mojo:mojo_perftests",
|
||||
"//services/service_manager/public/cpp",
|
||||
"//testing/gmock:gmock_main",
|
||||
|
@ -40,7 +40,7 @@
|
|||
]
|
||||
|
||||
if (!is_android) {
|
||||
@@ -663,7 +653,7 @@ group("gn_all") {
|
||||
@@ -667,7 +657,7 @@ group("gn_all") {
|
||||
host_os == "win") {
|
||||
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
|
||||
}
|
||||
|
@ -49,16 +49,16 @@
|
|||
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -678,7 +668,7 @@ group("gn_all") {
|
||||
@@ -682,7 +672,7 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
- if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) {
|
||||
+ if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) {
|
||||
- if (is_mac || is_win || is_android || is_linux || is_chromeos) {
|
||||
+ if (is_mac || is_win || is_android || (is_linux && !is_bsd) || is_chromeos) {
|
||||
deps += [
|
||||
"//third_party/crashpad/crashpad:crashpad_tests",
|
||||
"//third_party/crashpad/crashpad/handler:crashpad_handler",
|
||||
@@ -797,7 +787,6 @@ group("gn_all") {
|
||||
@@ -802,7 +792,6 @@ group("gn_all") {
|
||||
"//chrome/browser/vr:vr_common_perftests",
|
||||
"//chrome/browser/vr:vr_common_unittests",
|
||||
"//chrome/browser/vr:vr_pixeltests",
|
||||
|
@ -84,7 +84,7 @@
|
|||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1296,9 +1285,6 @@ group("chromium_builder_perf") {
|
||||
@@ -1320,9 +1309,6 @@ group("chromium_builder_perf") {
|
||||
|
||||
if (is_win) {
|
||||
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
--- apps/ui/views/app_window_frame_view.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- apps/ui/views/app_window_frame_view.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ apps/ui/views/app_window_frame_view.cc
|
||||
@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
|
||||
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
|
||||
const gfx::Rect& client_bounds) const {
|
||||
@@ -139,7 +139,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
|
||||
gfx::Rect window_bounds = client_bounds;
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
||||
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
// Get the difference between the widget's client area bounds and window
|
||||
// bounds, and grow |window_bounds| by that amount.
|
||||
gfx::Insets native_frame_insets =
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- ash/display/mirror_window_controller.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- ash/display/mirror_window_controller.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ ash/display/mirror_window_controller.cc
|
||||
@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
@@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
return info.id() == iter->first;
|
||||
}) == display_info_list.end()) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
|
|
@ -1,15 +1,6 @@
|
|||
--- base/BUILD.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/BUILD.gn.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -53,7 +53,7 @@ declare_args() {
|
||||
# replacement base::Location::Current(). On by default in non-official builds
|
||||
# for testing purposes.
|
||||
# TODO(https://crbug.com/974061): remove this eventually.
|
||||
- from_here_uses_location_builtins = !is_official_build
|
||||
+ from_here_uses_location_builtins = !is_official_build && !is_bsd
|
||||
|
||||
# Unsafe developer build. Has developer-friendly features that may weaken or
|
||||
# disable security measures like sandboxing or ASLR.
|
||||
@@ -878,7 +878,7 @@ component("base") {
|
||||
@@ -873,7 +873,7 @@ component("base") {
|
||||
"timer/hi_res_timer_manager_posix.cc",
|
||||
]
|
||||
|
||||
|
@ -18,7 +9,7 @@
|
|||
sources += [
|
||||
"cpu_affinity_posix.cc",
|
||||
"cpu_affinity_posix.h",
|
||||
@@ -889,6 +889,11 @@ component("base") {
|
||||
@@ -884,6 +884,11 @@ component("base") {
|
||||
"profiler/thread_delegate_posix.h",
|
||||
]
|
||||
}
|
||||
|
@ -30,7 +21,7 @@
|
|||
}
|
||||
|
||||
if (is_win) {
|
||||
@@ -1295,7 +1300,7 @@ component("base") {
|
||||
@@ -1293,7 +1298,7 @@ component("base") {
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
if (!use_sysroot &&
|
||||
|
@ -39,7 +30,7 @@
|
|||
host_toolchain != "//build/toolchain/cros:host") {
|
||||
libs += [ "atomic" ]
|
||||
}
|
||||
@@ -1342,7 +1347,7 @@ component("base") {
|
||||
@@ -1343,7 +1348,7 @@ component("base") {
|
||||
"allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc",
|
||||
]
|
||||
}
|
||||
|
@ -48,16 +39,7 @@
|
|||
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
|
||||
}
|
||||
if (is_win) {
|
||||
@@ -1811,7 +1816,7 @@ component("base") {
|
||||
]
|
||||
}
|
||||
|
||||
- if (is_linux || is_chromeos || is_android) {
|
||||
+ if ((is_linux || is_chromeos || is_android) && !is_bsd) {
|
||||
sources += [
|
||||
"allocator/partition_allocator/spinning_futex_linux.cc",
|
||||
"allocator/partition_allocator/spinning_futex_linux.h",
|
||||
@@ -1956,6 +1961,34 @@ component("base") {
|
||||
@@ -1969,6 +1974,34 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -92,8 +74,8 @@
|
|||
# iOS
|
||||
if (is_ios) {
|
||||
sources -= [
|
||||
@@ -3069,7 +3102,7 @@ test("base_unittests") {
|
||||
]
|
||||
@@ -3111,7 +3144,7 @@ test("base_unittests") {
|
||||
}
|
||||
}
|
||||
|
||||
- if (is_linux || is_chromeos) {
|
||||
|
@ -101,7 +83,7 @@
|
|||
sources += [ "debug/proc_maps_linux_unittest.cc" ]
|
||||
}
|
||||
|
||||
@@ -3110,7 +3143,7 @@ test("base_unittests") {
|
||||
@@ -3152,7 +3185,7 @@ test("base_unittests") {
|
||||
"posix/unix_domain_socket_unittest.cc",
|
||||
"task/thread_pool/task_tracker_posix_unittest.cc",
|
||||
]
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/allocator/allocator_shim_override_libc_symbols.h
|
||||
@@ -10,7 +10,7 @@
|
||||
@@ -16,6 +16,10 @@
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
#define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_
|
||||
|
||||
-#include <malloc.h>
|
||||
+#if defined(OS_BSD)
|
||||
+#include <stdlib.h>
|
||||
|
||||
+#endif
|
||||
+
|
||||
#include "base/allocator/allocator_shim_internals.h"
|
||||
|
||||
extern "C" {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/allocator/allocator_shim_unittest.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/allocator/allocator_shim_unittest.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/allocator/allocator_shim_unittest.cc
|
||||
@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
|
||||
|
||||
|
@ -36,12 +36,12 @@
|
|||
|
||||
#if !defined(OS_WIN)
|
||||
free(posix_memalign_ptr);
|
||||
@@ -595,7 +595,7 @@ static size_t GetAllocatedSize(void* ptr) {
|
||||
static size_t GetAllocatedSize(void* ptr) {
|
||||
@@ -595,7 +595,7 @@ static size_t GetUsableSize(void* ptr) {
|
||||
static size_t GetUsableSize(void* ptr) {
|
||||
return malloc_size(ptr);
|
||||
}
|
||||
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
static size_t GetAllocatedSize(void* ptr) {
|
||||
static size_t GetUsableSize(void* ptr) {
|
||||
return malloc_usable_size(ptr);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -26,7 +26,7 @@
|
||||
#if defined(OS_ANDROID)
|
||||
#include <sys/prctl.h>
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/partition_allocator/partition_alloc.cc.orig 2020-11-30 16:06:59 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc.cc
|
||||
@@ -197,6 +197,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
|
||||
@@ -65,6 +65,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
|
||||
// Check that some of our zanier calculations worked out as expected.
|
||||
#if ENABLE_TAG_FOR_MTE_CHECKED_PTR
|
||||
static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket");
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_unittest.cc
|
||||
@@ -333,9 +333,13 @@ void FreeFullPage(PartitionRoot<base::internal::Thread
|
||||
@@ -366,9 +366,13 @@ void FreeFullSlotSpan(PartitionRoot<base::internal::Th
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
|||
EXPECT_EQ(0, mincore(ptr, SystemPageSize(), &ret));
|
||||
return in_core == (ret & 1);
|
||||
}
|
||||
@@ -344,7 +348,7 @@ bool CheckPageInCore(void* ptr, bool in_core) {
|
||||
@@ -377,7 +381,7 @@ bool CheckPageInCore(void* ptr, bool in_core) {
|
||||
EXPECT_TRUE(CheckPageInCore(ptr, in_core))
|
||||
#else
|
||||
#define CHECK_PAGE_IN_CORE(ptr, in_core) (void)(0)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/cpu.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/cpu.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/cpu.cc
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
|
@ -9,15 +9,6 @@
|
|||
defined(OS_AIX)
|
||||
#include "base/containers/flat_set.h"
|
||||
#include "base/files/file_util.h"
|
||||
@@ -31,7 +31,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(ARCH_CPU_ARM_FAMILY) && \
|
||||
- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
+ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
#include "base/files/file_util.h"
|
||||
#endif
|
||||
|
||||
@@ -182,6 +182,14 @@ std::string* CpuInfoBrand() {
|
||||
|
||||
return brand;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/debug/stack_trace_posix.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/debug/stack_trace_posix.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <AvailabilityMacros.h>
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -697,7 +697,11 @@ class SandboxSymbolizeHelper {
|
||||
@@ -696,7 +696,11 @@ class SandboxSymbolizeHelper {
|
||||
// Skip regions with empty file names.
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/files/file_path_watcher_stub.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/files/file_path_watcher_stub.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/files/file_path_watcher_stub.cc
|
||||
@@ -1,14 +1,15 @@
|
||||
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
|
@ -22,17 +22,17 @@
|
|||
|
||||
@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
|
||||
bool Watch(const FilePath& path,
|
||||
bool recursive,
|
||||
Type type,
|
||||
const FilePathWatcher::Callback& callback) override {
|
||||
+#if defined(OS_BSD)
|
||||
+ DCHECK(!impl_.get());
|
||||
+ if (recursive) {
|
||||
+ if (type == Type::kRecursive) {
|
||||
+ return false;
|
||||
+ } else {
|
||||
+ impl_ = std::make_unique<FilePathWatcherKQueue>();
|
||||
+ }
|
||||
+ DCHECK(impl_.get());
|
||||
+ return impl_->Watch(path, recursive, callback);
|
||||
+ return impl_->Watch(path, type, callback);
|
||||
+#else
|
||||
return false;
|
||||
+#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/files/file_path_watcher_unittest.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/files/file_path_watcher_unittest.cc
|
||||
@@ -425,12 +425,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
@@ -438,12 +438,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
VLOG(1) << "Waiting for file1 creation";
|
||||
ASSERT_TRUE(WaitForEvents());
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
|||
|
||||
ASSERT_TRUE(base::DeleteFile(file1));
|
||||
VLOG(1) << "Waiting for file1 deletion";
|
||||
@@ -632,7 +632,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) {
|
||||
@@ -650,7 +650,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) {
|
||||
ASSERT_TRUE(WaitForEvents());
|
||||
}
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
|||
|
||||
// Verify that creating a symlink is caught.
|
||||
TEST_F(FilePathWatcherTest, CreateLink) {
|
||||
@@ -790,7 +790,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) {
|
||||
@@ -816,7 +816,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) {
|
||||
ASSERT_TRUE(WaitForEvents());
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
|||
|
||||
enum Permission {
|
||||
Read,
|
||||
@@ -798,7 +798,7 @@ enum Permission {
|
||||
@@ -824,7 +824,7 @@ enum Permission {
|
||||
Execute
|
||||
};
|
||||
|
||||
|
@ -42,7 +42,7 @@
|
|||
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
|
||||
struct stat stat_buf;
|
||||
|
||||
@@ -827,9 +827,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
@@ -853,9 +853,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
}
|
||||
return chmod(path.value().c_str(), stat_buf.st_mode) == 0;
|
||||
}
|
||||
|
@ -54,12 +54,12 @@
|
|||
// Linux implementation of FilePathWatcher doesn't catch attribute changes.
|
||||
// http://crbug.com/78043
|
||||
// Windows implementation of FilePathWatcher catches attribute changes that
|
||||
@@ -864,7 +864,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
|
||||
@@ -891,7 +891,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
|
||||
ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true));
|
||||
}
|
||||
|
||||
-#endif // OS_APPLE
|
||||
+#endif // OS_APPLE || OS_BSD
|
||||
} // namespace
|
||||
|
||||
} // namespace base
|
||||
#if defined(OS_MAC)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/files/file_util.h.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/files/file_util.h.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/files/file_util.h
|
||||
@@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat
|
||||
BASE_EXPORT bool ExecutableExistsInPath(Environment* env,
|
||||
|
@ -17,7 +17,7 @@
|
|||
|
||||
#endif // OS_POSIX
|
||||
|
||||
@@ -592,7 +592,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
|
||||
@@ -597,7 +597,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
|
||||
// the directory |path|, in the number of FilePath::CharType, or -1 on failure.
|
||||
BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/files/file_util_posix.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/files/file_util_posix.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -412,7 +412,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
|
||||
@@ -406,7 +406,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
|
||||
}
|
||||
|
||||
bool CreateLocalNonBlockingPipe(int fds[2]) {
|
||||
|
@ -9,7 +9,7 @@
|
|||
return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0;
|
||||
#else
|
||||
int raw_fds[2];
|
||||
@@ -947,8 +947,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si
|
||||
@@ -953,8 +953,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si
|
||||
// space. It can fail because the filesystem doesn't support it. In that case,
|
||||
// use the manual method below.
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
|||
return true;
|
||||
DPLOG(ERROR) << "fallocate";
|
||||
#elif defined(OS_APPLE)
|
||||
@@ -1172,7 +1176,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
|
||||
@@ -1178,7 +1182,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
|
||||
// posix_fadvise() is only available in the Android NDK in API 21+. Older
|
||||
// versions may have the required kernel support, but don't have enough usage
|
||||
// to justify backporting.
|
||||
|
@ -32,7 +32,7 @@
|
|||
(defined(OS_ANDROID) && __ANDROID_API__ >= 21)
|
||||
File file(file_path, File::FLAG_OPEN | File::FLAG_READ);
|
||||
if (!file.IsValid())
|
||||
@@ -1208,7 +1212,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
|
||||
@@ -1214,7 +1218,7 @@ PrefetchResult PreReadFile(const FilePath& file_path,
|
||||
return internal::PreReadFileSlow(file_path, max_bytes)
|
||||
? PrefetchResult{PrefetchResultCode::kSlowSuccess}
|
||||
: PrefetchResult{PrefetchResultCode::kSlowFailed};
|
||||
|
@ -41,7 +41,7 @@
|
|||
// __ANDROID_API__ >= 21)
|
||||
}
|
||||
|
||||
@@ -1243,7 +1247,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP
|
||||
@@ -1249,7 +1253,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP
|
||||
|
||||
#endif // !defined(OS_NACL_NONSFI)
|
||||
|
||||
|
@ -50,7 +50,7 @@
|
|||
BASE_EXPORT bool IsPathExecutable(const FilePath& path) {
|
||||
bool result = false;
|
||||
FilePath tmp_file_path;
|
||||
@@ -1264,6 +1268,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path
|
||||
@@ -1270,6 +1274,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/files/file_util_unittest.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/files/file_util_unittest.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/files/file_util_unittest.cc
|
||||
@@ -1639,7 +1639,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) {
|
||||
@@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) {
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
// This test will validate that files which would block when read result in a
|
||||
// failure on a call to ReadFileToStringNonBlocking. To accomplish this we will
|
||||
// use a named pipe because it appears as a file on disk and we can control how
|
||||
@@ -1672,7 +1672,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) {
|
||||
@@ -1671,7 +1671,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) {
|
||||
ASSERT_EQ(result.size(), 1u);
|
||||
EXPECT_EQ(result[0], 'a');
|
||||
}
|
||||
|
@ -18,7 +18,7 @@
|
|||
|
||||
TEST_F(FileUtilTest, MoveFileNew) {
|
||||
// Create a file
|
||||
@@ -3507,7 +3507,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
|
||||
@@ -3506,7 +3506,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
|
||||
}
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
|
||||
FilePath file_path("/proc/cpuinfo");
|
||||
std::string data = "temp";
|
||||
@@ -3525,7 +3525,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste
|
||||
@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste
|
||||
|
||||
EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4));
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/i18n/icu_util.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/i18n/icu_util.cc.orig 2021-01-18 21:28:44 UTC
|
||||
+++ base/i18n/icu_util.cc
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "third_party/icu/source/common/unicode/unistr.h"
|
||||
|
@ -9,8 +9,8 @@
|
|||
((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST))
|
||||
#include "third_party/icu/source/i18n/unicode/timezone.h"
|
||||
#endif
|
||||
@@ -341,7 +341,7 @@ void InitializeIcuTimeZone() {
|
||||
fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
|
||||
@@ -342,7 +342,7 @@ void InitializeIcuTimeZone() {
|
||||
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
|
||||
icu::TimeZone::adoptDefault(
|
||||
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
|
||||
-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_iterator_freebsd.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/process/process_iterator_freebsd.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/process/process_iterator_freebsd.cc
|
||||
@@ -10,6 +10,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
|
@ -20,6 +20,15 @@
|
|||
// If we get a mem error, it just means we need a bigger buffer, so
|
||||
// loop around again. Anything else is a real error and give up.
|
||||
if (errno != ENOMEM) {
|
||||
@@ -50,7 +54,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
}
|
||||
} else {
|
||||
// Got the list, just make sure we're sized exactly right
|
||||
- size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
kinfo_procs_.resize(num_of_kinfo_proc);
|
||||
done = true;
|
||||
}
|
||||
@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() {
|
||||
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
|
||||
size_t length;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/process/process_util_unittest.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/process/process_util_unittest.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/process/process_util_unittest.cc
|
||||
@@ -1307,11 +1307,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli
|
||||
@@ -1308,11 +1308,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli
|
||||
options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO);
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/system/sys_info.h.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/system/sys_info.h.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/system/sys_info.h
|
||||
@@ -202,6 +202,8 @@ class BASE_EXPORT SysInfo {
|
||||
@@ -208,6 +208,8 @@ class BASE_EXPORT SysInfo {
|
||||
// On Desktop this returns true when memory <= 512MB.
|
||||
static bool IsLowEndDevice();
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
private:
|
||||
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
|
||||
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
|
||||
@@ -211,7 +213,7 @@ class BASE_EXPORT SysInfo {
|
||||
@@ -217,7 +219,7 @@ class BASE_EXPORT SysInfo {
|
||||
static bool IsLowEndDeviceImpl();
|
||||
static HardwareInfo GetHardwareInfoSync();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/system/sys_info_unittest.cc.orig 2020-11-16 14:01:04 UTC
|
||||
--- base/system/sys_info_unittest.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/system/sys_info_unittest.cc
|
||||
@@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
|
||||
EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0);
|
||||
|
@ -24,18 +24,18 @@
|
|||
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
|
||||
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSDD)
|
||||
|
||||
#if defined(OS_FUCHSIA)
|
||||
// TODO(crbug.com/851734): Implementation depends on statvfs, which is not
|
||||
@@ -117,7 +117,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfTotalDiskSpace) {
|
||||
EXPECT_GT(SysInfo::AmountOfTotalDiskSpace(tmp_path), 0) << tmp_path.value();
|
||||
TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
|
||||
// We aren't actually testing that it's correct, just that it's sane.
|
||||
@@ -137,7 +137,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
|
||||
}
|
||||
#endif // defined(OS_FUCHSIA)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
|
||||
+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \
|
||||
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
|
||||
TEST_F(SysInfoTest, OperatingSystemVersionNumbers) {
|
||||
int32_t os_major_version = -1;
|
||||
@@ -178,7 +178,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
|
||||
@@ -198,7 +198,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
|
||||
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
|
||||
bool empty_result_expected =
|
||||
#if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/test/BUILD.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/test/BUILD.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/test/BUILD.gn
|
||||
@@ -415,7 +415,11 @@ if (is_linux || is_chromeos) {
|
||||
@@ -416,7 +416,11 @@ if (is_linux || is_chromeos) {
|
||||
|
||||
copy("fonts_conf") {
|
||||
sources = [ "fonts.conf" ]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/test/launcher/test_launcher.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/test/launcher/test_launcher.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/test/launcher/test_launcher.cc
|
||||
@@ -58,6 +58,7 @@
|
||||
@@ -57,6 +57,7 @@
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
#if defined(OS_POSIX)
|
||||
|
@ -8,7 +8,7 @@
|
|||
#include <fcntl.h>
|
||||
|
||||
#include "base/files/file_descriptor_watcher_posix.h"
|
||||
@@ -588,7 +589,7 @@ ChildProcessResults DoLaunchChildTestProcess(
|
||||
@@ -598,7 +599,7 @@ ChildProcessResults DoLaunchChildTestProcess(
|
||||
#if !defined(OS_FUCHSIA)
|
||||
options.new_process_group = true;
|
||||
#endif
|
||||
|
@ -17,7 +17,7 @@
|
|||
options.kill_on_parent_death = true;
|
||||
#endif
|
||||
|
||||
@@ -1529,7 +1530,7 @@ bool TestLauncher::Init(CommandLine* command_line) {
|
||||
@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) {
|
||||
results_tracker_.AddGlobalTag("OS_IOS");
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/threading/platform_thread_unittest.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/threading/platform_thread_unittest.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/threading/platform_thread_unittest.cc
|
||||
@@ -311,7 +311,7 @@ TEST(PlatformThreadTest,
|
||||
@@ -312,7 +312,7 @@ TEST(PlatformThreadTest,
|
||||
// and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
|
||||
// proprerty changes for a given platform.
|
||||
TEST(PlatformThreadTest, CanIncreaseThreadPriority) {
|
||||
|
@ -9,7 +9,7 @@
|
|||
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
|
||||
// able to increase priority to any level.
|
||||
constexpr bool kCanIncreasePriority = false;
|
||||
@@ -405,9 +405,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
|
||||
@@ -406,9 +406,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
|
||||
|
||||
TEST(PlatformThreadTest, GetDefaultThreadStackSize) {
|
||||
size_t stack_size = PlatformThread::GetDefaultThreadStackSize();
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/trace_event/malloc_dump_provider.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/trace_event/malloc_dump_provider.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/trace_event/malloc_dump_provider.cc
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
@@ -132,6 +134,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
|
||||
@@ -163,6 +165,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
|
||||
}
|
||||
#elif defined(OS_FUCHSIA)
|
||||
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/trace_event/process_memory_dump.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- base/trace_event/process_memory_dump.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ base/trace_event/process_memory_dump.cc
|
||||
@@ -95,7 +95,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
|
||||
@@ -100,7 +100,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
|
||||
#if defined(OS_WIN)
|
||||
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
|
||||
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
|
||||
|
|
|
@ -1,15 +1,6 @@
|
|||
--- build/config/BUILD.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- build/config/BUILD.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/config/BUILD.gn
|
||||
@@ -133,7 +133,7 @@ config("debug") {
|
||||
# builds, and we have to tell it to turn it off.
|
||||
defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
|
||||
}
|
||||
- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && enable_iterator_debugging) {
|
||||
+ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) {
|
||||
# Enable libstdc++ debugging facilities to help catch problems early, see
|
||||
# http://crbug.com/65151 .
|
||||
# TODO(phajdan.jr): Should we enable this for all of POSIX?
|
||||
@@ -231,9 +231,7 @@ config("default_libs") {
|
||||
@@ -232,9 +232,7 @@ config("default_libs") {
|
||||
]
|
||||
} else if (is_linux || is_chromeos) {
|
||||
libs = [
|
||||
|
@ -19,7 +10,7 @@
|
|||
]
|
||||
}
|
||||
}
|
||||
@@ -316,7 +314,7 @@ config("executable_config") {
|
||||
@@ -317,7 +315,7 @@ config("executable_config") {
|
||||
"//build/config/ios:ios_dynamic_flags",
|
||||
"//build/config/ios:ios_executable_flags",
|
||||
]
|
||||
|
|
|
@ -1,19 +1,6 @@
|
|||
--- build/config/BUILDCONFIG.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- build/config/BUILDCONFIG.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/config/BUILDCONFIG.gn
|
||||
@@ -131,10 +131,10 @@ declare_args() {
|
||||
is_official_build = false
|
||||
|
||||
# Whether we're a traditional desktop unix.
|
||||
- is_desktop_linux = current_os == "linux"
|
||||
+ is_desktop_linux = current_os == "linux" || current_os == "freebsd"
|
||||
|
||||
# Set to true when compiling with the Clang compiler.
|
||||
- is_clang = current_os != "linux" ||
|
||||
+ is_clang = current_os != "linux" || current_os == "freebsd" ||
|
||||
(current_cpu != "s390x" && current_cpu != "s390" &&
|
||||
current_cpu != "ppc64" && current_cpu != "ppc" &&
|
||||
current_cpu != "mips" && current_cpu != "mips64")
|
||||
@@ -186,8 +186,8 @@ if (host_toolchain == "") {
|
||||
@@ -183,8 +183,8 @@ if (host_toolchain == "") {
|
||||
# TODO(dpranke): Add some sort of assert here that verifies that
|
||||
# no toolchain omitted host_toolchain from its toolchain_args().
|
||||
|
||||
|
@ -24,7 +11,7 @@
|
|||
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
|
||||
} else if (is_clang) {
|
||||
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
|
||||
@@ -224,7 +224,7 @@ if (target_os == "android") {
|
||||
@@ -221,7 +221,7 @@ if (target_os == "android") {
|
||||
assert(host_os == "linux" || host_os == "mac",
|
||||
"Android builds are only supported on Linux and Mac hosts.")
|
||||
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
|
||||
|
@ -33,7 +20,7 @@
|
|||
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
|
||||
if (is_clang) {
|
||||
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
|
||||
@@ -285,10 +285,11 @@ if (custom_toolchain != "") {
|
||||
@@ -282,10 +282,11 @@ if (custom_toolchain != "") {
|
||||
# current_os value directly.
|
||||
|
||||
is_android = current_os == "android"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/compiler/BUILD.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- build/config/compiler/BUILD.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -128,7 +128,7 @@ declare_args() {
|
||||
@@ -129,7 +129,7 @@ declare_args() {
|
||||
#
|
||||
# TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may
|
||||
# call an old clang that doesn't support auto-init.
|
||||
|
@ -17,8 +17,8 @@
|
|||
+ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") {
|
||||
ldflags += [ "-Wl,--fatal-warnings" ]
|
||||
}
|
||||
if (fatal_linker_warnings && is_apple &&
|
||||
@@ -389,7 +389,7 @@ config("compiler") {
|
||||
if (fatal_linker_warnings && is_apple) {
|
||||
@@ -387,7 +387,7 @@ config("compiler") {
|
||||
|
||||
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
|
||||
# the executable they are loaded into, so they are unresolved at link-time.
|
||||
|
@ -27,7 +27,7 @@
|
|||
ldflags += [
|
||||
"-Wl,-z,defs",
|
||||
"-Wl,--as-needed",
|
||||
@@ -480,7 +480,7 @@ config("compiler") {
|
||||
@@ -478,7 +478,7 @@ config("compiler") {
|
||||
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
|
||||
|
||||
cflags += [
|
||||
@@ -776,7 +776,7 @@ config("compiler_cpu_abi") {
|
||||
@@ -777,7 +777,7 @@ config("compiler_cpu_abi") {
|
||||
cflags += [ "-mtune=$arm_tune" ]
|
||||
}
|
||||
} else if (current_cpu == "arm64") {
|
||||
|
@ -45,7 +45,7 @@
|
|||
cflags += [ "--target=aarch64-linux-gnu" ]
|
||||
ldflags += [ "--target=aarch64-linux-gnu" ]
|
||||
}
|
||||
@@ -1129,7 +1129,7 @@ config("compiler_deterministic") {
|
||||
@@ -1127,7 +1127,7 @@ config("compiler_deterministic") {
|
||||
"-Xclang",
|
||||
".",
|
||||
]
|
||||
|
@ -54,7 +54,7 @@
|
|||
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
|
||||
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
|
||||
}
|
||||
@@ -1512,7 +1512,7 @@ config("default_warnings") {
|
||||
@@ -1510,7 +1510,7 @@ config("default_warnings") {
|
||||
cflags += [ "-Wno-nonportable-include-path" ]
|
||||
}
|
||||
|
||||
|
@ -63,7 +63,7 @@
|
|||
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
|
||||
# recognize.
|
||||
cflags += [
|
||||
@@ -1686,7 +1686,7 @@ config("no_chromium_code") {
|
||||
@@ -1685,7 +1685,7 @@ config("no_chromium_code") {
|
||||
# suppressing them individually, we just blanket suppress them here.
|
||||
"-Wno-unused-variable",
|
||||
]
|
||||
|
@ -72,7 +72,7 @@
|
|||
cflags += [
|
||||
# TODO(https://crbug.com/1031169): Clean up and enable.
|
||||
"-Wno-misleading-indentation",
|
||||
@@ -1764,7 +1764,7 @@ config("thin_archive") {
|
||||
@@ -1763,7 +1763,7 @@ config("thin_archive") {
|
||||
# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
|
||||
# have a "thin archive" mode (it does accept -T, but it means truncating
|
||||
# archive names to 16 characters, which is not what we want).
|
||||
|
@ -81,7 +81,7 @@
|
|||
arflags = [ "-T" ]
|
||||
} else if (is_win && use_lld) {
|
||||
arflags = [ "/llvmlibthin" ]
|
||||
@@ -2297,7 +2297,7 @@ config("symbols") {
|
||||
@@ -2317,7 +2317,7 @@ config("symbols") {
|
||||
# flag, so we can use use -g1 for pnacl and nacl-clang compiles.
|
||||
# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
|
||||
if (!is_nacl || is_clang) {
|
||||
|
@ -90,7 +90,7 @@
|
|||
}
|
||||
|
||||
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
|
||||
@@ -2339,7 +2339,7 @@ config("symbols") {
|
||||
@@ -2349,7 +2349,7 @@ config("symbols") {
|
||||
# DWARF info may be corrupt; offsets in a range list entry are in different
|
||||
# sections" there. Maybe just a bug in nacl_switch_32.S.
|
||||
if (!is_apple && !is_nacl && current_cpu != "x86" &&
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/compiler/compiler.gni.orig 2020-11-13 06:36:34 UTC
|
||||
--- build/config/compiler/compiler.gni.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/config/compiler/compiler.gni
|
||||
@@ -192,7 +192,7 @@ declare_args() {
|
||||
@@ -196,7 +196,7 @@ declare_args() {
|
||||
declare_args() {
|
||||
# Whether to use the gold linker from binutils instead of lld or bfd.
|
||||
use_gold =
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- ui/ozone/ozone.gni.orig 2020-11-16 15:29:43 UTC
|
||||
+++ ui/ozone/ozone.gni
|
||||
--- build/config/ozone.gni.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/config/ozone.gni
|
||||
@@ -69,6 +69,9 @@ declare_args() {
|
||||
ozone_platform = "x11"
|
||||
ozone_platform_drm = true
|
||||
|
@ -7,6 +7,6 @@
|
|||
+ } else if (is_bsd) {
|
||||
+ ozone_platform = "x11"
|
||||
+ ozone_platform_x11 = true
|
||||
} else if (is_desktop_linux) {
|
||||
} else if (is_linux) {
|
||||
ozone_platform = "x11"
|
||||
ozone_platform_wayland = true
|
|
@ -1,4 +1,4 @@
|
|||
--- build/toolchain/gcc_toolchain.gni.orig 2020-11-13 06:36:34 UTC
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/toolchain/gcc_toolchain.gni
|
||||
@@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) {
|
||||
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
|
||||
|
@ -12,7 +12,7 @@
|
|||
# This template defines a toolchain for something that works like gcc
|
||||
# (including clang).
|
||||
#
|
||||
@@ -641,13 +646,23 @@ template("clang_toolchain") {
|
||||
@@ -626,13 +631,23 @@ template("clang_toolchain") {
|
||||
}
|
||||
|
||||
gcc_toolchain(target_name) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/toolchain/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- build/toolchain/linux/BUILD.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ build/toolchain/linux/BUILD.gn
|
||||
@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") {
|
||||
@@ -23,7 +23,6 @@ clang_toolchain("clang_arm") {
|
||||
}
|
||||
|
||||
clang_toolchain("clang_arm64") {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- cc/BUILD.gn.orig 2020-11-13 06:36:34 UTC
|
||||
--- cc/BUILD.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ cc/BUILD.gn
|
||||
@@ -615,7 +615,7 @@ cc_test_static_library("test_support") {
|
||||
@@ -620,7 +620,7 @@ cc_test_static_library("test_support") {
|
||||
if (enable_vulkan) {
|
||||
deps += [ "//gpu/vulkan/init" ]
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
|||
data_deps = [ "//third_party/mesa_headers" ]
|
||||
}
|
||||
}
|
||||
@@ -824,7 +824,6 @@ cc_test("cc_unittests") {
|
||||
@@ -832,7 +832,6 @@ cc_test("cc_unittests") {
|
||||
]
|
||||
data_deps = [
|
||||
"//testing/buildbot/filters:cc_unittests_filters",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- cc/test/layer_tree_test.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- cc/test/layer_tree_test.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ cc/test/layer_tree_test.cc
|
||||
@@ -669,7 +669,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere
|
||||
@@ -676,7 +676,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere
|
||||
init_vulkan = true;
|
||||
} else if (renderer_type_ == viz::RendererType::kSkiaDawn) {
|
||||
scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- cc/trees/property_tree.cc.orig 2020-11-13 06:36:34 UTC
|
||||
--- cc/trees/property_tree.cc.orig 2021-01-18 21:28:45 UTC
|
||||
+++ cc/trees/property_tree.cc
|
||||
@@ -1285,13 +1285,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
|
||||
@@ -1295,13 +1295,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
|
||||
|
||||
gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/BUILD.gn.orig 2020-11-16 16:03:08 UTC
|
||||
--- chrome/BUILD.gn.orig 2021-01-18 21:28:45 UTC
|
||||
+++ chrome/BUILD.gn
|
||||
@@ -1214,6 +1214,10 @@ group("browser_dependencies") {
|
||||
@@ -1227,6 +1227,10 @@ group("browser_dependencies") {
|
||||
public_deps += [ "//chromeos/lacros" ]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/BUILD.gn.orig 2020-11-13 06:36:35 UTC
|
||||
--- chrome/app/BUILD.gn.orig 2021-01-18 21:28:46 UTC
|
||||
+++ chrome/app/BUILD.gn
|
||||
@@ -140,7 +140,7 @@ static_library("test_support") {
|
||||
@@ -143,7 +143,7 @@ static_library("test_support") {
|
||||
"//v8:v8_headers",
|
||||
]
|
||||
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
--- chrome/app/chrome_main.cc.orig 2020-11-13 06:36:35 UTC
|
||||
--- chrome/app/chrome_main.cc.orig 2021-01-18 21:28:46 UTC
|
||||
+++ chrome/app/chrome_main.cc
|
||||
@@ -109,12 +109,12 @@ int ChromeMain(int argc, const char** argv) {
|
||||
@@ -119,12 +119,12 @@ int ChromeMain(int argc, const char** argv) {
|
||||
MainThreadStackSamplingProfiler scoped_sampling_profiler;
|
||||
|
||||
// Chrome-specific process modes.
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
- defined(OS_WIN)
|
||||
+ defined(OS_WIN) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \
|
||||
defined(OS_WIN)
|
||||
if (command_line->HasSwitch(switches::kHeadless)) {
|
||||
return headless::HeadlessShellMain(params);
|
||||
}
|
||||
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ||
|
||||
- // defined(OS_WIN)
|
||||
+ // defined(OS_WIN) || defined(OS_BSD)
|
||||
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ||
|
||||
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) ||
|
||||
// defined(OS_WIN)
|
||||
|
||||
int rv = content::ContentMain(params);
|
||||
|
||||
|
|
|
@ -1,15 +1,6 @@
|
|||
--- chrome/app/chrome_main_delegate.cc.orig 2020-11-13 06:36:35 UTC
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2021-01-18 21:28:46 UTC
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -108,7 +108,7 @@
|
||||
#include "chrome/app/shutdown_signal_handlers_posix.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
#include "components/nacl/common/nacl_paths.h"
|
||||
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
|
||||
#endif
|
||||
@@ -147,12 +147,12 @@
|
||||
@@ -148,12 +148,12 @@
|
||||
#include "v8/include/v8.h"
|
||||
#endif
|
||||
|
||||
|
@ -24,12 +15,12 @@
|
|||
#include "chrome/browser/policy/policy_path_parser.h"
|
||||
#include "components/crash/core/app/crashpad.h"
|
||||
#endif
|
||||
@@ -258,7 +258,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
|
||||
@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
|
||||
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
void AdjustLinuxOOMScore(const std::string& process_type) {
|
||||
int score = -1;
|
||||
|
||||
|
@ -38,7 +29,7 @@
|
|||
base::AdjustOOMScore(base::GetCurrentProcId(), score);
|
||||
}
|
||||
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
|
||||
// Returns true if this subprocess type needs the ResourceBundle initialized
|
||||
// and resources loaded.
|
||||
|
@ -49,7 +40,7 @@
|
|||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
||||
@@ -339,7 +339,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
@@ -338,7 +338,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -58,7 +49,7 @@
|
|||
// Show the man page if --help or -h is on the command line.
|
||||
void HandleHelpSwitches(const base::CommandLine& command_line) {
|
||||
if (command_line.HasSwitch(switches::kHelp) ||
|
||||
@@ -349,7 +349,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
@@ -348,7 +348,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
PLOG(FATAL) << "execlp failed";
|
||||
}
|
||||
}
|
||||
|
@ -67,7 +58,7 @@
|
|||
|
||||
#if !defined(OS_MAC) && !defined(OS_ANDROID)
|
||||
void SIGTERMProfilingShutdown(int signal) {
|
||||
@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
@@ -402,7 +402,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
|
@ -76,7 +67,7 @@
|
|||
// On Linux, Chrome does not support running multiple copies under different
|
||||
// DISPLAYs, so the profile directory can be specified in the environment to
|
||||
// support the virtual desktop use-case.
|
||||
@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
|
||||
}
|
||||
}
|
||||
|
@ -85,7 +76,7 @@
|
|||
#if defined(OS_MAC)
|
||||
policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
|
||||
#endif // OS_MAC
|
||||
@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
|
||||
@@ -486,7 +486,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
|
||||
#endif
|
||||
|
||||
#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
|
||||
|
@ -94,16 +85,16 @@
|
|||
// Record the startup process creation time on supported platforms. On Android
|
||||
// this is recorded in ChromeMainDelegateAndroid.
|
||||
startup_metric_utils::RecordStartupProcessCreationTime(
|
||||
@@ -705,7 +705,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
@@ -709,7 +709,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
v8_crashpad_support::SetUp();
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
if (!crash_reporter::IsCrashpadEnabled()) {
|
||||
breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
|
||||
}
|
||||
@@ -716,7 +716,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
@@ -720,7 +720,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
*exit_code = 0;
|
||||
return true; // Got a --version switch; exit with a success error code.
|
||||
}
|
||||
|
@ -112,16 +103,7 @@
|
|||
// This will directly exit if the user asked for help.
|
||||
HandleHelpSwitches(command_line);
|
||||
#endif
|
||||
@@ -744,7 +744,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
|
||||
#if defined(OS_CHROMEOS)
|
||||
chromeos::RegisterPathProvider();
|
||||
#endif
|
||||
-#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
nacl::RegisterPathProvider();
|
||||
#endif
|
||||
|
||||
@@ -924,7 +924,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
|
||||
crash_reporter::InitializeCrashKeys();
|
||||
|
||||
|
@ -130,7 +112,7 @@
|
|||
ChromeCrashReporterClient::Create();
|
||||
#endif
|
||||
|
||||
@@ -937,7 +937,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -941,7 +941,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
child_process_logging::Init();
|
||||
#endif
|
||||
#if defined(ARCH_CPU_ARM_FAMILY) && \
|
||||
|
@ -139,7 +121,7 @@
|
|||
// Create an instance of the CPU class to parse /proc/cpuinfo and cache
|
||||
// cpu_brand info.
|
||||
base::CPU cpu_info;
|
||||
@@ -1056,7 +1056,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
locale;
|
||||
}
|
||||
|
||||
|
@ -148,7 +130,7 @@
|
|||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -1077,7 +1077,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1079,7 +1079,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
}
|
||||
#endif // defined(OS_ANDROID)
|
||||
}
|
||||
|
@ -157,16 +139,16 @@
|
|||
|
||||
#if defined(OS_ANDROID)
|
||||
CHECK_EQ(base::android::GetLibraryProcessType(),
|
||||
@@ -1097,7 +1097,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -1099,7 +1099,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
|
||||
// Note: If you are adding a new process type below, be sure to adjust the
|
||||
// AdjustLinuxOOMScore function too.
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
AdjustLinuxOOMScore(process_type);
|
||||
#endif
|
||||
#if defined(OS_WIN)
|
||||
@@ -1139,7 +1139,7 @@ int ChromeMainDelegate::RunProcess(
|
||||
@@ -1141,7 +1141,7 @@ int ChromeMainDelegate::RunProcess(
|
||||
|
||||
// This entry is not needed on Linux, where the NaCl loader
|
||||
// process is launched via nacl_helper instead.
|
||||
|
@ -175,21 +157,21 @@
|
|||
{switches::kNaClLoaderProcess, NaClMain},
|
||||
#else
|
||||
{"<invalid>", nullptr}, // To avoid constant array of size 0
|
||||
@@ -1167,7 +1167,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
|
||||
@@ -1169,7 +1169,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
|
||||
#endif // !defined(OS_ANDROID)
|
||||
}
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
void ChromeMainDelegate::ZygoteStarting(
|
||||
std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
|
||||
#if defined(OS_CHROMEOS)
|
||||
@@ -1204,7 +1204,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
||||
@@ -1206,7 +1206,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
||||
crash_keys::SetCrashKeysFromCommandLine(*command_line);
|
||||
}
|
||||
|
||||
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
|
||||
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS))
|
||||
|
||||
content::ContentClient* ChromeMainDelegate::CreateContentClient() {
|
||||
return &chrome_content_client_;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/generated_resources.grd.orig 2020-11-13 06:36:35 UTC
|
||||
--- chrome/app/generated_resources.grd.orig 2021-01-18 21:28:46 UTC
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -5245,7 +5245,7 @@ Keep your key file in a safe place. You will need it t
|
||||
@@ -5263,7 +5263,7 @@ Keep your key file in a safe place. You will need it t
|
||||
</if>
|
||||
|
||||
<!-- chrome://browser-switch strings -->
|
||||
|
@ -9,7 +9,7 @@
|
|||
<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
|
||||
Legacy Browser Support
|
||||
</message>
|
||||
@@ -7236,7 +7236,7 @@ the Bookmarks menu.">
|
||||
@@ -7269,7 +7269,7 @@ the Bookmarks menu.">
|
||||
Google Pay
|
||||
</message>
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
|
||||
Use system title bar and borders
|
||||
</message>
|
||||
@@ -8212,7 +8212,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
@@ -8257,7 +8257,7 @@ Please help our engineers fix this problem. Tell us wh
|
||||
Set as default
|
||||
</message>
|
||||
|
||||
|
|
11
www/chromium/files/patch-chrome_app_profiles__strings.grdp
Normal file
11
www/chromium/files/patch-chrome_app_profiles__strings.grdp
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- chrome/app/profiles_strings.grdp.orig 2021-01-20 14:08:57 UTC
|
||||
+++ chrome/app/profiles_strings.grdp
|
||||
@@ -87,7 +87,7 @@
|
||||
Add Profile...
|
||||
</message>
|
||||
</if>
|
||||
- <if expr="is_linux">
|
||||
+ <if expr="is_posix">
|
||||
<message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile.">
|
||||
Add profile...
|
||||
</message>
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/BUILD.gn.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/BUILD.gn.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -4999,7 +4999,7 @@ static_library("browser") {
|
||||
@@ -5161,7 +5161,7 @@ static_library("browser") {
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,15 @@
|
|||
--- chrome/browser/about_flags.cc.orig 2020-11-16 14:15:55 UTC
|
||||
--- chrome/browser/about_flags.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/about_flags.cc
|
||||
@@ -881,7 +881,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
|
||||
@@ -188,7 +188,7 @@
|
||||
#include "ui/gl/gl_switches.h"
|
||||
#include "ui/native_theme/native_theme_features.h"
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
#include "base/allocator/buildflags.h"
|
||||
#endif
|
||||
|
||||
@@ -886,7 +886,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
|
||||
heap_profiling::kMemlogSamplingRate5MB},
|
||||
};
|
||||
|
||||
|
@ -9,7 +18,7 @@
|
|||
defined(OS_WIN)
|
||||
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
|
||||
{"DocumentUseServerScore", "true"},
|
||||
@@ -1231,7 +1231,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
|
||||
@@ -1236,7 +1236,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -17,8 +26,8 @@
|
|||
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) ||
|
||||
// defined(OS_WIN)
|
||||
|
||||
const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = {
|
||||
@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
const FeatureEntry::FeatureVariation
|
||||
@@ -2869,7 +2869,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)},
|
||||
#endif // OS_CHROMEOS
|
||||
|
||||
|
@ -27,7 +36,7 @@
|
|||
{
|
||||
"enable-accelerated-video-decode",
|
||||
flag_descriptions::kAcceleratedVideoDecodeName,
|
||||
@@ -2873,7 +2873,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -2885,7 +2885,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsMac | kOsWin | kOsCrOS | kOsAndroid,
|
||||
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
|
||||
},
|
||||
|
@ -36,23 +45,7 @@
|
|||
{
|
||||
"disable-accelerated-video-encode",
|
||||
flag_descriptions::kAcceleratedVideoEncodeName,
|
||||
@@ -2979,13 +2979,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kForceEnableDevicesPageName,
|
||||
flag_descriptions::kForceEnableDevicesPageDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kForceEnableDevicesPage)},
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
{"enable-webgl2-compute-context",
|
||||
flag_descriptions::kWebGL2ComputeContextName,
|
||||
flag_descriptions::kWebGL2ComputeContextDescription,
|
||||
kOsWin | kOsLinux | kOsCrOS,
|
||||
SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)},
|
||||
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
{"enable-webgl-draft-extensions",
|
||||
flag_descriptions::kWebglDraftExtensionsName,
|
||||
flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
|
||||
@@ -3182,7 +3182,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3208,7 +3208,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)},
|
||||
#endif // OS_ANDROID
|
||||
|
@ -61,16 +54,16 @@
|
|||
{"enable-save-data", flag_descriptions::kEnableSaveDataName,
|
||||
flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
|
||||
SINGLE_VALUE_TYPE(
|
||||
@@ -3192,7 +3192,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kEnableNavigationPredictorDescription,
|
||||
kOsCrOS | kOsLinux,
|
||||
FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)},
|
||||
@@ -3222,7 +3222,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kEnableNavigationPredictorRendererWarmupName,
|
||||
flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription,
|
||||
kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)},
|
||||
-#endif // OS_CHROMEOS || OS_LINUX
|
||||
+#endif // OS_CHROMEOS || OS_LINUX || OS_BSD
|
||||
{"enable-preconnect-to-search",
|
||||
flag_descriptions::kEnablePreconnectToSearchName,
|
||||
flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
|
||||
@@ -3990,7 +3990,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3977,7 +3977,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsAll,
|
||||
FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)},
|
||||
|
||||
|
@ -79,7 +72,7 @@
|
|||
defined(OS_WIN)
|
||||
{"omnibox-experimental-keyword-mode",
|
||||
flag_descriptions::kOmniboxExperimentalKeywordModeName,
|
||||
@@ -4067,7 +4067,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4054,7 +4054,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kBookmarkPaths,
|
||||
kOmniboxBookmarkPathsVariations,
|
||||
"OmniboxBundledExperimentV1")},
|
||||
|
@ -88,7 +81,7 @@
|
|||
// defined(OS_WIN)
|
||||
|
||||
{"enable-speculative-service-worker-start-on-query-input",
|
||||
@@ -4376,14 +4376,14 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4344,14 +4344,14 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kClickToOpenPDFDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
|
||||
|
||||
|
@ -105,7 +98,7 @@
|
|||
// defined(OS_CHROMEOS)
|
||||
|
||||
#if !defined(OS_ANDROID)
|
||||
@@ -5083,7 +5083,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(kClickToCallUI)},
|
||||
#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
|
||||
|
||||
|
@ -114,7 +107,7 @@
|
|||
defined(OS_CHROMEOS)
|
||||
{"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName,
|
||||
flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop,
|
||||
@@ -5100,7 +5100,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5060,7 +5060,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kRemoteCopyProgressNotificationName,
|
||||
flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)},
|
||||
|
@ -123,16 +116,16 @@
|
|||
// defined(OS_CHROMEOS)
|
||||
|
||||
{"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName,
|
||||
@@ -5687,7 +5687,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(autofill::features::kAutofillTouchToFill)},
|
||||
#endif // defined(OS_ANDROID)
|
||||
@@ -5643,7 +5643,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
|
||||
defined(OS_CHROMEOS)
|
||||
{"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
|
||||
flag_descriptions::kGlobalMediaControlsDescription,
|
||||
@@ -5728,7 +5728,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5684,7 +5684,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kGlobalMediaControlsOverlayControlsDescription,
|
||||
kOsWin | kOsMac | kOsLinux,
|
||||
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)},
|
||||
|
@ -141,7 +134,7 @@
|
|||
// defined(OS_CHROMEOS)
|
||||
|
||||
#if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
|
||||
@@ -5914,7 +5914,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5861,7 +5861,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(
|
||||
password_manager::features::kEnablePasswordsAccountStorage)},
|
||||
|
||||
|
@ -150,7 +143,7 @@
|
|||
defined(OS_CHROMEOS)
|
||||
{"passwords-account-storage-iph",
|
||||
flag_descriptions::kEnablePasswordsAccountStorageIPHName,
|
||||
@@ -5922,7 +5922,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5869,7 +5869,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsWin | kOsMac | kOsLinux,
|
||||
FEATURE_VALUE_TYPE(
|
||||
feature_engagement::kIPHPasswordsAccountStorageFeature)},
|
||||
|
@ -159,7 +152,7 @@
|
|||
// defined(OS_CHROMEOS)
|
||||
|
||||
{"autofill-always-return-cloud-tokenized-card",
|
||||
@@ -6655,7 +6655,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6602,7 +6602,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)},
|
||||
#endif
|
||||
|
||||
|
@ -168,19 +161,20 @@
|
|||
defined(OS_CHROMEOS)
|
||||
{"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName,
|
||||
flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop,
|
||||
@@ -6689,13 +6689,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6636,14 +6636,14 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kMuteNotificationsDuringScreenShare)},
|
||||
#endif // !defined(OS_ANDROID)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
|
||||
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
|
||||
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
{"enable-ephemeral-guest-profiles-on-desktop",
|
||||
flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName,
|
||||
flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription,
|
||||
kOsWin | kOsLinux | kOsMac,
|
||||
FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)},
|
||||
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
|
||||
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
|
||||
-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ||
|
||||
+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ||
|
||||
// defined(OS_MAC)
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
{"decouple-sync-from-android-auto-sync",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
|
||||
@@ -86,7 +86,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
|
||||
@@ -87,7 +87,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
|
||||
return metrics::OmniboxInputType::QUERY;
|
||||
|
||||
case ExternalProtocolHandler::UNKNOWN: {
|
||||
|
@ -9,7 +9,7 @@
|
|||
// Linux impl of GetApplicationNameForProtocol doesn't distinguish
|
||||
// between URL schemes with handers and those without. This will
|
||||
// make the default behaviour be search on Linux.
|
||||
@@ -99,7 +99,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
|
||||
@@ -100,7 +100,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
|
||||
shell_integration::GetApplicationNameForProtocol(url);
|
||||
return application_name.empty() ? metrics::OmniboxInputType::EMPTY
|
||||
: metrics::OmniboxInputType::URL;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/background/background_mode_manager.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/background/background_mode_manager.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/background/background_mode_manager.cc
|
||||
@@ -849,7 +849,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
|
||||
@@ -850,7 +850,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
|
||||
return gfx::ImageSkia();
|
||||
|
||||
return family->CreateExact(size).AsImageSkia();
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- chrome/browser/browser_resources.grd.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/browser_resources.grd.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/browser_resources.grd
|
||||
@@ -67,7 +67,7 @@
|
||||
<include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" use_base_dir="false" type="BINDATA" />
|
||||
@@ -78,7 +78,7 @@
|
||||
<include name="IDR_DISCARDS_SITE_DATA_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\discards\site_data.mojom-webui.js" use_base_dir="false" type="BINDATA" />
|
||||
<include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" />
|
||||
</if>
|
||||
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/chrome_browser_interface_binders.cc
|
||||
@@ -128,7 +128,7 @@
|
||||
@@ -135,7 +135,7 @@
|
||||
#include "media/mojo/mojom/speech_recognition_service.mojom.h"
|
||||
#endif
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
defined(OS_CHROMEOS)
|
||||
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
|
||||
#include "chrome/browser/ui/webui/discards/discards_ui.h"
|
||||
@@ -733,7 +733,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
@@ -775,7 +775,7 @@ void PopulateChromeWebUIFrameBinders(
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_browser_main.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -246,7 +246,7 @@
|
||||
@@ -247,7 +247,7 @@
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
|
||||
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
|
||||
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
|
||||
@@ -925,7 +925,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -926,7 +926,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
|
||||
}
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
// Create directory for user-level Native Messaging manifest files. This
|
||||
// makes it less likely that the directory will be created by third-party
|
||||
// software with incorrect owner or permission. See crbug.com/725513 .
|
||||
@@ -934,7 +934,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
&user_native_messaging_dir));
|
||||
if (!base::PathExists(user_native_messaging_dir))
|
||||
base::CreateDirectory(user_native_messaging_dir);
|
||||
|
@ -27,7 +27,7 @@
|
|||
}
|
||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
|
||||
@@ -956,7 +956,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -957,7 +957,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
#endif // defined(OS_MAC)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
@ -36,7 +36,7 @@
|
|||
metrics::DesktopSessionDurationTracker::Initialize();
|
||||
ProfileActivityMetricsRecorder::Initialize();
|
||||
TouchModeStatsTracker::Initialize(
|
||||
@@ -1113,6 +1113,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
|
||||
@@ -1114,6 +1114,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
|
||||
base::TimeDelta::FromMinutes(1));
|
||||
|
||||
#if !defined(OS_ANDROID)
|
||||
|
@ -44,7 +44,7 @@
|
|||
if (base::FeatureList::IsEnabled(features::kWebUsb)) {
|
||||
web_usb_detector_.reset(new WebUsbDetector());
|
||||
content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
|
||||
@@ -1120,6 +1121,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
|
||||
@@ -1121,6 +1122,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
|
||||
base::BindOnce(&WebUsbDetector::Initialize,
|
||||
base::Unretained(web_usb_detector_.get())));
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_content_browser_client.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -424,7 +424,7 @@
|
||||
@@ -432,7 +432,7 @@
|
||||
#include "components/user_manager/user.h"
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#elif defined(OS_ANDROID)
|
||||
#include "base/android/application_status_listener.h"
|
||||
@@ -482,7 +482,7 @@
|
||||
@@ -490,7 +490,7 @@
|
||||
#endif // !defined(OS_ANDROID)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
@ -18,7 +18,7 @@
|
|||
#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
|
||||
#endif
|
||||
|
||||
@@ -514,7 +514,7 @@
|
||||
@@ -522,7 +522,7 @@
|
||||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
|
||||
#endif
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -833,11 +833,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
|
||||
@@ -849,11 +849,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
|
||||
}
|
||||
|
||||
int GetCrashSignalFD(const base::CommandLine& command_line) {
|
||||
|
@ -41,25 +41,25 @@
|
|||
|
||||
// Extensions have the same process type as renderers.
|
||||
if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
|
||||
@@ -1354,7 +1356,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
@@ -1378,7 +1380,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
#elif defined(OS_CHROMEOS)
|
||||
main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
|
||||
parameters, startup_data_);
|
||||
parameters, &startup_data_);
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
main_parts =
|
||||
std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
|
||||
std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_);
|
||||
#elif defined(OS_ANDROID)
|
||||
@@ -1380,7 +1382,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
// Construct additional browser parts. Stages are called in the order in
|
||||
// which they are added.
|
||||
#if defined(TOOLKIT_VIEWS)
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
|
||||
@@ -1407,7 +1409,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
|
||||
#if BUILDFLAG(IS_LACROS)
|
||||
main_parts->AddParts(
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
|
||||
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
|
||||
main_parts->AddParts(
|
||||
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
|
||||
#else
|
||||
@@ -2134,7 +2136,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -2168,7 +2170,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
|
@ -68,7 +68,7 @@
|
|||
#if defined(OS_ANDROID)
|
||||
bool enable_crash_reporter = true;
|
||||
#else
|
||||
@@ -3728,7 +3730,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
@@ -3725,7 +3727,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -77,7 +77,7 @@
|
|||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -3763,7 +3765,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
|
||||
@@ -3760,7 +3762,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
|
||||
mappings->Share(kCrashDumpSignal, crash_signal_fd);
|
||||
}
|
||||
}
|
||||
|
@ -86,16 +86,16 @@
|
|||
|
||||
#if defined(OS_WIN)
|
||||
base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
|
||||
@@ -3852,7 +3854,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri
|
||||
@@ -3848,7 +3850,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri
|
||||
|
||||
void ChromeContentBrowserClient::WillStartServiceManager() {
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
|
||||
if (startup_data_) {
|
||||
auto* chrome_feature_list_creator =
|
||||
startup_data_->chrome_feature_list_creator();
|
||||
@@ -4094,7 +4096,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
auto* chrome_feature_list_creator =
|
||||
startup_data_.chrome_feature_list_creator();
|
||||
// This has to run very early before ServiceManagerContext is created.
|
||||
@@ -4083,7 +4085,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
|
||||
}
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/devtools/devtools_eye_dropper.cc
|
||||
@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() {
|
||||
@@ -165,7 +165,7 @@ void DevToolsEyeDropper::UpdateCursor() {
|
||||
// magnified projection only with centered hotspot.
|
||||
// Mac Retina requires cursor to be > 120px in order to render smoothly.
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -1393,7 +1393,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -1400,7 +1400,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
target_info->is_filetype_handled_safely)
|
||||
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
|
||||
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
|
||||
#endif
|
||||
@@ -1445,7 +1445,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -1453,7 +1453,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
|
||||
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
|
||||
const base::FilePath& path) {
|
||||
|
@ -18,3 +18,12 @@
|
|||
defined(OS_MAC)
|
||||
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
|
||||
return !download_prefs_->ShouldOpenPdfInSystemReader();
|
||||
@@ -1549,7 +1549,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
|
||||
bool content_initiated,
|
||||
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
// 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.
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
--- chrome/browser/error_reporting/BUILD.gn.orig 2021-01-19 12:11:56 UTC
|
||||
+++ chrome/browser/error_reporting/BUILD.gn
|
||||
@@ -22,6 +22,13 @@ static_library("error_reporting") {
|
||||
"//services/network:network_service",
|
||||
"//services/network/public/cpp",
|
||||
]
|
||||
+
|
||||
+ if (is_bsd) {
|
||||
+ deps -= [
|
||||
+ "//components/crash/content/browser/error_reporting",
|
||||
+ "//components/crash/core/app",
|
||||
+ ]
|
||||
+ }
|
||||
}
|
||||
|
||||
source_set("test_support") {
|
||||
@@ -35,6 +42,12 @@ source_set("test_support") {
|
||||
"//base",
|
||||
"//components/crash/content/browser/error_reporting:mock_crash_endpoint",
|
||||
]
|
||||
+
|
||||
+ if (is_bsd) {
|
||||
+ deps -= [
|
||||
+ "//components/crash/content/browser/error_reporting:mock_crash_endpoint",
|
||||
+ ]
|
||||
+ }
|
||||
}
|
||||
|
||||
source_set("unit_test") {
|
||||
@@ -52,4 +65,12 @@ source_set("unit_test") {
|
||||
"//net:test_support",
|
||||
"//testing/gtest",
|
||||
]
|
||||
+
|
||||
+ if (is_bsd) {
|
||||
+ deps -= [
|
||||
+ "//components/crash/content/browser/error_reporting",
|
||||
+ "//components/crash/content/browser/error_reporting:mock_crash_endpoint",
|
||||
+ "//components/crash/core/app",
|
||||
+ ]
|
||||
+ }
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/BUILD.gn.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/extensions/BUILD.gn.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/extensions/BUILD.gn
|
||||
@@ -1219,6 +1219,12 @@ static_library("extensions") {
|
||||
@@ -1233,6 +1233,12 @@ static_library("extensions") {
|
||||
deps += [ "//chrome/common:service_process_mojom" ]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-01-18 21:28:49 UTC
|
||||
+++ chrome/browser/extensions/activity_log/activity_log.cc
|
||||
@@ -47,7 +47,11 @@
|
||||
#include "extensions/browser/extensions_browser_client.h"
|
||||
@@ -49,7 +49,11 @@
|
||||
#include "extensions/common/extension.h"
|
||||
#include "extensions/common/extension_messages.h"
|
||||
#include "extensions/common/mojom/renderer.mojom.h"
|
||||
+#if defined(OS_BSD)
|
||||
+#include <re2/re2.h>
|
||||
+#else
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "base/win/registry.h"
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "base/environment.h"
|
||||
#include "base/nix/xdg_util.h"
|
||||
#endif
|
||||
@@ -226,7 +226,7 @@ base::FilePath GetEndpointVerificationDir() {
|
||||
@@ -238,7 +238,7 @@ base::FilePath GetEndpointVerificationDir() {
|
||||
return *GetEndpointVerificationDirOverride();
|
||||
#if defined(OS_WIN)
|
||||
if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path))
|
||||
|
@ -18,7 +18,7 @@
|
|||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
|
||||
base::nix::kDotConfigDir);
|
||||
@@ -237,7 +237,7 @@ base::FilePath GetEndpointVerificationDir() {
|
||||
@@ -249,7 +249,7 @@ base::FilePath GetEndpointVerificationDir() {
|
||||
if (true)
|
||||
#endif
|
||||
return path;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
|
||||
@@ -277,7 +277,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T
|
||||
@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T
|
||||
frame_observer.Wait();
|
||||
// Non-Aura Linux uses a singleton for the popup, so it looks like all windows
|
||||
// have popups if there is any popup open.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-11-13 06:36:36 UTC
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
|
||||
@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
(*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] =
|
||||
settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
|
||||
settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
||||
#endif
|
||||
@@ -179,7 +179,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
|
||||
// Appearance settings.
|
||||
(*s_allowlist)[::prefs::kCurrentThemeID] =
|
||||
settings_api::PrefType::PREF_TYPE_STRING;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/first_run/first_run_internal.h.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/first_run/first_run_internal.h.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/first_run/first_run_internal.h
|
||||
@@ -56,13 +56,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
|
||||
@@ -55,13 +55,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
|
||||
bool force_first_run,
|
||||
bool no_first_run);
|
||||
|
||||
|
|
|
@ -1,25 +1,15 @@
|
|||
--- chrome/browser/flag_descriptions.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/flag_descriptions.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/flag_descriptions.cc
|
||||
@@ -4549,15 +4549,15 @@ const char kEnableNewBadgeOnMenuItemsDescription[] =
|
||||
@@ -4609,7 +4609,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] =
|
||||
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
|
||||
const char kWebGL2ComputeContextName[] = "WebGL 2.0 Compute";
|
||||
const char kWebGL2ComputeContextDescription[] =
|
||||
"Enable the use of WebGL 2.0 Compute API.";
|
||||
|
||||
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
|
||||
defined(OS_CHROMEOS)
|
||||
|
||||
const char kEnableMediaFeedsName[] = "Enables Media Feeds";
|
||||
@@ -4601,17 +4601,17 @@ const char kRemoteCopyProgressNotificationDescription[
|
||||
@@ -4653,17 +4653,17 @@ const char kRemoteCopyProgressNotificationDescription[
|
||||
"Enables progress notifications to be shown for the remote copy feature "
|
||||
"when receiving a message.";
|
||||
|
||||
|
@ -40,7 +30,7 @@
|
|||
// defined(OS_CHROMEOS)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
@@ -4623,14 +4623,14 @@ const char kWebContentsOcclusionDescription[] =
|
||||
@@ -4675,14 +4675,14 @@ const char kWebContentsOcclusionDescription[] =
|
||||
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
|
||||
|
@ -57,18 +47,19 @@
|
|||
|
||||
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
const char kUserDataSnapshotName[] = "Enable user data snapshots";
|
||||
@@ -4646,12 +4646,12 @@ const char kWebShareDescription[] =
|
||||
@@ -4698,13 +4698,13 @@ const char kWebShareDescription[] =
|
||||
"platforms.";
|
||||
#endif // defined(OS_WIN) || defined(OS_CHROMEOS)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
|
||||
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
|
||||
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
const char kEnableEphemeralGuestProfilesOnDesktopName[] =
|
||||
"Enable ephemeral Guest profiles on Desktop";
|
||||
const char kEnableEphemeralGuestProfilesOnDesktopDescription[] =
|
||||
"Enables ephemeral Guest profiles on Windows, Linux, and Mac.";
|
||||
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
|
||||
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
|
||||
-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ||
|
||||
+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ||
|
||||
// defined(OS_MAC)
|
||||
|
||||
// Feature flags --------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/flag_descriptions.h.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/flag_descriptions.h.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/flag_descriptions.h
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "ppapi/buildflags/buildflags.h"
|
||||
|
@ -12,25 +12,16 @@
|
|||
|
||||
// This file declares strings used in chrome://flags. These messages are not
|
||||
// translated, because instead of end-users they target Chromium developers and
|
||||
@@ -2646,14 +2646,14 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio
|
||||
@@ -2699,7 +2699,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio
|
||||
|
||||
// Random platform combinations -----------------------------------------------
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
|
||||
extern const char kWebGL2ComputeContextName[];
|
||||
extern const char kWebGL2ComputeContextDescription[];
|
||||
|
||||
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
||||
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
|
||||
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
|
||||
defined(OS_CHROMEOS)
|
||||
|
||||
extern const char kEnableMediaFeedsName[];
|
||||
@@ -2680,7 +2680,7 @@ extern const char kRemoteCopyProgressNotificationDescr
|
||||
@@ -2726,7 +2726,7 @@ extern const char kRemoteCopyProgressNotificationDescr
|
||||
extern const char kDirectManipulationStylusName[];
|
||||
extern const char kDirectManipulationStylusDescription[];
|
||||
|
||||
|
@ -39,7 +30,7 @@
|
|||
// defined(OS_CHROMEOS)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
@@ -2690,12 +2690,12 @@ extern const char kWebContentsOcclusionDescription[];
|
||||
@@ -2736,12 +2736,12 @@ extern const char kWebContentsOcclusionDescription[];
|
||||
|
||||
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
|
||||
|
@ -54,16 +45,17 @@
|
|||
|
||||
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
extern const char kUserDataSnapshotName[];
|
||||
@@ -2707,10 +2707,10 @@ extern const char kWebShareName[];
|
||||
@@ -2753,11 +2753,11 @@ extern const char kWebShareName[];
|
||||
extern const char kWebShareDescription[];
|
||||
#endif // defined(OS_WIN) || defined(OS_CHROMEOS)
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
|
||||
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
|
||||
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
extern const char kEnableEphemeralGuestProfilesOnDesktopName[];
|
||||
extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[];
|
||||
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
|
||||
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
|
||||
-#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) ||
|
||||
+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ||
|
||||
// defined(OS_MAC)
|
||||
|
||||
// Feature flags --------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
@@ -50,7 +50,9 @@
|
||||
@@ -52,7 +52,9 @@
|
||||
|
||||
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
#include <gnu/libc-version.h>
|
||||
|
@ -10,7 +10,7 @@
|
|||
#include "base/linux_util.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "base/strings/string_util.h"
|
||||
@@ -59,7 +61,7 @@
|
||||
@@ -61,7 +63,7 @@
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/base/x/x11_util.h"
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -685,11 +685,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
@@ -696,11 +696,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
#if BUILDFLAG(ENABLE_PLUGINS)
|
||||
plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
|
||||
@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
|
||||
}
|
||||
#endif
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/metrics/process_memory_metrics_emitter.cc
|
||||
@@ -496,7 +496,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
|
||||
@@ -497,7 +497,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
|
||||
|
||||
builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB);
|
||||
builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB);
|
||||
|
@ -9,7 +9,7 @@
|
|||
builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
|
||||
kKiB);
|
||||
#endif
|
||||
@@ -519,7 +519,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
|
||||
@@ -520,7 +520,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
|
||||
MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
|
||||
process_name + ".SharedMemoryFootprint",
|
||||
pmd.os_dump().shared_footprint_kb / kKiB);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
|
||||
@@ -138,7 +138,7 @@ const struct {
|
||||
@@ -143,7 +143,7 @@ const struct {
|
||||
{base::DIR_APP_DATA, nullptr, kBlockAllChildren},
|
||||
{base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren},
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/net/system_network_context_manager.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/net/system_network_context_manager.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -77,11 +77,11 @@
|
||||
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
||||
|
@ -14,9 +14,9 @@
|
|||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "extensions/common/constants.h"
|
||||
@@ -140,10 +140,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
auth_dynamic_params->enable_negotiate_port =
|
||||
local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
|
||||
@@ -142,10 +142,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
|
||||
auth_dynamic_params->basic_over_http_enabled =
|
||||
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
|
@ -27,8 +27,8 @@
|
|||
|
||||
#if defined(OS_POSIX)
|
||||
auth_dynamic_params->ntlm_v2_enabled =
|
||||
@@ -356,10 +356,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
|
||||
@@ -360,10 +360,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
|
||||
pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled,
|
||||
auth_pref_callback);
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
|
||||
|
@ -40,7 +40,7 @@
|
|||
|
||||
#if defined(OS_POSIX)
|
||||
pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
|
||||
@@ -406,10 +406,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
@@ -411,10 +411,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
|
||||
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
|
||||
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
|
||||
std::string());
|
||||
|
@ -53,7 +53,7 @@
|
|||
|
||||
#if defined(OS_POSIX)
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -492,7 +492,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
|
||||
@@ -506,7 +506,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
|
||||
// NetworkContext is created, but before anything has the chance to use it.
|
||||
stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/notifications/notification_display_service_impl.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "chrome/browser/extensions/api/notifications/extension_notification_handler.h"
|
||||
|
@ -9,7 +9,7 @@
|
|||
defined(OS_WIN)
|
||||
#include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
|
||||
#include "chrome/browser/sharing/sharing_notification_handler.h"
|
||||
@@ -57,7 +57,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer
|
||||
@@ -63,7 +63,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer
|
||||
// static
|
||||
void NotificationDisplayServiceImpl::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
|
@ -18,7 +18,7 @@
|
|||
registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true);
|
||||
#endif
|
||||
}
|
||||
@@ -72,7 +72,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
|
||||
@@ -78,7 +78,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
|
||||
AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
|
||||
std::make_unique<PersistentNotificationHandler>());
|
||||
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-01-19 11:25:20 UTC
|
||||
+++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
|
||||
@@ -55,7 +55,7 @@ bool NativeNotificationsEnabled(Profile* profile) {
|
||||
return true;
|
||||
#elif defined(OS_WIN)
|
||||
return NotificationPlatformBridgeWin::NativeNotificationEnabled();
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
if (profile) {
|
||||
// Prefs take precedence over flags.
|
||||
PrefService* prefs = profile->GetPrefs();
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
|
||||
@@ -98,7 +98,11 @@
|
||||
@@ -99,7 +99,11 @@
|
||||
#include "net/base/url_util.h"
|
||||
#include "net/cert/cert_status_flags.h"
|
||||
#include "services/metrics/public/cpp/ukm_recorder.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- chrome/browser/password_manager/password_store_factory.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/password_manager/password_store_factory.cc
|
||||
@@ -188,7 +188,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
|
||||
network_context_getter);
|
||||
@@ -171,7 +171,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
|
||||
network_context_getter);
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/pdf/pdf_extension_test.cc
|
||||
@@ -2159,7 +2159,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT
|
||||
@@ -2192,7 +2192,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT
|
||||
// Runs `action` and checks the Linux selection clipboard contains `expected`.
|
||||
void DoActionAndCheckSelectionClipboard(base::OnceClosure action,
|
||||
const std::string& expected) {
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-01-19 11:25:47 UTC
|
||||
+++ chrome/browser/performance_manager/policies/policy_features.cc
|
||||
@@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage
|
||||
|
||||
const base::Feature kUrgentDiscardingFromPerformanceManager{
|
||||
"UrgentDiscardingFromPerformanceManager",
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX)
|
||||
+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
#else
|
||||
base::FEATURE_ENABLED_BY_DEFAULT
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
@@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
|
||||
@@ -380,7 +380,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
|
||||
std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
|
||||
if (cus_plugin_info) {
|
||||
output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||||
@@ -1248,11 +1248,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1231,11 +1231,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // !defined(OS_MAC) && !defined(OS_CHROMEOS)
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
#if !defined(OS_MAC)
|
||||
{ key::kFullscreenAllowed,
|
||||
@@ -1302,11 +1302,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
@@ -1279,11 +1279,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
|
||||
base::Value::Type::BOOLEAN },
|
||||
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2020-11-16 14:22:12 UTC
|
||||
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/policy/device_management_service_configuration.cc
|
||||
@@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/enterprise/connectors/common.h"
|
||||
#include "chrome/browser/enterprise/connectors/connectors_manager.h"
|
||||
#endif
|
||||
@@ -86,7 +86,7 @@ std::string DeviceManagementServiceConfiguration::GetR
|
||||
@@ -95,7 +95,7 @@ DeviceManagementServiceConfiguration::GetEncryptedRepo
|
||||
std::string
|
||||
DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl() {
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/prefs/browser_prefs.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/prefs/browser_prefs.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -379,7 +379,7 @@
|
||||
@@ -382,7 +382,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
|
||||
#endif
|
||||
|
||||
@@ -976,7 +976,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
@@ -1012,7 +1012,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
|
||||
@@ -135,7 +135,7 @@ const char* const kPersistentPrefNames[] = {
|
||||
@@ -136,7 +136,7 @@ const char* const kPersistentPrefNames[] = {
|
||||
prefs::kShowFullscreenToolbar,
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -304,7 +304,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -319,7 +319,7 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
media_router::MediaRouterUIServiceFactory::GetInstance();
|
||||
#endif
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
|
11
www/chromium/files/patch-chrome_browser_profiles_profile.cc
Normal file
11
www/chromium/files/patch-chrome_browser_profiles_profile.cc
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/profiles/profile.cc.orig 2021-01-19 11:26:11 UTC
|
||||
+++ chrome/browser/profiles/profile.cc
|
||||
@@ -387,7 +387,7 @@ bool Profile::IsIncognitoProfile() const {
|
||||
|
||||
// static
|
||||
bool Profile::IsEphemeralGuestProfileEnabled() {
|
||||
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
|
||||
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
return base::FeatureList::IsEnabled(
|
||||
features::kEnableEphemeralGuestProfilesOnDesktop);
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/profiles/profile_attributes_entry.cc
|
||||
@@ -166,7 +166,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
|
||||
@@ -158,7 +158,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
|
||||
if (is_force_signin_enabled_) {
|
||||
if (!IsAuthenticated())
|
||||
is_force_signin_profile_locked_ = true;
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- chrome/browser/profiles/profiles_state.cc.orig 2021-01-19 11:26:28 UTC
|
||||
+++ chrome/browser/profiles/profiles_state.cc
|
||||
@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) {
|
||||
bool IsGuestModeRequested(const base::CommandLine& command_line,
|
||||
PrefService* local_state,
|
||||
bool show_warning) {
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
DCHECK(local_state);
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -2077,7 +2077,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
|
||||
@@ -2085,7 +2085,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
|
||||
case IDC_CHECK_SPELLING_WHILE_TYPING:
|
||||
return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/renderer_preferences_util.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/renderer_preferences_util.cc.orig 2021-01-18 21:28:50 UTC
|
||||
+++ chrome/browser/renderer_preferences_util.cc
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "ui/base/cocoa/defaults_utils.h"
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/themes/theme_service.h"
|
||||
#include "chrome/browser/themes/theme_service_factory.h"
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
@@ -164,7 +164,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr
|
||||
@@ -153,7 +153,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
|
||||
prefs->caret_blink_interval = interval;
|
||||
#endif
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
||||
if (linux_ui) {
|
||||
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
|
||||
@@ -183,7 +183,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr
|
||||
@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
@@ -676,7 +676,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
|
||||
@@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
|
||||
environment_collection_pending_ = false;
|
||||
|
||||
// Process::Current().CreationTime() is missing on some platforms.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/search/search_suggest/search_suggest_service.cc
|
||||
@@ -21,7 +21,11 @@
|
||||
#include "components/prefs/scoped_user_pref_update.h"
|
||||
#include "components/search/ntp_features.h"
|
||||
#include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
|
||||
#include "components/signin/public/identity_manager/identity_manager.h"
|
||||
+#if defined(OS_BSD)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/signin/signin_util.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/signin/signin_util.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/signin/signin_util.cc
|
||||
@@ -34,7 +34,7 @@
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "google_apis/gaia/gaia_auth_util.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/sync/chrome_sync_client.cc
|
||||
@@ -458,7 +458,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
|
||||
@@ -470,7 +470,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.
|
||||
|
@ -9,7 +9,7 @@
|
|||
// Dictionary sync is enabled by default.
|
||||
if (!disabled_types.Has(syncer::DICTIONARY) &&
|
||||
GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
|
||||
@@ -467,7 +467,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
|
||||
@@ -479,7 +479,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
|
||||
syncer::DICTIONARY, model_type_store_factory,
|
||||
GetSyncableServiceForType(syncer::DICTIONARY), dump_stack));
|
||||
}
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
--- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-01-19 11:26:56 UTC
|
||||
+++ chrome/browser/sync/device_info_sync_service_factory.cc
|
||||
@@ -42,12 +42,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo
|
||||
std::string GetSigninScopedDeviceId() const override {
|
||||
// Since the local sync backend is currently only supported on Windows, Mac and
|
||||
// Linux don't even check the pref on other os-es.
|
||||
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
|
||||
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
syncer::SyncPrefs prefs(profile_->GetPrefs());
|
||||
if (prefs.IsLocalSyncEnabled()) {
|
||||
return "local_device";
|
||||
}
|
||||
-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
|
||||
+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
|
||||
return GetSigninScopedDeviceIdForProfile(profile_);
|
||||
}
|
|
@ -0,0 +1,20 @@
|
|||
--- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-01-19 11:27:21 UTC
|
||||
+++ chrome/browser/sync/profile_sync_service_factory.cc
|
||||
@@ -202,7 +202,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI
|
||||
|
||||
// Only check the local sync backend pref on the supported platforms of
|
||||
// Windows, Mac and Linux.
|
||||
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
|
||||
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
syncer::SyncPrefs prefs(profile->GetPrefs());
|
||||
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
|
||||
UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled);
|
||||
@@ -220,7 +220,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI
|
||||
|
||||
init_params.start_behavior = syncer::ProfileSyncService::AUTO_START;
|
||||
}
|
||||
-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
|
||||
+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
|
||||
if (!local_sync_backend_enabled) {
|
||||
// Always create the GCMProfileService instance such that we can listen to
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/BUILD.gn.orig 2020-11-13 06:36:37 UTC
|
||||
--- chrome/browser/ui/BUILD.gn.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -615,12 +615,15 @@ static_library("ui") {
|
||||
@@ -610,12 +610,15 @@ static_library("ui") {
|
||||
deps += [ "//components/autofill/content/browser/webauthn" ]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/browser_command_controller.cc.orig 2020-11-17 18:39:17 UTC
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -82,7 +82,7 @@
|
||||
@@ -83,7 +83,7 @@
|
||||
#include "components/session_manager/core/session_manager.h"
|
||||
#endif
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
|
||||
#endif
|
||||
|
||||
@@ -246,7 +246,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
@@ -247,7 +247,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
// If this key was registered by the user as a content editing hotkey, then
|
||||
// it is not reserved.
|
||||
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
|
||||
@@ -473,7 +473,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -477,7 +477,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
case IDC_MINIMIZE_WINDOW:
|
||||
browser_->window()->Minimize();
|
||||
break;
|
||||
@@ -940,7 +940,7 @@ void BrowserCommandController::InitCommandState() {
|
||||
@@ -951,7 +951,7 @@ void BrowserCommandController::InitCommandState() {
|
||||
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
|
||||
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
|
||||
#endif
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-11-13 06:36:38 UTC
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc
|
||||
@@ -274,7 +274,7 @@ bool CanOpenProfileOnStartup(Profile* profile) {
|
||||
// true, send a warning if guest mode is requested but not allowed by policy.
|
||||
bool IsGuestModeEnforced(const base::CommandLine& command_line,
|
||||
bool show_warning) {
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \
|
||||
defined(OS_MAC)
|
||||
PrefService* service = g_browser_process->local_state();
|
||||
DCHECK(service);
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/tab_helpers.cc.orig 2020-11-13 06:36:38 UTC
|
||||
--- chrome/browser/ui/tab_helpers.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/ui/tab_helpers.cc
|
||||
@@ -146,7 +146,7 @@
|
||||
@@ -149,7 +149,7 @@
|
||||
#include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h"
|
||||
#endif
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
defined(OS_CHROMEOS)
|
||||
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
|
||||
#include "chrome/browser/ui/hats/hats_helper.h"
|
||||
@@ -398,11 +398,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
@@ -409,11 +409,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MAC) || \
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2021-01-19 11:28:04 UTC
|
||||
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "ui/gfx/image/image_skia.h"
|
||||
#include "ui/views/widget/widget.h"
|
||||
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
|
||||
#include "chrome/browser/shell_integration_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -56,7 +56,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
|
||||
const AppWindow::CreateParams& create_params,
|
||||
views::Widget::InitParams* init_params,
|
||||
views::Widget* widget) {
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
|
||||
std::string app_name =
|
||||
web_app::GenerateApplicationNameFromAppId(app_window()->extension_id());
|
||||
// Set up a custom WM_CLASS for app windows. This allows task switchers in
|
||||
@@ -66,7 +66,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
|
||||
init_params->wm_class_class = shell_integration_linux::GetProgramClassClass();
|
||||
const char kX11WindowRoleApp[] = "app";
|
||||
init_params->wm_role_name = std::string(kX11WindowRoleApp);
|
||||
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
|
||||
|
||||
ChromeNativeAppWindowViews::OnBeforeWidgetInit(create_params, init_params,
|
||||
widget);
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-11-13 06:36:38 UTC
|
||||
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
||||
@@ -34,7 +34,7 @@
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "ui/wm/core/wm_state.h"
|
||||
#endif // defined(USE_AURA)
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
@@ -44,7 +44,7 @@
|
||||
@@ -45,7 +45,7 @@
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
@ -18,7 +18,7 @@
|
|||
|
||||
// This connector is used in ui_devtools's TracingAgent to hook up with the
|
||||
// tracing service.
|
||||
@@ -114,7 +114,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
@@ -115,7 +115,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
return controller;
|
||||
}));
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
// On the Linux desktop, we want to prevent the user from logging in as root,
|
||||
// so that we don't destroy the profile. Now that we have some minimal ui
|
||||
// initialized, check to see if we're running as root and bail if we are.
|
||||
@@ -145,7 +145,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
@@ -146,7 +146,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
exit(EXIT_FAILURE);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-11-13 06:36:38 UTC
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-01-18 21:28:51 UTC
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -1474,7 +1474,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
|
||||
@@ -1506,7 +1506,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating
|
||||
void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
|
||||
// TODO(crbug.com/1110266): Remove explicit OS_CHROMEOS check once OS_LINUX
|
||||
// CrOS cleanup is done.
|
||||
|
@ -9,7 +9,7 @@
|
|||
contents_web_view_->SetFastResize(is_dragging);
|
||||
if (!is_dragging) {
|
||||
// When tab dragging is ended, we need to make sure the web contents get
|
||||
@@ -1854,7 +1854,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
|
||||
@@ -1887,7 +1887,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
|
||||
const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
|
||||
|
||||
bool must_regenerate_frame;
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user