aboutsummaryrefslogtreecommitdiff
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.cc30
1 files changed, 9 insertions, 21 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 41242761d61c..1f192e114dff 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 2021-06-09 22:13:55 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2021-07-19 18:45:08 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -5007,7 +5007,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] =
+@@ -5015,7 +5015,7 @@ const char kInstallableInkDropDescription[] =
// Random platform combinations -----------------------------------------------
@@ -9,32 +9,20 @@
defined(OS_CHROMEOS)
const char kEnableOopPrintDriversName[] =
-@@ -5040,20 +5040,20 @@ const char kRemoteCopyProgressNotificationDescription[
- "Enables progress notifications to be shown for the remote copy feature "
- "when receiving a message.";
+@@ -5039,10 +5039,10 @@ const char kSettingsLandingPageRedesignDescription[] =
+ "Changes the layout of the chrome://settings page to only show one section "
+ "at a time.";
-#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_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_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_LINUX)
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
const char kCommanderName[] = "Commander";
const char kCommanderDescription[] =
-@@ -5069,7 +5069,7 @@ const char kDesktopDetailedLanguageSettingsName[] =
+@@ -5058,7 +5058,7 @@ const char kDesktopDetailedLanguageSettingsName[] =
const char kDesktopDetailedLanguageSettingsDescription[] =
"Enable the new detailed language settings page";
@@ -43,7 +31,7 @@
#if defined(OS_CHROMEOS) || defined(OS_LINUX)
#if BUILDFLAG(USE_TCMALLOC)
-@@ -5096,20 +5096,20 @@ const char kWebShareDescription[] =
+@@ -5085,20 +5085,20 @@ const char kWebShareDescription[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -68,7 +56,7 @@
// Feature flags --------------------------------------------------------------
-@@ -5190,7 +5190,7 @@ const char kAutofillCreditCardUploadDescription[] =
+@@ -5184,7 +5184,7 @@ const char kAutofillCreditCardUploadDescription[] =
#endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
@@ -77,7 +65,7 @@
const char kSendWebUIJavaScriptErrorReportsName[] =
"Send WebUI JavaScript Error Reports";
const char kSendWebUIJavaScriptErrorReportsDescription[] =
-@@ -5199,7 +5199,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription
+@@ -5193,7 +5193,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription
"will be sent to Google.";
#endif