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.h46
1 files changed, 19 insertions, 27 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index f3856cddbf7e..ff87d9f16c70 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 2020-08-18 18:40:05 UTC
+--- chrome/browser/flag_descriptions.h.orig 2020-09-08 19:14:00 UTC
+++ chrome/browser/flag_descriptions.h
@@ -19,9 +19,9 @@
#include "ppapi/buildflags/buildflags.h"
@@ -12,24 +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
-@@ -2306,14 +2306,14 @@ extern const char kZeroStateFilesDescription[];
-
- #endif // #if defined(OS_CHROMEOS)
-
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
-
- #if BUILDFLAG(USE_TCMALLOC)
- extern const char kDynamicTcmallocName[];
- extern const char kDynamicTcmallocDescription[];
- #endif // BUILDFLAG(USE_TCMALLOC)
-
--#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
-
- // All views-based platforms --------------------------------------------------
-
-@@ -2335,12 +2335,12 @@ extern const char kReopenTabInProductHelpDescription[]
+@@ -2402,14 +2402,14 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio
// Random platform combinations -----------------------------------------------
@@ -42,23 +25,17 @@
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #if BUILDFLAG(ENABLE_CLICK_TO_CALL)
-
-@@ -2349,7 +2349,7 @@ extern const char kClickToCallUIDescription[];
-
- #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
-
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
extern const char kEnableMediaFeedsName[];
-@@ -2367,15 +2367,15 @@ extern const char kRemoteCopyPersistentNotificationDes
+@@ -2427,15 +2427,15 @@ extern const char kRemoteCopyPersistentNotificationDes
extern const char kRemoteCopyProgressNotificationName[];
extern const char kRemoteCopyProgressNotificationDescription[];
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
-+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
// defined(OS_CHROMEOS)
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
@@ -72,3 +49,18 @@
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+@@ -2444,12 +2444,12 @@ extern const char kWebContentsOcclusionDescription[];
+
+ #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ #if BUILDFLAG(USE_TCMALLOC)
+ extern const char kDynamicTcmallocName[];
+ extern const char kDynamicTcmallocDescription[];
+ #endif // BUILDFLAG(USE_TCMALLOC)
+-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+
+ #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+ extern const char kUserDataSnapshotName[];