Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 29 deletions

diff --git a/devel/electron35/files/patch-chrome_browser_global__features.cc b/devel/electron35/files/patch-chrome_browser_global__features.cc
deleted file mode 100644
index 1ba19303b7ae..000000000000
--- a/devel/electron35/files/patch-chrome_browser_global__features.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/global_features.cc.orig	2025-03-24 20:50:14 UTC
-+++ chrome/browser/global_features.cc
-@@ -21,7 +21,7 @@
- #include "chrome/browser/glic/launcher/glic_background_mode_manager.h"  // nogncheck
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // This causes a gn error on Android builds, because gn does not understand
- // buildflags, so we include it only on platforms where it is used.
- #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
-@@ -60,7 +60,7 @@ void GlobalFeatures::Init() {
- 
- void GlobalFeatures::Init() {
-   system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   whats_new_registry_ = CreateWhatsNewRegistry();
- #endif
- 
-@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
-   return system_permission_settings::PlatformHandle::Create();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::unique_ptr<whats_new::WhatsNewRegistry>
- GlobalFeatures::CreateWhatsNewRegistry() {
-   return whats_new::CreateWhatsNewRegistry();