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

1 files changed, 29 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-chrome_browser_profiles_profiles__state.cc b/devel/electron39/files/patch-chrome_browser_profiles_profiles__state.cc
new file mode 100644
index 000000000000..23ed0f866a80
--- /dev/null
+++ b/devel/electron39/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/profiles/profiles_state.cc.orig	2025-08-26 20:49:50 UTC
++++ chrome/browser/profiles/profiles_state.cc
+@@ -191,7 +191,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+                           PrefService* local_state,
+                           bool show_warning) {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   DCHECK(local_state);
+ 
+   // Check if guest mode enforcement commandline switch or policy are provided.
+@@ -227,7 +227,7 @@ bool IsGuestModeEnabled() {
+     return false;
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   // If there are any supervised profiles, disable guest mode.
+   if (std::ranges::any_of(g_browser_process->profile_manager()
+                               ->GetProfileAttributesStorage()
+@@ -243,7 +243,7 @@ bool IsGuestModeEnabled(const Profile& profile) {
+ }
+ 
+ bool IsGuestModeEnabled(const Profile& profile) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   ProfileAttributesEntry* profile_attributes =
+       g_browser_process->profile_manager()
+           ->GetProfileAttributesStorage()