2023-08-16 22:26:55 +00:00
|
|
|
Index: chrome/browser/flag_descriptions.h
|
|
|
|
--- chrome/browser/flag_descriptions.h.orig
|
|
|
|
+++ chrome/browser/flag_descriptions.h
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -1412,7 +1412,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
|
2023-08-16 22:26:55 +00:00
|
|
|
extern const char kWebUIOmniboxPopupName[];
|
|
|
|
extern const char kWebUIOmniboxPopupDescription[];
|
|
|
|
|
|
|
|
-#if !BUILDFLAG(IS_LINUX)
|
|
|
|
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kWebUiSystemFontName[];
|
|
|
|
extern const char kWebUiSystemFontDescription[];
|
|
|
|
#endif
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -3928,7 +3928,7 @@ extern const char kLacrosMergeIcuDataFileName[];
|
2023-08-16 22:26:55 +00:00
|
|
|
extern const char kLacrosMergeIcuDataFileDescription[];
|
|
|
|
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
|
|
|
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kGetAllScreensMediaName[];
|
|
|
|
extern const char kGetAllScreensMediaDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4058,14 +4058,14 @@ extern const char kSearchWebInSidePanelDescription[];
|
2023-08-16 22:26:55 +00:00
|
|
|
// Random platform combinations -----------------------------------------------
|
|
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
|
|
|
- BUILDFLAG(IS_FUCHSIA)
|
|
|
|
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kQuickCommandsName[];
|
|
|
|
extern const char kQuickCommandsDescription[];
|
|
|
|
|
|
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
|
|
|
// defined (OS_FUCHSIA)
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
|
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kWebShareName[];
|
|
|
|
extern const char kWebShareDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4075,7 +4075,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
|
2023-08-16 22:26:55 +00:00
|
|
|
extern const char kWebBluetoothConfirmPairingSupportDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kOzonePlatformHintChoiceDefault[];
|
|
|
|
extern const char kOzonePlatformHintChoiceAuto[];
|
|
|
|
extern const char kOzonePlatformHintChoiceX11[];
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4085,7 +4085,7 @@ extern const char kOzonePlatformHintName[];
|
2023-08-16 22:26:55 +00:00
|
|
|
extern const char kOzonePlatformHintDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
|
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kSkipUndecryptablePasswordsName[];
|
|
|
|
extern const char kSkipUndecryptablePasswordsDescription[];
|
|
|
|
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4093,13 +4093,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
|
2023-08-16 22:26:55 +00:00
|
|
|
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
|
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kAsyncDnsName[];
|
|
|
|
extern const char kAsyncDnsDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
|
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
|
|
|
- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kFollowingFeedSidepanelName[];
|
|
|
|
extern const char kFollowingFeedSidepanelDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4115,7 +4115,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
|
2023-08-16 22:26:55 +00:00
|
|
|
extern const char kEnableProtoApiForClassifyUrlDescription[];
|
|
|
|
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kUseOutOfProcessVideoDecodingName[];
|
|
|
|
extern const char kUseOutOfProcessVideoDecodingDescription[];
|
|
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4189,7 +4189,7 @@ extern const char kElasticOverscrollDescription[];
|
2023-08-16 22:26:55 +00:00
|
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN) || \
|
|
|
|
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
|
|
|
|
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
|
|
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kUIDebugToolsName[];
|
|
|
|
extern const char kUIDebugToolsDescription[];
|
|
|
|
|
2023-08-18 18:38:43 +00:00
|
|
|
@@ -4207,7 +4207,7 @@ extern const char kSigninInterceptBubbleV2Description[
|
2023-08-16 22:26:55 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
|
|
|
|
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
|
|
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
|
|
|
extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
|
|
|
|
extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
|
|
|
|
#endif
|