diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_flag__descriptions.cc | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 5211293e72de..3fb496df6d63 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-08-31 12:19:35 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5867,7 +5867,7 @@ const char kSideSearchDSESupportDescription[] = +@@ -6066,7 +6066,7 @@ const char kSideSearchDSESupportDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kDesktopDetailedLanguageSettingsName[] = "Detailed Language Settings (Desktop)"; -@@ -5888,7 +5888,7 @@ const char kWebShareDescription[] = +@@ -6087,7 +6087,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -18,16 +18,16 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -5900,7 +5900,7 @@ const char kOzonePlatformHintDescription[] = - "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; - #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +@@ -6107,7 +6107,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti + "Bluetooth"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -5913,7 +5913,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6120,7 +6120,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) @@ -36,7 +36,16 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6028,7 +6028,7 @@ const char kElasticOverscrollDescription[] = +@@ -6129,7 +6129,7 @@ const char kSkipUndecryptablePasswordsDescription[] = + "there are undecryptable ones."; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kAsyncDnsName[] = "Async DNS resolver"; + const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +@@ -6234,7 +6234,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ |