diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
| commit | 40c48efc97e1692154f38e01ef1739bbef1e4728 (patch) | |
| tree | 80245efab86b6f22f00a53b43568f0fd51edfb14 /www/chromium/files/patch-chrome_browser_flag__descriptions.cc | |
| parent | deskutils/ultralist: Update to 1.6.1 (diff) | |
www/chromium: Update to version 85.0.4183.121
Submitted by: cem, rene
Obtained from: some patches from OpenBSD port
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_flag__descriptions.cc | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 8761ec1f68c9..5e53322baacc 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-08-18 18:40:05 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3929,7 +3929,7 @@ const char kZeroCopyVideoCaptureDescription[] = - - #endif // defined(OS_CHROMEOS) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - #if BUILDFLAG(USE_TCMALLOC) - const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; -@@ -3938,7 +3938,7 @@ const char kDynamicTcmallocDescription[] = - "utilization."; - #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 -------------------------------------------------- - -@@ -3968,13 +3968,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -4103,15 +4103,15 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -32,18 +14,12 @@ -#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) - -@@ -3986,7 +3986,7 @@ 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) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4018,16 +4018,16 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4143,16 +4143,16 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; @@ -63,3 +39,20 @@ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) +@@ -4163,14 +4163,14 @@ 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) + const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; + const char kDynamicTcmallocDescription[] = + "Allows tcmalloc to dynamically adjust tunables based on system resource " + "utilization."; + #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) + const char kUserDataSnapshotName[] = "Enable user data snapshots"; |