summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index a852eb590b63..1f4374448fb3 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 2020-05-13 18:40:22 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2020-07-07 21:58:13 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -3723,7 +3723,7 @@ const char kZeroStateFilesDescription[] =
+@@ -3923,7 +3923,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
#if BUILDFLAG(USE_TCMALLOC)
const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning";
-@@ -3732,7 +3732,7 @@ const char kDynamicTcmallocDescription[] =
+@@ -3932,7 +3932,7 @@ const char kDynamicTcmallocDescription[] =
"utilization.";
#endif // BUILDFLAG(USE_TCMALLOC)
@@ -18,7 +18,7 @@
// All views-based platforms --------------------------------------------------
-@@ -3757,13 +3757,13 @@ const char kReopenTabInProductHelpDescription[] =
+@@ -3962,13 +3962,13 @@ const char kReopenTabInProductHelpDescription[] =
// Random platform combinations -----------------------------------------------
@@ -34,7 +34,7 @@
#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
-@@ -3775,7 +3775,7 @@ const char kClickToCallUIDescription[] =
+@@ -3980,7 +3980,7 @@ const char kClickToCallUIDescription[] =
#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
@@ -42,8 +42,8 @@
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
- const char kRemoteCopyReceiverName[] =
-@@ -3796,16 +3796,16 @@ const char kRemoteCopyProgressNotificationDescription[
+ const char kEnableMediaFeedsName[] = "Enables Media Feeds";
+@@ -4012,16 +4012,16 @@ const char kRemoteCopyProgressNotificationDescription[
"Enables progress notifications to be shown for the remote copy feature "
"when receiving a message.";