devel/electron12: update to 12.0.7 (and rename from devel/electron11)

Changelog: https://www.electronjs.org/blog/electron-12-0

MOVED

@@ -16327,3 +16327,4 @@ devel/rubygem-licensee8|devel/rubygem-licensee|2021-05-03|Obsolete, please use d
 devel/rubygem-ruby-magic-static|devel/rubygem-ruby-magic|2021-05-03|Obsolete, please use devel/rubygem-ruby-magic
 devel/gecode|math/gecode|2021-05-04|Move to a proper category
 net-im/libqmatrixclient|devel/libquotient|2021-05-08|Has expired: Use libQuotient (devel/libquotient) instead
+devel/electron11|devel/electron12|2021-05-12|VSCode update requires a newer major version

devel/Makefile

@@ -535,7 +535,7 @@
     SUBDIR += efl
     SUBDIR += egypt
     SUBDIR += eiffelstudio
-    SUBDIR += electron11
+    SUBDIR += electron12
     SUBDIR += elf
     SUBDIR += elfio
     SUBDIR += elfkickers

devel/electron11/distinfo

@@ -1,15 +0,0 @@
-TIMESTAMP = 1619857372
-SHA256 (electron/chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
-SIZE (electron/chromium-87.0.4280.141.tar.xz) = 856467564
-SHA256 (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = b8b23fa102ddea8b6b4b6b9161c76636fd48b37e6bcfe955e56bfe04e31ba13b
-SIZE (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = 8072260
-SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
-SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
-SHA256 (electron/electron-yarn-cache-11.4.4.tar.xz) = 72764c221da243327e1f06b06ff561505bc4f81a238394afd0ecef3a2bce1fd5
-SIZE (electron/electron-yarn-cache-11.4.4.tar.xz) = 27493860
-SHA256 (electron/electron-electron-v11.4.4_GH0.tar.gz) = 2414917d9428116b834e3434d40b9576f72ac8ce332ef6f74eccd8de3a1dcaf1
-SIZE (electron/electron-electron-v11.4.4_GH0.tar.gz) = 6441275
-SHA256 (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 6e2730c9284906a0f34cd7c64540c891c0e363323c46e9fc005c6366ddf389c6
-SIZE (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 77078855
-SHA256 (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = e4ff33afb043329429c9551d3cc983786553a310a7d61ee313485ba3ac9b2b15
-SIZE (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = 178328

devel/electron11/files/patch-apps_ui_views_app__window__frame__view.cc

@@ -1,11 +0,0 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2021-01-07 00:36:17 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 {
-   gfx::Rect window_bounds = client_bounds;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // 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 =

devel/electron11/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h

@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-01-07 00:36:18 UTC
-+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -24,7 +24,7 @@
- #if defined(OS_ANDROID)
- #include <sys/prctl.h>
- #endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #include <sys/resource.h>
- 
- #include <algorithm>

devel/electron11/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc

@@ -1,26 +0,0 @@
---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/allocator/partition_allocator/partition_alloc_unittest.cc
-@@ -333,9 +333,13 @@ void FreeFullPage(PartitionRoot<base::internal::Thread
-   }
- }
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- bool CheckPageInCore(void* ptr, bool in_core) {
-+#if defined(OS_BSD)
-+  char ret = 0;
-+#else
-   unsigned char ret = 0;
-+#endif
-   EXPECT_EQ(0, mincore(ptr, SystemPageSize(), &ret));
-   return in_core == (ret & 1);
- }
-@@ -344,7 +348,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)
--#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- 
- class MockPartitionStatsDumper : public PartitionStatsDumper {
-  public:

devel/electron11/files/patch-base_base__switches.cc

@@ -1,20 +0,0 @@
---- base/base_switches.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/base_switches.cc
-@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t
- const char kDisableUsbKeyboardDetect[]      = "disable-usb-keyboard-detect";
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD)
- // The /dev/shm partition is too small in certain VM environments, causing
- // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to
- // work-around this issue (a temporary directory will always be used to create
-@@ -152,7 +152,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
- 
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- // Controls whether or not retired instruction counts are surfaced for threads
- // in trace events on Linux.
- //

devel/electron11/files/patch-base_base__switches.h

@@ -1,20 +0,0 @@
---- base/base_switches.h.orig	2021-01-07 00:36:18 UTC
-+++ base/base_switches.h
-@@ -39,7 +39,7 @@ extern const char kDisableHighResTimer[];
- extern const char kDisableUsbKeyboardDetect[];
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD)
- extern const char kDisableDevShmUsage[];
- #endif
- 
-@@ -55,7 +55,7 @@ extern const char kEnableIdleTracing[];
- extern const char kForceFieldTrialParams[];
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- extern const char kEnableThreadInstructionCount[];
- #endif
- 

devel/electron11/files/patch-base_debug_stack__trace__posix.cc

@@ -1,23 +0,0 @@
---- base/debug/stack_trace_posix.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/debug/stack_trace_posix.cc
-@@ -35,7 +35,7 @@
- #include <AvailabilityMacros.h>
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "base/debug/proc_maps_linux.h"
- #endif
- 
-@@ -697,7 +697,11 @@ class SandboxSymbolizeHelper {
-           // Skip regions with empty file names.
-           continue;
-         }
-+#if defined(OS_BSD)
-+	if (region.path[0] == '-') {
-+#else	
-         if (region.path[0] == '[') {
-+#endif
-           // Skip pseudo-paths, like [stack], [vdso], [heap], etc ...
-           continue;
-         }

devel/electron11/files/patch-base_files_file__path__watcher__stub.cc

@@ -1,53 +0,0 @@
---- base/files/file_path_watcher_stub.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/files/file_path_watcher_stub.cc
-@@ -1,14 +1,15 @@
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Copyright 2014 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
--// This file exists for Unix systems which don't have the inotify headers, and
--// thus cannot build file_watcher_inotify.cc
- 
--#include "base/files/file_path_watcher.h"
-+#include <memory>
- 
-+#include "base/files/file_path_watcher.h"
-+#include "base/files/file_path_watcher_kqueue.h"
- #include "base/macros.h"
- #include "base/memory/ptr_util.h"
-+#include "build/build_config.h"
- 
- namespace base {
- 
-@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
-   bool Watch(const FilePath& path,
-              bool recursive,
-              const FilePathWatcher::Callback& callback) override {
-+#if defined(OS_BSD)
-+    DCHECK(!impl_.get());
-+    if (recursive) {
-+      return false;
-+    } else {
-+      impl_ = std::make_unique<FilePathWatcherKQueue>();
-+    }
-+    DCHECK(impl_.get());
-+    return impl_->Watch(path, recursive, callback);
-+#else
-     return false;
-+#endif
-   }
- 
--  void Cancel() override {}
-+  void Cancel() override {
-+    if (impl_.get())
-+      impl_->Cancel();
-+    set_cancelled();
-+  }
- 
-  private:
-+  std::unique_ptr<PlatformDelegate> impl_;
-+
-   DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
- };
- 

devel/electron11/files/patch-base_memory_platform__shared__memory__region__posix.cc

@@ -1,38 +0,0 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/memory/platform_shared_memory_region_posix.cc
-@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const {
-   return {fd.get(), readonly_fd.get()};
- }
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- // static
- ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
-   PlatformSharedMemoryRegion region =
-@@ -79,7 +79,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
-     return region.PassPlatformHandle().fd;
-   return ScopedFD();
- }
--#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- 
- // static
- PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
-@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
- // static
- PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
-                                                               size_t size
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-                                                               ,
-                                                               bool executable
- #endif
-@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
-   // flag.
-   FilePath directory;
-   if (!GetShmemTempDir(
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-           executable,
- #else
-           false /* executable */,

devel/electron11/files/patch-base_process_launch__posix.cc

@@ -1,39 +0,0 @@
---- base/process/launch_posix.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/process/launch_posix.cc
-@@ -65,6 +65,7 @@
- #error "macOS should use launch_mac.cc"
- #endif
- 
-+#pragma weak environ
- extern char** environ;
- 
- namespace base {
-@@ -228,6 +229,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap
-   DirReaderPosix fd_dir(kFDDir);
-   if (!fd_dir.IsValid()) {
-     // Fallback case: Try every possible fd.
-+
-+#if defined(OS_FREEBSD)
-+    // CEM: blast away most of the range with closefrom().  A common use case
-+    // of this function only maps STDIN/STDOUT/STDERR and closefrom(3) is much
-+    // cheaper than x00,000 close(2) invocations with a high RLIMIT_NOFILE.
-+    //
-+    // In the other caller, it is still very likely that the fds we care about
-+    // are in relatively low number space and we can save hundreds of thousands
-+    // of syscalls.
-+    int max_valid_fd = -1;
-+    for (size_t j = 0; j < saved_mapping.size(); j++) {
-+      int fd = saved_mapping[j].dest;
-+      if (fd > max_valid_fd)
-+	max_valid_fd = fd;
-+    }
-+    if (max_valid_fd < STDERR_FILENO)
-+      max_valid_fd = STDERR_FILENO;
-+
-+    closefrom(max_valid_fd + 1);
-+    max_fds = static_cast<size_t>(max_valid_fd) + 1;
-+#endif
-+
-     for (size_t i = 0; i < max_fds; ++i) {
-       const int fd = static_cast<int>(i);
-       if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO)

devel/electron11/files/patch-base_system_sys__info__posix.cc

@@ -1,11 +0,0 @@
---- base/system/sys_info_posix.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/system/sys_info_posix.cc
-@@ -223,6 +223,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
-     arch = "x86";
-   } else if (arch == "amd64") {
-     arch = "x86_64";
-+  } else if (arch == "arm64") {
-+    arch = "aarch64";
-   } else if (std::string(info.sysname) == "AIX") {
-     arch = "ppc64";
-   }

devel/electron11/files/patch-base_threading_thread__task__runner__handle.cc

@@ -1,26 +0,0 @@
---- base/threading/thread_task_runner_handle.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/threading/thread_task_runner_handle.cc
-@@ -8,6 +8,7 @@
- #include <utility>
- 
- #include "base/bind.h"
-+#include "base/callback_helpers.h"
- #include "base/check_op.h"
- #include "base/lazy_instance.h"
- #include "base/run_loop.h"
-@@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
-   return !!thread_task_runner_tls.Pointer()->Get();
- }
- 
-+#if defined(OS_BSD)
- // static
- ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
-     scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -82,6 +84,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
-       base::Unretained(ttrh->task_runner_.get()),
-       std::move(no_running_during_override)));
- }
-+#endif
- 
- ThreadTaskRunnerHandle::ThreadTaskRunnerHandle(
-     scoped_refptr<SingleThreadTaskRunner> task_runner)

devel/electron11/files/patch-base_trace__event_process__memory__dump.h

@@ -1,11 +0,0 @@
---- base/trace_event/process_memory_dump.h.orig	2021-01-07 00:36:18 UTC
-+++ base/trace_event/process_memory_dump.h
-@@ -22,7 +22,7 @@
- 
- // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
- // resident memory.
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
- #define COUNT_RESIDENT_BYTES_SUPPORTED
- #endif
- 

devel/electron11/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc

@@ -1,20 +0,0 @@
---- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig	2021-01-07 00:36:18 UTC
-+++ base/util/memory_pressure/system_memory_pressure_evaluator.cc
-@@ -14,7 +14,7 @@
- #elif defined(OS_WIN)
- #include "base/util/memory_pressure/system_memory_pressure_evaluator_win.h"
- #include "base/win/windows_version.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h"
- #endif
- 
-@@ -45,7 +45,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval
-     evaluator->CreateOSSignalPressureEvaluator(monitor->CreateVoter());
-   }
-   return evaluator;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   return std::make_unique<util::os_linux::SystemMemoryPressureEvaluator>(
-       monitor->CreateVoter());
- #endif

devel/electron11/files/patch-build_config_BUILD.gn

@@ -1,30 +0,0 @@
---- build/config/BUILD.gn.orig	2021-01-07 00:36:18 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") {
-     ]
-   } else if (is_linux || is_chromeos) {
-     libs = [
--      "dl",
-       "pthread",
--      "rt",
-     ]
-   }
- }
-@@ -316,7 +314,7 @@ config("executable_config") {
-       "//build/config/ios:ios_dynamic_flags",
-       "//build/config/ios:ios_executable_flags",
-     ]
--  } else if (is_linux || is_chromeos || is_android || current_os == "aix") {
-+  } else if (is_linux || is_bsd || is_chromeos || is_android || current_os == "aix") {
-     configs += [ "//build/config/gcc:executable_config" ]
-     if (is_chromecast) {
-       configs += [ "//build/config/chromecast:executable_config" ]

devel/electron11/files/patch-build_config_compiler_compiler.gni

@@ -1,11 +0,0 @@
---- build/config/compiler/compiler.gni.orig	2021-01-07 00:36:18 UTC
-+++ build/config/compiler/compiler.gni
-@@ -192,7 +192,7 @@ declare_args() {
- declare_args() {
-   # Whether to use the gold linker from binutils instead of lld or bfd.
-   use_gold =
--      !use_lld && !(is_chromecast && is_linux &&
-+      !is_bsd && !use_lld && !(is_chromecast && is_linux &&
-                     (current_cpu == "arm" || current_cpu == "mipsel")) &&
-       ((is_linux && (current_cpu == "x64" || current_cpu == "x86" ||
-                      current_cpu == "arm" || current_cpu == "arm64" ||

devel/electron11/files/patch-build_config_compiler_pgo_pgo.gni

@@ -1,11 +0,0 @@
---- build/config/compiler/pgo/pgo.gni.orig	2021-01-07 00:36:18 UTC
-+++ build/config/compiler/pgo/pgo.gni
-@@ -12,7 +12,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))) {
-     chrome_pgo_phase = 2
-   }
- 

devel/electron11/files/patch-chrome_app_chrome__command__ids.h

@@ -1,11 +0,0 @@
---- chrome/app/chrome_command_ids.h.orig	2021-01-07 00:36:20 UTC
-+++ chrome/app/chrome_command_ids.h
-@@ -61,7 +61,7 @@
- #define IDC_ALL_WINDOWS_FRONT           34048
- #define IDC_NAME_WINDOW                 34049
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #define IDC_USE_SYSTEM_TITLE_BAR        34051
- #define IDC_RESTORE_WINDOW              34052
- #endif

devel/electron11/files/patch-chrome_app_chrome__main.cc

@@ -1,17 +0,0 @@
---- chrome/app/chrome_main.cc.orig	2021-01-07 00:36:20 UTC
-+++ chrome/app/chrome_main.cc
-@@ -109,12 +109,12 @@ int ChromeMain(int argc, const char** argv) {
- 
-   // Chrome-specific process modes.
- #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
--    defined(OS_WIN)
-+    defined(OS_WIN) || defined(OS_BSD)
-   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)
- 
-   int rv = content::ContentMain(params);
- 

devel/electron11/files/patch-chrome_browser_chrome__browser__main__posix.cc

@@ -1,11 +0,0 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2021-01-07 00:36:21 UTC
-+++ chrome/browser/chrome_browser_main_posix.cc
-@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
-     // ExitHandler takes care of deleting itself.
-     new ExitHandler();
-   } else {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     switch (signal) {
-       case SIGINT:
-       case SIGHUP:

devel/electron11/files/patch-chrome_browser_chrome__content__browser__client.cc

@@ -1,106 +0,0 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2021-01-07 00:36:21 UTC
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -424,7 +424,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"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/chrome_browser_main_linux.h"
- #elif defined(OS_ANDROID)
- #include "base/android/application_status_listener.h"
-@@ -482,7 +482,7 @@
- #endif  //  !defined(OS_ANDROID)
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
- #endif
- 
-@@ -514,7 +514,7 @@
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
- #endif
- 
-@@ -833,11 +833,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
- }
- 
- int GetCrashSignalFD(const base::CommandLine& command_line) {
-+#if !defined(OS_BSD)
-   if (crash_reporter::IsCrashpadEnabled()) {
-     int fd;
-     pid_t pid;
-     return crash_reporter::GetHandlerSocket(&fd, &pid) ? fd : -1;
-   }
-+#endif
- 
-   // Extensions have the same process type as renderers.
-   if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
-@@ -1364,7 +1366,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
- #elif defined(OS_CHROMEOS)
-   main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
-       parameters, startup_data_);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   main_parts =
-       std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
- #elif defined(OS_ANDROID)
-@@ -1390,7 +1392,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)
-   main_parts->AddParts(
-       std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
- #else
-@@ -2144,7 +2146,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
-     command_line->AppendSwitchASCII(switches::kMetricsClientID,
-                                     client_info->client_id);
-   }
--#elif defined(OS_POSIX)
-+#elif defined(OS_POSIX) && !defined(OS_BSD)
- #if defined(OS_ANDROID)
-   bool enable_crash_reporter = true;
- #else
-@@ -3738,7 +3740,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
-   }
- }
- 
--#if defined(OS_POSIX) && !defined(OS_MAC)
-+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
- void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
-     const base::CommandLine& command_line,
-     int child_process_id,
-@@ -3773,7 +3775,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
-     mappings->Share(kCrashDumpSignal, crash_signal_fd);
-   }
- }
--#endif  // defined(OS_POSIX) && !defined(OS_MAC)
-+#endif  // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
- 
- #if defined(OS_WIN)
- base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
-@@ -3862,7 +3864,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();
-@@ -4104,7 +4106,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
-   }
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
-                        MaybeCreateThrottleFor(handle),
-                    &throttles);

