diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron39/files/patch-chrome_browser_ui_managed__ui.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron39/files/patch-chrome_browser_ui_managed__ui.cc')
| -rw-r--r-- | devel/electron39/files/patch-chrome_browser_ui_managed__ui.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/devel/electron39/files/patch-chrome_browser_ui_managed__ui.cc b/devel/electron39/files/patch-chrome_browser_ui_managed__ui.cc new file mode 100644 index 000000000000..803fcfc1b1a3 --- /dev/null +++ b/devel/electron39/files/patch-chrome_browser_ui_managed__ui.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/managed_ui.cc.orig 2025-03-24 20:50:14 UTC ++++ chrome/browser/ui/managed_ui.cc +@@ -433,7 +433,7 @@ std::optional<std::string> GetDeviceManagerIdentity() + g_browser_process->platform_part()->browser_policy_connector_ash(); + return connector->GetEnterpriseDomainManager(); + #else +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled( + features::kEnterpriseManagementDisclaimerUsesCustomLabel)) { + std::string custom_management_label = +@@ -463,7 +463,7 @@ std::optional<std::string> GetAccountManagerIdentity(P + return std::nullopt; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled( + features::kEnterpriseManagementDisclaimerUsesCustomLabel)) { + std::string custom_management_label = |