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 | 81 |
1 files changed, 45 insertions, 36 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..a4ca410854a5 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-11-13 06:36:37 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[] = +@@ -4549,15 +4549,15 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -32,34 +14,61 @@ -#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) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4018,16 +4018,16 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4601,17 +4601,17 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; --#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_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = "If enabled, Chrome will scroll web pages on stylus drag."; --#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_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) +@@ -4623,14 +4623,14 @@ const char kWebContentsOcclusionDescription[] = + + #endif // defined(OS_WIN) || defined(OS_MAC) || 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_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) + #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + const char kUserDataSnapshotName[] = "Enable user data snapshots"; +@@ -4646,12 +4646,12 @@ const char kWebShareDescription[] = + "platforms."; + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + const char kEnableEphemeralGuestProfilesOnDesktopName[] = + "Enable ephemeral Guest profiles on Desktop"; + const char kEnableEphemeralGuestProfilesOnDesktopDescription[] = + "Enables ephemeral Guest profiles on Windows, Linux, and Mac."; +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + + // Feature flags -------------------------------------------------------------- |