blob: d8966ae52a20173a1fd57ce46ca98bfa9b1ba446 (
plain) (
blame)
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
|
--- chrome/browser/flag_descriptions.h.orig 2020-07-07 21:58:13 UTC
+++ chrome/browser/flag_descriptions.h
@@ -19,9 +19,9 @@
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/allocator/buildflags.h"
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || 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
@@ -2303,14 +2303,14 @@ extern const char kZeroStateFilesDescription[];
#endif // #if defined(OS_CHROMEOS)
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
#if BUILDFLAG(USE_TCMALLOC)
extern const char kDynamicTcmallocName[];
extern const char kDynamicTcmallocDescription[];
#endif // BUILDFLAG(USE_TCMALLOC)
-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
// All views-based platforms --------------------------------------------------
@@ -2332,12 +2332,12 @@ extern const char kReopenTabInProductHelpDescription[]
// Random platform combinations -----------------------------------------------
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
extern const char kWebGL2ComputeContextName[];
extern const char kWebGL2ComputeContextDescription[];
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
@@ -2346,7 +2346,7 @@ extern const char kClickToCallUIDescription[];
#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
extern const char kEnableMediaFeedsName[];
@@ -2364,15 +2364,15 @@ extern const char kRemoteCopyPersistentNotificationDes
extern const char kRemoteCopyProgressNotificationName[];
extern const char kRemoteCopyProgressNotificationDescription[];
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
// defined(OS_CHROMEOS)
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
extern const char kDirectManipulationStylusName[];
extern const char kDirectManipulationStylusDescription[];
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
|