aboutsummaryrefslogtreecommitdiff
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.h19
1 files changed, 5 insertions, 14 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index c15792e97796..c562addb2caf 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,24 +1,15 @@
---- chrome/browser/flag_descriptions.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3241,7 +3241,7 @@ extern const char kDownloadShelfWebUIDescription[];
+@@ -3279,7 +3279,7 @@ extern const char kSideSearchDSESupportDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-
- extern const char kWebuiFeedbackName[];
- extern const char kWebuiFeedbackDescription[];
-@@ -3250,7 +3250,7 @@ extern const char kWebuiFeedbackDescription[];
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kDesktopRestructuredLanguageSettingsName[];
extern const char kDesktopRestructuredLanguageSettingsDescription[];
-@@ -3269,7 +3269,7 @@ extern const char kWebShareName[];
+@@ -3298,7 +3298,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -27,7 +18,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3285,7 +3285,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3314,7 +3314,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -36,7 +27,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -3377,7 +3377,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -3395,7 +3395,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \