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
77
78
79
80
81
82
|
--- chrome/browser/flag_descriptions.h.orig 2021-07-19 18:45:08 UTC
+++ chrome/browser/flag_descriptions.h
@@ -22,9 +22,9 @@
#include "printing/buildflags/buildflags.h"
#include "third_party/blink/public/common/buildflags.h"
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include "base/allocator/buildflags.h"
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// This file declares strings used in chrome://flags. These messages are not
// translated, because instead of end-users they target Chromium developers and
@@ -2928,7 +2928,7 @@ extern const char kInstallableInkDropDescription[];
// Random platform combinations -----------------------------------------------
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
extern const char kEnableOopPrintDriversName[];
@@ -2943,10 +2943,10 @@ extern const char kWebuiFeedbackDescription[];
extern const char kSettingsLandingPageRedesignName[];
extern const char kSettingsLandingPageRedesignDescription[];
-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
// defined(OS_CHROMEOS)
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
extern const char kCommanderName[];
extern const char kCommanderDescription[];
@@ -2957,7 +2957,7 @@ extern const char kDesktopRestructuredLanguageSettings
extern const char kDesktopDetailedLanguageSettingsName[];
extern const char kDesktopDetailedLanguageSettingsDescription[];
-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
#if defined(OS_CHROMEOS) || defined(OS_LINUX)
#if BUILDFLAG(USE_TCMALLOC)
@@ -2978,17 +2978,17 @@ extern const char kWebShareDescription[];
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
defined(OS_MAC)
extern const char kEnableEphemeralGuestProfilesOnDesktopName[];
extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[];
-#endif // defined(OS_WIN) || (defined(OS_LINUX) ||
+#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) ||
// BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
-#if defined(OS_LINUX) && defined(USE_OZONE)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
extern const char kUseOzonePlatformName[];
extern const char kUseOzonePlatformDescription[];
-#endif // defined(OS_LINUX) && defined(USE_OZONE)
+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
// Feature flags --------------------------------------------------------------
@@ -3046,12 +3046,12 @@ extern const char kAutofillCreditCardUploadDescription
#endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
-#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
+#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
extern const char kSendWebUIJavaScriptErrorReportsName[];
extern const char kSendWebUIJavaScriptErrorReportsDescription[];
#endif
-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
defined(OS_MAC)
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
|