devel/electron11/files/patch-chrome_browser_defaults.cc

@@ -1,11 +0,0 @@
---- chrome/browser/defaults.cc.orig	2021-01-07 00:36:22 UTC
-+++ chrome/browser/defaults.cc
-@@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true;
- const bool kSyncAutoStarts = false;
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- const bool kScrollEventChangesTab = true;
- #else
- const bool kScrollEventChangesTab = false;

devel/electron11/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc

@@ -1,20 +0,0 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2021-01-07 00:36:22 UTC
-+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
-   (*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
- #endif
-@@ -179,7 +179,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
-   // Appearance settings.
-   (*s_allowlist)[::prefs::kCurrentThemeID] =
-       settings_api::PrefType::PREF_TYPE_STRING;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   (*s_allowlist)[::prefs::kUsesSystemTheme] =
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
- #endif

devel/electron11/files/patch-chrome_browser_first__run_first__run__dialog.h

@@ -1,11 +0,0 @@
---- chrome/browser/first_run/first_run_dialog.h.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/first_run/first_run_dialog.h
-@@ -9,7 +9,7 @@
- #include "build/build_config.h"
- 
- // Hide this function on platforms where the dialog does not exist.
--#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
- class Profile;
- 

devel/electron11/files/patch-chrome_browser_first__run_first__run__internal.h

@@ -1,18 +0,0 @@
---- chrome/browser/first_run/first_run_internal.h.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/first_run/first_run_internal.h
-@@ -56,13 +56,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
-                                      bool force_first_run,
-                                      bool no_first_run);
- 
--#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- // For testing, forces the first run dialog to either be shown or not. If not
- // called, the decision to show the dialog or not will be made by Chrome based
- // on a number of factors (such as install type, whether it's a Chrome-branded
- // build, etc).
- void ForceFirstRunDialogShownForTesting(bool shown);
--#endif  // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#endif  // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
- }  // namespace internal
- }  // namespace first_run

devel/electron11/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc

@@ -1,25 +0,0 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -685,11 +685,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
- #endif  // defined(OS_WIN)
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   metrics_service_->RegisterMetricsProvider(
-       std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
- #endif  //  defined(OS_WIN) || defined(OS_MAC) || \
--        // (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+        // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
- #if BUILDFLAG(ENABLE_PLUGINS)
-   plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
-@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
-   }
- #endif
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // This creates the DesktopProfileSessionDurationsServices if it didn't exist
-   // already.
-   metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(

devel/electron11/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc

@@ -1,14 +0,0 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -98,7 +98,11 @@
- #include "net/base/url_util.h"
- #include "net/cert/cert_status_flags.h"
- #include "services/metrics/public/cpp/ukm_recorder.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "url/url_constants.h"
- 
- #if BUILDFLAG(FULL_SAFE_BROWSING)

devel/electron11/files/patch-chrome_browser_pdf_pdf__extension__test.cc

@@ -1,11 +0,0 @@
---- chrome/browser/pdf/pdf_extension_test.cc.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/pdf/pdf_extension_test.cc
-@@ -2159,7 +2159,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT
-   // Runs `action` and checks the Linux selection clipboard contains `expected`.
-   void DoActionAndCheckSelectionClipboard(base::OnceClosure action,
-                                           const std::string& expected) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     DoActionAndCheckClipboard(std::move(action),
-                               ui::ClipboardBuffer::kSelection, expected);
- #else

devel/electron11/files/patch-chrome_browser_prefs_browser__prefs.cc

@@ -1,20 +0,0 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/prefs/browser_prefs.cc
-@@ -379,7 +379,7 @@
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
- #endif
- 
-@@ -976,7 +976,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
- #endif
- 

devel/electron11/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc

@@ -1,11 +0,0 @@
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
-@@ -135,7 +135,7 @@ const char* const kPersistentPrefNames[] = {
-     prefs::kShowFullscreenToolbar,
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-     // Toggleing custom frames affects all open windows in the profile, hence
-     // should be written to the regular profile when changed in incognito mode.
-     prefs::kUseCustomChromeFrame,

devel/electron11/files/patch-chrome_browser_printing_print__job__worker.cc

@@ -1,20 +0,0 @@
---- chrome/browser/printing/print_job_worker.cc.orig	2021-01-25 11:27:00 UTC
-+++ chrome/browser/printing/print_job_worker.cc
-@@ -223,7 +223,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
-     crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
-         print_backend->GetPrinterDriverInfo(printer_name));
- 
--#if defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
-     PrinterBasicInfo basic_info;
-     if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info)) {
-       base::Value advanced_settings(base::Value::Type::DICTIONARY);
-@@ -233,7 +233,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
-       new_settings.SetKey(kSettingAdvancedSettings,
-                           std::move(advanced_settings));
-     }
--#endif  // defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
-   }
- 
-   {

devel/electron11/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc

@@ -1,11 +0,0 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2021-01-07 00:36:23 UTC
-+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -304,7 +304,7 @@ void ChromeBrowserMainExtraPartsProfiles::
-   media_router::MediaRouterUIServiceFactory::GetInstance();
- #endif
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
- #endif
-   ModelTypeStoreServiceFactory::GetInstance();

devel/electron11/files/patch-chrome_browser_themes_theme__service__factory.cc

@@ -1,29 +0,0 @@
---- chrome/browser/themes/theme_service_factory.cc.orig	2021-01-07 00:36:24 UTC
-+++ chrome/browser/themes/theme_service_factory.cc
-@@ -22,7 +22,7 @@
- #include "chrome/browser/themes/theme_helper_win.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/themes/theme_service_aura_linux.h"
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
-@@ -77,7 +77,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {}
- 
- KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
-     content::BrowserContext* profile) const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   using ThemeService = ThemeServiceAuraLinux;
- #endif
- 
-@@ -89,7 +89,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
- 
- void ThemeServiceFactory::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   bool default_uses_system_theme = false;
- 
-   const views::LinuxUI* linux_ui = views::LinuxUI::instance();

devel/electron11/files/patch-chrome_browser_ui_browser__command__controller.cc

@@ -1,38 +0,0 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2021-01-07 00:36:24 UTC
-+++ chrome/browser/ui/browser_command_controller.cc
-@@ -82,7 +82,7 @@
- #include "components/session_manager/core/session_manager.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
- #endif
- 
-@@ -246,7 +246,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
- #endif
-   }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // 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
-       break;
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-     case IDC_MINIMIZE_WINDOW:
-       browser_->window()->Minimize();
-       break;
-@@ -940,7 +940,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
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
-   command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
-   command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);

devel/electron11/files/patch-chrome_browser_ui_browser__view__prefs.cc

@@ -1,24 +0,0 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig	2021-01-07 00:36:24 UTC
-+++ chrome/browser/ui/browser_view_prefs.cc
-@@ -26,7 +26,7 @@ namespace {
- // Old values: 0 = SHRINK (default), 1 = STACKED.
- const char kTabStripLayoutType[] = "tab_strip_layout_type";
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- bool GetCustomFramePrefDefault() {
- #if defined(USE_OZONE)
-   if (features::IsUsingOzonePlatform()) {
-@@ -51,10 +51,10 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple*
- 
- void RegisterBrowserViewProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
-                                 GetCustomFramePrefDefault());
--#endif  // defined(OS_LINUX) && defined(!OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && defined(!OS_CHROMEOS)
- }
- 
- void MigrateBrowserTabStripPrefs(PrefService* prefs) {

devel/electron11/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2021-01-07 00:36:24 UTC
-+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -88,7 +88,7 @@ static const char* kBadFlags[] = {
-     extensions::switches::kExtensionsOnChromeURLs,
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-     // Speech dispatcher is buggy, it can crash and it can make Chrome freeze.
-     // http://crbug.com/327295
-     switches::kEnableSpeechDispatcher,

devel/electron11/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2021-01-07 00:36:24 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);

devel/electron11/files/patch-chrome_browser_ui_test_test__browser__dialog.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/test/test_browser_dialog.cc.orig	2021-01-07 00:36:24 UTC
-+++ chrome/browser/ui/test/test_browser_dialog.cc
-@@ -114,7 +114,7 @@ bool TestBrowserDialog::VerifyUi() {
- 
-   views::Widget* dialog_widget = *(added.begin());
- // TODO(https://crbug.com/958242) support Mac for pixel tests.
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   dialog_widget->SetBlockCloseForTesting(true);
-   // Deactivate before taking screenshot. Deactivated dialog pixel outputs
-   // is more predictable than activated dialog.

devel/electron11/files/patch-chrome_browser_ui_test_test__browser__ui.cc

@@ -1,29 +0,0 @@
---- chrome/browser/ui/test/test_browser_ui.cc.orig	2021-01-07 00:36:24 UTC
-+++ chrome/browser/ui/test/test_browser_ui.cc
-@@ -10,7 +10,7 @@
- #include "build/build_config.h"
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/test/pixel/browser_skia_gold_pixel_diff.h"
- #include "ui/base/test/skia_gold_matching_algorithm.h"
- #include "ui/compositor/test/draw_waiter_for_test.h"
-@@ -32,7 +32,7 @@ std::string NameFromTestCase() {
- }  // namespace
- 
- TestBrowserUi::TestBrowserUi() {
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // Default to fuzzy diff. The magic number is chosen based on
-   // past experiments.
-   SetPixelMatchAlgorithm(
-@@ -43,7 +43,7 @@ TestBrowserUi::TestBrowserUi() {
- TestBrowserUi::~TestBrowserUi() = default;
- 
- // TODO(https://crbug.com/958242) support Mac for pixel tests.
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- bool TestBrowserUi::VerifyPixelUi(views::Widget* widget,
-                                   const std::string& screenshot_prefix,
-                                   const std::string& screenshot_name) {

devel/electron11/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc

@@ -1,38 +0,0 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -34,7 +34,7 @@
- #include "ui/wm/core/wm_state.h"
- #endif  // defined(USE_AURA)
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -44,7 +44,7 @@
- #include "chrome/grit/generated_resources.h"
- #include "content/public/common/content_switches.h"
- #include "ui/base/l10n/l10n_util.h"
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- 
- // This connector is used in ui_devtools's TracingAgent to hook up with the
- // tracing service.
-@@ -114,7 +114,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
-         return controller;
-       }));
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-   // 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(
-   base::RunLoop().RunUntilIdle();
- 
-   exit(EXIT_FAILURE);
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- }
- 
- void ChromeBrowserMainExtraPartsViews::PostBrowserStart() {

devel/electron11/files/patch-chrome_browser_ui_views_chrome__views__delegate.h

@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
-   HICON GetSmallWindowIcon() const override;
-   int GetAppbarAutohideEdges(HMONITOR monitor,
-                              base::OnceClosure callback) override;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   gfx::ImageSkia* GetDefaultWindowIcon() const override;
-   bool WindowManagerProvidesTitleBar(bool maximized) override;
- #endif

devel/electron11/files/patch-chrome_browser_ui_views_download_download__item__view.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/download/download_item_view.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/download/download_item_view.cc
-@@ -190,7 +190,7 @@ bool UseNewWarnings() {
- }
- 
- int GetFilenameStyle(const views::StyledLabel& label) {
--#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   if (UseNewWarnings())
-     return STYLE_EMPHASIZED;
- #endif

devel/electron11/files/patch-chrome_browser_ui_views_first__run__dialog.cc

@@ -1,14 +0,0 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/first_run_dialog.cc
-@@ -114,9 +114,11 @@ void FirstRunDialog::Done() {
- bool FirstRunDialog::Accept() {
-   GetWidget()->Hide();
- 
-+#if !defined(OS_BSD)
-   ChangeMetricsReportingStateWithReply(
-       report_crashes_->GetChecked(),
-       base::BindRepeating(&InitCrashReporterIfEnabled));
-+#endif
- 
-   if (make_default_->GetChecked())
-     shell_integration::SetAsDefaultBrowser();

devel/electron11/files/patch-chrome_browser_ui_views_frame_browser__frame.cc

@@ -1,28 +0,0 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -38,14 +38,14 @@
- #include "components/user_manager/user_manager.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "ui/display/screen.h"
- #endif
- 
- namespace {
- 
- bool IsUsingGtkTheme(Profile* profile) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
- #else
-   return false;
-@@ -204,7 +204,7 @@ const ui::NativeTheme* BrowserFrame::GetNativeTheme() 
- 
- void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
-   chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // If the window was sent to a different workspace, prioritize it if
-   // it was sent to the current workspace and deprioritize it
-   // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()

devel/electron11/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc

@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
-@@ -13,7 +13,7 @@
- #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h"
- #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h"
- #include "ui/views/linux_ui/linux_ui.h"
-@@ -27,7 +27,7 @@ namespace {
- std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView(
-     BrowserFrame* frame,
-     BrowserView* browser_view) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   auto* linux_ui = views::LinuxUI::instance();
-   auto* profile = browser_view->browser()->profile();
-   auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);

devel/electron11/files/patch-chrome_browser_ui_views_frame_browser__view.cc

@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1474,7 +1474,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.
--#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   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
-   const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
- 
-   bool must_regenerate_frame;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // GTK and user theme changes can both change frame buttons, so the frame
-   // always needs to be regenerated on Linux.
-   must_regenerate_frame = true;

devel/electron11/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc

@@ -1,29 +0,0 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -63,7 +63,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
- 
- void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
-     ui::SimpleMenuModel* model) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
-   model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
-   model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
-@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-   }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   model->AddSeparator(ui::NORMAL_SEPARATOR);
-   model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
-                                   IDS_SHOW_WINDOW_DECORATIONS_MENU);
-@@ -116,7 +116,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-   }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   model->AddSeparator(ui::NORMAL_SEPARATOR);
-   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
- #endif

devel/electron11/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc

@@ -1,29 +0,0 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
-@@ -15,7 +15,7 @@
- #include "components/sessions/core/tab_restore_service.h"
- #include "ui/base/l10n/l10n_util.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_service.h"
- #endif
-@@ -30,7 +30,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate(
- SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
- 
- bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
-     PrefService* prefs = browser_->profile()->GetPrefs();
-     return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
-@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
- }
- 
- bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   bool is_maximized = browser_->window()->IsMaximized();
-   switch (command_id) {
-     case IDC_MAXIMIZE_WINDOW:

devel/electron11/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -57,7 +57,7 @@ class NewTabButton::HighlightPathGenerator
- NewTabButton::NewTabButton(TabStrip* tab_strip, PressedCallback callback)
-     : views::ImageButton(std::move(callback)), tab_strip_(tab_strip) {
-   SetAnimateOnStateChange(true);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   SetTriggerableEventFlags(GetTriggerableEventFlags() |
-                            ui::EF_MIDDLE_MOUSE_BUTTON);
- #endif

devel/electron11/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc
-@@ -34,7 +34,7 @@
- 
- namespace {
- 
--#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)
- constexpr char kDeviceTypeForCheckbox[] = "computer";
- #else

devel/electron11/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc

@@ -1,20 +0,0 @@
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/webui/settings/appearance_handler.cc
-@@ -27,7 +27,7 @@ void AppearanceHandler::RegisterMessages() {
-       "useDefaultTheme",
-       base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
-                           base::Unretained(this)));
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
-   web_ui()->RegisterMessageCallback(
-       "useSystemTheme",
-       base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
-@@ -39,7 +39,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
-   ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
- void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) {
-   if (profile_->IsSupervised())
-     NOTREACHED();

devel/electron11/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h

@@ -1,11 +0,0 @@
---- chrome/browser/ui/webui/settings/appearance_handler.h.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/webui/settings/appearance_handler.h
-@@ -36,7 +36,7 @@ class AppearanceHandler : public SettingsPageUIHandler
-   // Changes the UI theme of the browser to the default theme.
-   void HandleUseDefaultTheme(const base::ListValue* args);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-   // Changes the UI theme of the browser to the system (GTK+) theme.
-   void HandleUseSystemTheme(const base::ListValue* args);
- #endif

devel/electron11/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc

@@ -1,11 +0,0 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -335,7 +335,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
-     {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL},
-     {"tiny", IDS_SETTINGS_TINY_FONT_SIZE},
-     {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
-     {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
-     {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},

devel/electron11/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc

@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc
-@@ -15,7 +15,7 @@ namespace {
- 
- #if !defined(OS_CHROMEOS)
- bool CanOsAddDesktopShortcuts() {
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
-   return true;
- #else
-   return false;

devel/electron11/files/patch-chrome_common_channel__info.h

@@ -1,11 +0,0 @@
---- chrome/common/channel_info.h.orig	2021-01-07 00:36:25 UTC
-+++ chrome/common/channel_info.h
-@@ -61,7 +61,7 @@ bool IsSideBySideCapable();
- std::string GetChannelSuffixForDataDir();
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- // Returns the channel-specific filename of the desktop shortcut used to launch
- // the browser.
- std::string GetDesktopName(base::Environment* env);

devel/electron11/files/patch-chrome_common_channel__info__posix.cc

@@ -1,20 +0,0 @@
---- chrome/common/channel_info_posix.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/common/channel_info_posix.cc
-@@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() {
-   }
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- std::string GetDesktopName(base::Environment* env) {
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-   // Google Chrome packaged as a snap is a special case: the application name
-@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environment* env) {
-   return "chromium-browser.desktop";
- #endif
- }
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
- version_info::Channel GetChannel() {
-   return GetChannelImpl(nullptr);

devel/electron11/files/patch-chrome_common_extensions_command.cc

@@ -1,11 +0,0 @@
---- chrome/common/extensions/command.cc.orig	2021-01-07 00:36:25 UTC
-+++ chrome/common/extensions/command.cc
-@@ -293,7 +293,7 @@ std::string Command::CommandPlatform() {
-   return values::kKeybindingPlatformMac;
- #elif defined(OS_CHROMEOS)
-   return values::kKeybindingPlatformChromeOs;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   return values::kKeybindingPlatformLinux;
- #else
-   return "";

devel/electron11/files/patch-chrome_common_webui__url__constants.h

@@ -1,33 +0,0 @@
---- chrome/common/webui_url_constants.h.orig	2021-01-07 00:36:26 UTC
-+++ chrome/common/webui_url_constants.h
-@@ -291,7 +291,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
- 
- #endif  // defined(OS_CHROMEOS)
- 
--#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 kChromeUIDiscardsHost[];
- extern const char kChromeUIDiscardsURL[];
-@@ -311,18 +311,18 @@ extern const char kChromeUINearbyShareURL[];
- extern const char kChromeUILinuxProxyConfigHost[];
- #endif
- 
--#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_ANDROID)
- extern const char kChromeUISandboxHost[];
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- extern const char kChromeUIBrowserSwitchHost[];
- extern const char kChromeUIBrowserSwitchURL[];
- #endif
- 
--#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \
-+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \
-     defined(USE_AURA)
- extern const char kChromeUITabModalConfirmDialogHost[];
- #endif

devel/electron11/files/patch-chrome_test_base_chrome__test__launcher.cc

@@ -1,38 +0,0 @@
---- chrome/test/base/chrome_test_launcher.cc.orig	2021-01-07 00:36:26 UTC
-+++ chrome/test/base/chrome_test_launcher.cc
-@@ -61,7 +61,7 @@
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h"
- #include "chrome/browser/upgrade_detector/installed_version_poller.h"
- #include "testing/gtest/include/gtest/gtest.h"
-@@ -79,7 +79,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char
-   content::ContentTestSuiteBase::RegisterInProcessThreads();
- #endif
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   InstalledVersionPoller::ScopedDisableForTesting disable_polling(
-       InstalledVersionPoller::MakeScopedDisableForTesting());
- #endif
-@@ -201,7 +201,7 @@ int LaunchChromeTests(size_t parallel_jobs,
-   if (command_line.HasSwitch(switches::kLaunchAsBrowser))
-     sampling_profiler = std::make_unique<MainThreadStackSamplingProfiler>();
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
-   ChromeCrashReporterClient::Create();
- #elif defined(OS_WIN)
-   // We leak this pointer intentionally. The crash client needs to outlive
-@@ -229,7 +229,7 @@ int LaunchChromeTests(size_t parallel_jobs,
-   }
- 
- #if defined(OS_WIN) || defined(OS_MAC) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // Cause a test failure for any test that triggers an unexpected relaunch.
-   // Tests that fail here should likely be restructured to put the "before
-   // relaunch" code into a PRE_ test with its own

devel/electron11/files/patch-chrome_test_base_interactive__ui__tests__main.cc

@@ -1,20 +0,0 @@
---- chrome/test/base/interactive_ui_tests_main.cc.orig	2021-01-07 00:36:26 UTC
-+++ chrome/test/base/interactive_ui_tests_main.cc
-@@ -16,7 +16,7 @@
- #if defined(USE_AURA)
- #include "ui/aura/test/ui_controls_factory_aura.h"
- #include "ui/base/test/ui_controls_aura.h"
--#if defined(USE_OZONE) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD))
- #include "ui/base/ui_base_features.h"
- #include "ui/ozone/public/ozone_platform.h"
- #endif
-@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite 
-     com_initializer_.reset(new base::win::ScopedCOMInitializer());
-     ui_controls::InstallUIControlsAura(
-         aura::test::CreateUIControlsAura(nullptr));
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #if defined(USE_OZONE)
-     if (features::IsUsingOzonePlatform()) {
-       ui::OzonePlatform::InitParams params;

devel/electron11/files/patch-chrome_test_base_test__browser__window.h

@@ -1,11 +0,0 @@
---- chrome/test/base/test_browser_window.h.orig	2021-01-07 00:36:26 UTC
-+++ chrome/test/base/test_browser_window.h
-@@ -179,7 +179,7 @@ class TestBrowserWindow : public BrowserWindow {
-       bool is_source_keyboard) override {}
- 
- #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \
--    defined(OS_LINUX)
-+    defined(OS_LINUX) || defined(OS_BSD)
-   void ShowHatsBubble(const std::string& site_id) override {}
- #endif
- 

devel/electron11/files/patch-chrome_test_base_testing__browser__process.h

@@ -1,13 +0,0 @@
---- chrome/test/base/testing_browser_process.h.orig	2021-01-07 00:36:26 UTC
-+++ chrome/test/base/testing_browser_process.h
-@@ -124,8 +124,8 @@ class TestingBrowserProcess : public BrowserProcess {
-   DownloadRequestLimiter* download_request_limiter() override;
-   StartupData* startup_data() override;
- 
--#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
--  void StartAutoupdateTimer() override {}
-+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
-+  void StartAutoupdateTimer() /*override*/ {}
- #endif
- 
-   component_updater::ComponentUpdateService* component_updater() override;

devel/electron11/files/patch-components_autofill_core_browser_personal__data__manager.cc

@@ -1,20 +0,0 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig	2021-01-07 00:36:29 UTC
-+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1960,7 +1960,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar
- 
- bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
- // The feature is only for Linux, Windows and Mac.
--#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_APPLE)
-   // This option should only be shown for users that have not enabled the Sync
-   // Feature and that have server credit cards available.
-@@ -1984,7 +1984,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
-   return !is_opted_in;
- #else
-   return false;
--#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \
-+#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \
-        //     defined(OS_APPLE)
- }
- 

devel/electron11/files/patch-components_autofill_core_common_autofill__payments__features.cc

@@ -1,11 +0,0 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2021-01-07 00:36:29 UTC
-+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -123,7 +123,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma
- 
- bool ShouldShowImprovedUserConsentForCreditCardSave() {
- #if defined(OS_WIN) || defined(OS_APPLE) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // The new user consent UI is fully launched on MacOS, Windows and Linux.
-   return true;
- #else

devel/electron11/files/patch-components_content__settings_core_browser_website__settings__registry.cc

@@ -1,11 +0,0 @@
---- components/content_settings/core/browser/website_settings_registry.cc.orig	2021-01-07 00:36:29 UTC
-+++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
- #if defined(OS_WIN)
-   if (!(platform & PLATFORM_WINDOWS))
-     return nullptr;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   if (!(platform & PLATFORM_LINUX))
-     return nullptr;
- #elif defined(OS_MAC)

devel/electron11/files/patch-components_crash_content_browser_BUILD.gn

@@ -1,27 +0,0 @@
---- components/crash/content/browser/BUILD.gn.orig	2021-01-07 00:36:29 UTC
-+++ components/crash/content/browser/BUILD.gn
-@@ -35,7 +35,7 @@ source_set("browser") {
-     "//content/public/common",
-   ]
- 
--  if (is_linux || is_chromeos || is_android) {
-+  if ((is_linux || is_chromeos || is_android) && !is_bsd) {
-     set_sources_assignment_filter([])
- 
-     # Want this file on both Linux and Android.
-@@ -49,13 +49,13 @@ source_set("browser") {
-     deps += [ "//third_party/crashpad/crashpad/client" ]
-   }
- 
--  if (!is_android) {
-+  if (!is_android && !is_bsd) {
-     deps += [ "//third_party/breakpad:client" ]
-   }
- 
-   # This is not in the GYP build but this target includes breakpad client
-   # headers, so add the dependency here.
--  if ((is_posix && !is_ios) || is_fuchsia) {
-+  if ((is_posix && !is_ios && !is_bsd) || is_fuchsia) {
-     configs += [ "//third_party/breakpad:client_config" ]
-     public_configs = [ "//third_party/breakpad:client_config" ]
-   }

devel/electron11/files/patch-components_flags__ui_flags__state.cc

@@ -1,11 +0,0 @@
---- components/flags_ui/flags_state.cc.orig	2021-01-07 00:36:29 UTC
-+++ components/flags_ui/flags_state.cc
-@@ -687,7 +687,7 @@ int FlagsState::GetCurrentPlatform() {
-   return kOsWin;
- #elif defined(OS_CHROMEOS)
-   return kOsCrOS;
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
-   return kOsLinux;
- #elif defined(OS_ANDROID)
-   return kOsAndroid;

devel/electron11/files/patch-components_os__crypt_os__crypt.h

@@ -1,48 +0,0 @@
---- components/os_crypt/os_crypt.h.orig	2021-01-07 00:36:30 UTC
-+++ components/os_crypt/os_crypt.h
-@@ -15,9 +15,9 @@
- #include "base/strings/string16.h"
- #include "build/build_config.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- class KeyStorageLinux;
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
- #if defined(OS_WIN) || defined(OS_MAC)
- class PrefRegistrySimple;
-@@ -34,13 +34,13 @@ struct Config;
- // true for Linux, if a password management tool is available.
- class OSCrypt {
-  public:
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // Set the configuration of OSCrypt.
-   static COMPONENT_EXPORT(OS_CRYPT) void SetConfig(
-       std::unique_ptr<os_crypt::Config> config);
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
--#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // On Linux returns true iff the real secret key (not hardcoded one) is
-   // available. On MacOS returns true if Keychain is available (for mock
-   // Keychain it returns true if not using locked Keychain, false if using
-@@ -131,7 +131,7 @@ class OSCrypt {
-   DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
- };
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- // For unit testing purposes, inject methods to be used.
- // |get_key_storage_mock| provides the desired |KeyStorage| implementation.
- // If the provider returns |nullptr|, a hardcoded password will be used.
-@@ -146,6 +146,6 @@ void UseMockKeyStorageForTesting(
- // Clears any caching and most lazy initialisations performed by the production
- // code. Should be used after any test which required a password.
- COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting();
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- 
- #endif  // COMPONENTS_OS_CRYPT_OS_CRYPT_H_

devel/electron11/files/patch-components_os__crypt_os__crypt__unittest.cc

@@ -1,11 +0,0 @@
---- components/os_crypt/os_crypt_unittest.cc.orig	2021-01-07 00:36:30 UTC
-+++ components/os_crypt/os_crypt_unittest.cc
-@@ -18,7 +18,7 @@
- #include "components/os_crypt/os_crypt_mocker.h"
- #include "testing/gtest/include/gtest/gtest.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "components/os_crypt/os_crypt_mocker_linux.h"
- #endif
- 

devel/electron11/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc

@@ -1,20 +0,0 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2021-01-07 00:36:30 UTC
-+++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -32,7 +32,7 @@
- #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include <limits.h>  // For HOST_NAME_MAX
- #endif
- 
-@@ -66,7 +66,7 @@
- #include "base/system/sys_info.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "base/system/sys_info.h"
- #endif
- 

devel/electron11/files/patch-components_viz_common_features.cc

@@ -1,11 +0,0 @@
---- components/viz/common/features.cc.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/common/features.cc
-@@ -22,7 +22,7 @@ const base::Feature kForcePreferredIntervalForVideo{
- 
- // Use the SkiaRenderer.
- #if defined(OS_WIN) || \
--    (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST)))
-+    (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD)
- const base::Feature kUseSkiaRenderer{"UseSkiaRenderer",
-                                      base::FEATURE_ENABLED_BY_DEFAULT};
- #else

devel/electron11/files/patch-components_viz_host_host__display__client.cc

@@ -1,11 +0,0 @@
---- components/viz/host/host_display_client.cc.orig	2021-01-25 11:27:00 UTC
-+++ components/viz/host/host_display_client.cc
-@@ -64,7 +64,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
- #endif
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {
-   NOTIMPLEMENTED();
- }

devel/electron11/files/patch-components_viz_host_host__display__client.h

@@ -1,11 +0,0 @@
---- components/viz/host/host_display_client.h.orig	2021-01-25 11:27:00 UTC
-+++ components/viz/host/host_display_client.h
-@@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
-   void CreateLayeredWindowUpdater(
-       mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
- #endif
- 

devel/electron11/files/patch-components_viz_service_display__embedder_software__output__surface.cc

@@ -1,20 +0,0 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -112,7 +112,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
-   base::TimeTicks now = base::TimeTicks::Now();
-   base::TimeDelta interval_to_next_refresh =
-       now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (needs_swap_size_notifications_)
-     client_->DidSwapWithSize(pixel_size);
- #endif
-@@ -141,7 +141,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
-   return gfx::OVERLAY_TRANSFORM_NONE;
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- void SoftwareOutputSurface::SetNeedsSwapSizeNotifications(
-     bool needs_swap_size_notifications) {
-   needs_swap_size_notifications_ = needs_swap_size_notifications;

devel/electron11/files/patch-components_viz_service_display__embedder_software__output__surface.h

@@ -1,20 +0,0 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/service/display_embedder/software_output_surface.h
-@@ -48,7 +48,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
-       UpdateVSyncParametersCallback callback) override;
-   void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
-   gfx::OverlayTransform GetDisplayTransform() override;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   void SetNeedsSwapSizeNotifications(
-       bool needs_swap_size_notifications) override;
- #endif
-@@ -71,7 +71,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
-   std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_;
-   ui::LatencyTracker latency_tracker_;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   bool needs_swap_size_notifications_ = false;
- #endif
- 

devel/electron11/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc

@@ -1,20 +0,0 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -54,7 +54,7 @@ RootCompositorFrameSinkImpl::Create(
-   output_surface->SetNeedsSwapSizeNotifications(
-       params->send_swap_size_notifications);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // For X11, we need notify client about swap completion after resizing, so the
-   // client can use it for synchronize with X11 WM.
-   output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -456,7 +456,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
- #if defined(OS_ANDROID)
-   if (display_client_)
-     display_client_->DidCompleteSwapWithSize(pixel_size);
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (display_client_ && pixel_size != last_swap_pixel_size_) {
-     last_swap_pixel_size_ = pixel_size;
-     display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_);

devel/electron11/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h

@@ -1,11 +0,0 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -163,7 +163,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
-   base::TimeDelta preferred_frame_interval_ =
-       FrameRateDecider::UnspecifiedFrameInterval();
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   gfx::Size last_swap_pixel_size_;
- #endif
- 

devel/electron11/files/patch-components_viz_test_fake__output__surface.cc

@@ -1,11 +0,0 @@
---- components/viz/test/fake_output_surface.cc.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/test/fake_output_surface.cc
-@@ -115,7 +115,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra
-                                          : gfx::OVERLAY_TRANSFORM_NONE;
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- void FakeOutputSurface::SetNeedsSwapSizeNotifications(
-     bool needs_swap_size_notifications) {}
- #endif

devel/electron11/files/patch-components_viz_test_fake__output__surface.h

@@ -1,11 +0,0 @@
---- components/viz/test/fake_output_surface.h.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/test/fake_output_surface.h
-@@ -86,7 +86,7 @@ class FakeOutputSurface : public OutputSurface {
-       UpdateVSyncParametersCallback callback) override;
-   void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
-   gfx::OverlayTransform GetDisplayTransform() override;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   void SetNeedsSwapSizeNotifications(
-       bool needs_swap_size_notifications) override;
- #endif

devel/electron11/files/patch-components_viz_test_mock__display__client.h

@@ -1,11 +0,0 @@
---- components/viz/test/mock_display_client.h.orig	2021-01-07 00:36:32 UTC
-+++ components/viz/test/mock_display_client.h
-@@ -36,7 +36,7 @@ class MockDisplayClient : public mojom::DisplayClient 
-   MOCK_METHOD1(SetWideColorEnabled, void(bool enabled));
-   MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate));
- #endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&));
- #endif
- 

devel/electron11/files/patch-content_browser_compositor_viz__process__transport__factory.cc

@@ -1,11 +0,0 @@
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2021-01-25 11:27:00 UTC
-+++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien
-   HostDisplayClient& operator=(const HostDisplayClient&) = delete;
- 
-   // viz::HostDisplayClient:
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override {
-     compositor_->OnCompleteSwapWithNewSize(size);
-   }

devel/electron11/files/patch-content_browser_devtools_protocol_system__info__handler.cc

@@ -1,11 +0,0 @@
---- content/browser/devtools/protocol/system_info_handler.cc.orig	2021-01-07 00:36:32 UTC
-+++ content/browser/devtools/protocol/system_info_handler.cc
-@@ -47,7 +47,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
- // Give the GPU process a few seconds to provide GPU info.
- // Linux Debug builds need more time -- see Issue 796437 and 1046598.
- // Windows builds need more time -- see Issue 873112 and 1004472.
--#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || \
-+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(NDEBUG)) || \
-     defined(OS_WIN)
- const int kGPUInfoWatchdogTimeoutMs = 30000;
- #else

devel/electron11/files/patch-content_browser_gpu_compositor__util.cc

@@ -1,16 +0,0 @@
---- content/browser/gpu/compositor_util.cc.orig	2021-01-07 00:36:33 UTC
-+++ content/browser/gpu/compositor_util.cc
-@@ -131,11 +131,11 @@ const GpuFeatureData GetGpuFeatureData(
-     {"video_decode",
-      SafeGetFeatureStatus(gpu_feature_info,
-                           gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
--#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-      !command_line.HasSwitch(switches::kEnableAcceleratedVideoDecode),
- #else
-      command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
--#endif  // defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-      DisableInfo::Problem(
-          "Accelerated video decode has been disabled, either via blocklist, "
-          "about:flags or the command line."),

devel/electron11/files/patch-content_browser_gpu_gpu__process__host.cc

@@ -1,11 +0,0 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2021-01-25 11:27:00 UTC
-+++ content/browser/gpu/gpu_process_host.cc
-@@ -1128,7 +1128,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
-   std::unique_ptr<base::CommandLine> cmd_line =
-       std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
- #else
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
-                                          : ChildProcessHost::CHILD_NORMAL;
- #elif defined(OS_MAC)

devel/electron11/files/patch-content_browser_utility__process__host.cc

@@ -1,11 +0,0 @@
---- content/browser/utility_process_host.cc.orig	2021-01-07 00:36:33 UTC
-+++ content/browser/utility_process_host.cc
-@@ -58,7 +58,7 @@ UtilityProcessHost::UtilityProcessHost()
- 
- UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
-     : sandbox_type_(sandbox::policy::SandboxType::kUtility),
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-       child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
- #else
-       child_flags_(ChildProcessHost::CHILD_NORMAL),

devel/electron11/files/patch-content_browser_web__contents_web__contents__view__aura.cc

@@ -1,11 +0,0 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig	2021-01-25 11:26:59 UTC
-+++ content/browser/web_contents/web_contents_view_aura.cc
-@@ -1209,7 +1209,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
-     // Linux window managers like to handle raise-on-click themselves.  If we
-     // raise-on-click manually, this may override user settings that prevent
-     // focus-stealing.
--#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
-     // It is possible for the web-contents to be destroyed while it is being
-     // activated. Use a weak-ptr to track whether that happened or not.
-     // More in https://crbug.com/1040725

devel/electron11/files/patch-content_browser_webui_shared__resources__data__source.cc

@@ -1,18 +0,0 @@
---- content/browser/webui/shared_resources_data_source.cc.orig	2021-01-07 00:36:33 UTC
-+++ content/browser/webui/shared_resources_data_source.cc
-@@ -120,13 +120,13 @@ const std::map<int, std::string> CreateMojoResourceIdT
-          "mojo/mojo/public/mojom/base/text_direction.mojom.html"},
-         {IDR_MOJO_TEXT_DIRECTION_MOJOM_LITE_JS,
-          "mojo/mojo/public/mojom/base/text_direction.mojom-lite.js"},
--#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) || defined(OS_ANDROID)
-         {IDR_MOJO_TIME_MOJOM_HTML,
-          "mojo/mojo/public/mojom/base/time.mojom.html"},
-         {IDR_MOJO_TIME_MOJOM_LITE_JS,
-          "mojo/mojo/public/mojom/base/time.mojom-lite.js"},
--#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
-+#endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
-         // defined(OS_CHROMEOS) || defined(OS_ANDROID)
-   };
- }

devel/electron11/files/patch-content_common_BUILD.gn

@@ -1,27 +0,0 @@
---- content/common/BUILD.gn.orig	2021-01-07 00:36:33 UTC
-+++ content/common/BUILD.gn
-@@ -328,6 +328,15 @@ source_set("common") {
-     libs += [ "android" ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "sandbox_init_linux.cc",
-+    ]
-+    deps += [
-+      "//third_party/fontconfig",
-+    ]
-+  }
-+
-   if (is_debug && !is_component_build && enable_plugins) {
-     # Content depends on the PPAPI message logging stuff; if this isn't here,
-     # some unit test binaries won't compile. This only worked in release mode
-@@ -345,7 +354,7 @@ source_set("common") {
-     sources -= [ "cursors/webcursor_aura.cc" ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "zygote/sandbox_support_linux.cc",
-       "zygote/send_zygote_child_ping_linux.cc",

devel/electron11/files/patch-content_public_common_content__switches.cc

@@ -1,20 +0,0 @@
---- content/public/common/content_switches.cc.orig	2021-01-07 00:36:33 UTC
-+++ content/public/common/content_switches.cc
-@@ -905,7 +905,7 @@ const char kWebXrRuntimeWMR[] = "windows-mixed-reality
- const char kDisableAcceleratedVideoDecode[] =
-     "disable-accelerated-video-decode";
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD)
- // Enables hardware acceleration of video decoding on linux. (defaults to off)
- const char kEnableAcceleratedVideoDecode[] = "enable-accelerated-video-decode";
- #endif
-@@ -969,7 +969,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
- // Enable indication that browser is controlled by automation.
- const char kEnableAutomation[] = "enable-automation";
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- // Allows sending text-to-speech requests to speech-dispatcher, a common
- // Linux speech service. Because it's buggy, the user must explicitly
- // enable it so that visiting a random webpage can't cause instability.

devel/electron11/files/patch-content_public_common_content__switches.h

@@ -1,20 +0,0 @@
---- content/public/common/content_switches.h.orig	2021-01-07 00:36:33 UTC
-+++ content/public/common/content_switches.h
-@@ -248,7 +248,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat
- CONTENT_EXPORT extern const char kWebXrRuntimeOpenXr[];
- CONTENT_EXPORT extern const char kWebXrRuntimeWMR[];
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD)
- CONTENT_EXPORT extern const char kEnableAcceleratedVideoDecode[];
- #endif
- CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
-@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
- CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
- #endif
- 

devel/electron11/files/patch-content_public_test_content__browser__test.cc

@@ -1,29 +0,0 @@
---- content/public/test/content_browser_test.cc.orig	2021-01-07 00:36:33 UTC
-+++ content/public/test/content_browser_test.cc
-@@ -26,7 +26,7 @@
- #include "base/mac/foundation_util.h"
- #endif
- 
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
- #include "ui/base/ime/init/input_method_initializer.h"
- #endif
- 
-@@ -87,7 +87,7 @@ void ContentBrowserTest::SetUp() {
- #endif
- 
-   // LinuxInputMethodContextFactory has to be initialized.
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
-   ui::InitializeInputMethodForTesting();
- #endif
- 
-@@ -100,7 +100,7 @@ void ContentBrowserTest::TearDown() {
-   BrowserTestBase::TearDown();
- 
-   // LinuxInputMethodContextFactory has to be shutdown.
--#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
-   ui::ShutdownInputMethodForTesting();
- #endif
- }

devel/electron11/files/patch-content_renderer_render__thread__impl.cc

@@ -1,11 +0,0 @@
---- content/renderer/render_thread_impl.cc.orig	2021-01-25 11:26:59 UTC
-+++ content/renderer/render_thread_impl.cc
-@@ -173,7 +173,7 @@
- 
- #if defined(OS_MAC)
- #include <malloc/malloc.h>
--#else
-+#elif !defined(OS_BSD)
- #include <malloc.h>
- #endif
- 

devel/electron11/files/patch-content_shell_browser_shell__browser__main__parts.cc

@@ -1,20 +0,0 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2021-01-07 00:36:33 UTC
-+++ content/shell/browser/shell_browser_main_parts.cc
-@@ -54,7 +54,7 @@
- #if defined(USE_AURA) && defined(USE_X11)
- #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
- #endif
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
- #include "ui/base/ime/init/input_method_initializer.h"
- #endif
- #if defined(OS_CHROMEOS)
-@@ -141,7 +141,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
-   if (!features::IsUsingOzonePlatform())
-     ui::SetDefaultX11ErrorHandlers();
- #endif
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
-   ui::InitializeInputMethodForTesting();
- #endif
- #if defined(OS_ANDROID)

devel/electron11/files/patch-electron_shell_browser_electron__browser__main__parts.cc

@@ -1,20 +0,0 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig	2021-04-02 17:02:59 UTC
-+++ electron/shell/browser/electron_browser_main_parts.cc
-@@ -362,7 +362,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
-   // happen before the ResourceBundle is loaded
-   if (locale.empty())
-     l10n_util::OverrideLocaleWithCocoaLocale();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
-   // which keys off of getenv("LC_ALL").
-   // We must set this env first to make ui::ResourceBundle accept the custom
-@@ -385,7 +385,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
-   ElectronBrowserClient::SetApplicationLocale(app_locale);
-   fake_browser_process_->SetApplicationLocale(app_locale);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Reset to the original LC_ALL since we should not be changing it.
-   if (!locale.empty()) {
-     if (lc_all)

devel/electron11/files/patch-electron_shell_browser_native__window__views.cc

@@ -1,47 +0,0 @@
---- electron/shell/browser/native_window_views.cc.orig	2021-04-27 14:58:49 UTC
-+++ electron/shell/browser/native_window_views.cc
-@@ -306,7 +306,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
-     last_window_state_ = ui::SHOW_STATE_NORMAL;
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Listen to move events.
-   aura::Window* window = GetNativeWindow();
-   if (window)
-@@ -326,7 +326,7 @@ NativeWindowViews::~NativeWindowViews() {
-   SetForwardMouseMessages(false);
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   aura::Window* window = GetNativeWindow();
-   if (window)
-     window->RemovePreTargetHandler(this);
-@@ -1391,7 +1391,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W
- }
- 
- void NativeWindowViews::OnWidgetDestroying(views::Widget* widget) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   aura::Window* window = GetNativeWindow();
-   if (window)
-     window->RemovePreTargetHandler(this);
-@@ -1501,7 +1501,7 @@ void NativeWindowViews::HandleKeyboardEvent(
-   if (widget_destroyed_)
-     return;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
-     NotifyWindowExecuteAppCommand(kBrowserBackward);
-   else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1513,7 +1513,7 @@ void NativeWindowViews::HandleKeyboardEvent(
-   root_view_->HandleKeyEvent(event);
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- void NativeWindowViews::OnMouseEvent(ui::MouseEvent* event) {
-   if (event->type() != ui::ET_MOUSE_PRESSED)
-     return;

devel/electron11/files/patch-electron_shell_browser_native__window__views.h

@@ -1,11 +0,0 @@
---- electron/shell/browser/native_window_views.h.orig	2021-02-19 19:40:19 UTC
-+++ electron/shell/browser/native_window_views.h
-@@ -218,7 +218,7 @@ class NativeWindowViews : public NativeWindow,
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) override;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // ui::EventHandler:
-   void OnMouseEvent(ui::MouseEvent* event) override;
- #endif

devel/electron11/files/patch-extensions_shell_BUILD.gn

@@ -1,11 +0,0 @@
---- extensions/shell/BUILD.gn.orig	2021-01-07 00:36:35 UTC
-+++ extensions/shell/BUILD.gn
-@@ -202,7 +202,7 @@ source_set("app_shell_lib") {
-     }
-   }
- 
--  if (is_desktop_linux) {
-+  if (is_desktop_linux && !is_bsd) {
-     sources += [
-       "app/shell_crash_reporter_client.cc",
-       "app/shell_crash_reporter_client.h",

devel/electron11/files/patch-extensions_shell_browser_shell__extensions__api__client.cc

@@ -1,20 +0,0 @@
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2021-01-07 00:36:35 UTC
-+++ extensions/shell/browser/shell_extensions_api_client.cc
-@@ -16,7 +16,7 @@
- #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
- #include "extensions/shell/browser/shell_web_view_guest_delegate.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
- #endif
- 
-@@ -52,7 +52,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
-   return std::make_unique<ShellDisplayInfoProvider>();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() {
-   if (!file_system_delegate_)
-     file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>();