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.h32
1 files changed, 14 insertions, 18 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 7870c80884ec..dcd7f258f7f1 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,4 +1,4 @@
---- chrome/browser/flag_descriptions.h.orig 2021-09-24 04:25:58 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-01-20 10:35:49 UTC
+++ chrome/browser/flag_descriptions.h
@@ -22,9 +22,9 @@
#include "printing/buildflags/buildflags.h"
@@ -12,7 +12,7 @@
// This file declares strings used in chrome://flags. These messages are not
// translated, because instead of end-users they target Chromium developers and
-@@ -2954,7 +2954,7 @@ extern const char kDownloadShelfWebUIDescription[];
+@@ -3045,7 +3045,7 @@ extern const char kDownloadShelfWebUIDescription[];
// Random platform combinations -----------------------------------------------
@@ -20,8 +20,8 @@
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
- extern const char kEnableOopPrintDriversName[];
-@@ -2969,10 +2969,10 @@ extern const char kWebuiFeedbackDescription[];
+ extern const char kWebUIBrandingUpdateName[];
+@@ -3057,10 +3057,10 @@ extern const char kWebuiFeedbackDescription[];
extern const char kSettingsLandingPageRedesignName[];
extern const char kSettingsLandingPageRedesignDescription[];
@@ -34,7 +34,7 @@
extern const char kCommanderName[];
extern const char kCommanderDescription[];
-@@ -2983,7 +2983,7 @@ extern const char kDesktopRestructuredLanguageSettings
+@@ -3071,7 +3071,7 @@ extern const char kDesktopRestructuredLanguageSettings
extern const char kDesktopDetailedLanguageSettingsName[];
extern const char kDesktopDetailedLanguageSettingsDescription[];
@@ -43,20 +43,16 @@
#if defined(OS_CHROMEOS) || defined(OS_LINUX)
#if BUILDFLAG(USE_TCMALLOC)
-@@ -3002,10 +3002,10 @@ extern const char kWebShareName[];
+@@ -3090,7 +3090,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
- #endif // defined(OS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC)
-
--#if defined(OS_LINUX) && defined(USE_OZONE)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
- extern const char kUseOzonePlatformName[];
- extern const char kUseOzonePlatformDescription[];
--#endif // defined(OS_LINUX) && defined(USE_OZONE)
-+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
-
- // Feature flags --------------------------------------------------------------
-
-@@ -3061,7 +3061,7 @@ extern const char kElasticOverscrollName[];
+ #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC)
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ extern const char kOzonePlatformHintChoiceDefault[];
+ extern const char kOzonePlatformHintChoiceAuto[];
+ extern const char kOzonePlatformHintChoiceX11[];
+@@ -3171,7 +3171,7 @@ extern const char kElasticOverscrollName[];
extern const char kElasticOverscrollDescription[];
#endif // defined(OS_WIN) || defined(OS_ANDROID)