mirror of
https://git.freebsd.org/ports.git
synced 2025-07-07 20:39:18 -04:00
230cf3bad6
Approved by: rene (mentor) Security: https://vuxml.freebsd.org/freebsd/310ca30e-a951-11ed-8314-a8a1599412c6.html
69 lines
2.8 KiB
C++
69 lines
2.8 KiB
C++
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-02-08 09:03:45 UTC
|
|
+++ chrome/browser/prefs/browser_prefs.cc
|
|
@@ -455,14 +455,14 @@
|
|
#include "components/os_crypt/os_crypt.h"
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "chrome/browser/web_applications/url_handler_prefs.h"
|
|
#include "components/device_signals/core/browser/pref_names.h"
|
|
#endif
|
|
|
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
|
// of lacros-chrome is complete.
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
|
|
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
|
|
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
|
|
#endif
|
|
@@ -495,7 +495,7 @@
|
|
#include "chrome/browser/sessions/session_service_log.h"
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "ui/color/system_theme.h"
|
|
#endif
|
|
|
|
@@ -1033,7 +1033,7 @@ void RegisterProfilePrefsForMigration(
|
|
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
// Deprecated 08/2022.
|
|
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
|
|
#endif
|
|
@@ -1292,7 +1292,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
|
|
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
|
|
@@ -1627,11 +1627,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
|
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
device_signals::RegisterProfilePrefs(registry);
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
|
|
#endif
|
|
|
|
@@ -2015,7 +2015,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
|
|
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
// Added 08/2022.
|
|
if (profile_prefs->HasPrefPath(prefs::kUsesSystemThemeDeprecated)) {
|
|
auto migrated_theme =
|