1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.28 2021/11/16 11:28:46 robert Exp $
Index: chrome/browser/prefs/browser_prefs.cc
--- chrome/browser/prefs/browser_prefs.cc.orig
+++ chrome/browser/prefs/browser_prefs.cc
@@ -410,14 +410,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
-#if defined(OS_WIN) || defined(OS_MAC) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
(defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/web_applications/url_handler_prefs.h"
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(OS_WIN) || defined(OS_MAC) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -485,7 +485,7 @@ const char kLocalDiscoveryNotificationsEnabled[] =
#endif
// Deprecated 11/2020
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
const char kMigrationToLoginDBStep[] = "profile.migration_to_logindb_step";
#endif
@@ -738,7 +738,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterBooleanPref(prefs::kWebAppsUserDisplayModeCleanedUp, false);
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
registry->RegisterIntegerPref(kMigrationToLoginDBStep, 0);
#endif
@@ -1058,7 +1058,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
// TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the
// migration is complete.
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
enterprise_connectors::RegisterLocalPrefs(registry);
#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN)
@@ -1089,7 +1089,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // defined(OS_WIN)
-#if defined(OS_WIN) || defined(OS_MAC) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
(defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
@@ -1385,7 +1385,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(OS_WIN) || defined(OS_MAC) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \
(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -1526,7 +1526,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs);
// Added 11/2020
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
profile_prefs->ClearPref(kMigrationToLoginDBStep);
#endif
|
