summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_flag__descriptions.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.h')
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 5b361c39b876..5b37626cc3de 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig 2024-04-19 13:02:56 UTC
+--- chrome/browser/flag_descriptions.h.orig 2024-06-17 12:56:06 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -1709,7 +1709,7 @@ extern const char kCbdTimeframeRequiredName[];
+@@ -1702,7 +1702,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,16 @@
extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif
-@@ -1890,7 +1890,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
+@@ -1873,7 +1873,7 @@ extern const char kShowAutofillTypePredictionsName[];
+ extern const char kShowAutofillTypePredictionsDescription[];
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ extern const char kShowFeaturedEnterpriseSiteSearchName[];
+ extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
+ #endif
+@@ -1888,7 +1888,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +27,7 @@
extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[];
#endif
-@@ -4323,7 +4323,7 @@ extern const char kLacrosMergeIcuDataFileName[];
+@@ -4347,7 +4347,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -27,7 +36,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4471,7 +4471,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
+@@ -4502,7 +4502,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux ---------------------------------------------------------------------
@@ -36,7 +45,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -4513,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4544,7 +4544,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -45,42 +54,33 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
-@@ -4524,13 +4524,13 @@ extern const char kRestartToGainAccessToKeychainName[]
- extern const char kRestartToGainAccessToKeychainDescription[];
+@@ -4556,13 +4556,13 @@ extern const char kRestartToGainAccessToKeychainDescri
#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)
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4541,7 +4541,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
- extern const char kEnableProtoApiForClassifyUrlDescription[];
- #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+ // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
-@@ -4618,7 +4618,7 @@ extern const char kElementCaptureDescription[];
+@@ -4658,7 +4658,7 @@ extern const char kElementCaptureDescription[];
#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)
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
-@@ -4652,7 +4652,7 @@ extern const char kComposeTextSelectionName[];
- extern const char kComposeTextSelectionDescription[];
+@@ -4701,7 +4701,7 @@ extern const char kComposeNudgeAtCursorName[];
+ extern const char kComposeNudgeAtCursorDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)