summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_about__flags.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_about__flags.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc53
1 files changed, 31 insertions, 22 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 3aca9b080313..ad12e08163e9 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,9 +1,9 @@
---- chrome/browser/about_flags.cc.orig 2019-04-30 22:22:32 UTC
+--- chrome/browser/about_flags.cc.orig 2019-06-04 18:55:16 UTC
+++ chrome/browser/about_flags.cc
-@@ -1615,13 +1615,13 @@ const FeatureEntry kFeatureEntries[] = {
- SINGLE_VALUE_TYPE(
- spellcheck::switches::kEnableSpellingFeedbackFieldTrial)},
- #endif // ENABLE_SPELLCHECK
+@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kCloudPrintXpsDescription, kOsWin,
+ SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
+ #endif // OS_WIN
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
{"enable-webgl2-compute-context",
@@ -16,7 +16,16 @@
{"enable-webgl-draft-extensions",
flag_descriptions::kWebglDraftExtensionsName,
flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -2128,12 +2128,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kEnableDataSaverLiteModeRebrandName,
+ flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll,
+ FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)},
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ {"enable-save-data", flag_descriptions::kEnableSaveDataName,
+ flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
+ SINGLE_VALUE_TYPE(
+@@ -2007,12 +2007,12 @@ const FeatureEntry kFeatureEntries[] = {
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
flag_descriptions::kForceTextDirectionDescription, kOsAll,
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -28,10 +37,10 @@
switches::kDisableInputImeAPI)},
-#endif // OS_WIN || OS_LINUX
+#endif // OS_WIN || OS_LINUX || OS_BSD
- {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
- flag_descriptions::kOriginTrialsDescription, kOsAll,
- FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2321,12 +2321,12 @@ const FeatureEntry kFeatureEntries[] = {
+ {"enable-brotli", flag_descriptions::kEnableBrotliName,
+ flag_descriptions::kEnableBrotliDescription, kOsAll,
+ FEATURE_VALUE_TYPE(features::kBrotliEncoding)},
+@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
#endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
#endif // OS_ANDROID
@@ -46,16 +55,16 @@
{"enable-experimental-accessibility-features",
flag_descriptions::kExperimentalAccessibilityFeaturesName,
flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll,
- FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)},
+@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -2716,7 +2716,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOmniboxDeduplicateDriveUrlsName,
flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)},
@@ -64,7 +73,7 @@
{"enable-speculative-service-worker-start-on-query-input",
flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -3040,7 +3040,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kClickToOpenPDFDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
@@ -73,16 +82,16 @@
{"direct-manipulation-stylus",
flag_descriptions::kDirectManipulationStylusName,
flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3057,7 +3057,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kLinkManagedNoticeToChromeUIManagementURLDescription,
- kOsWin | kOsMac | kOsLinux,
- FEATURE_VALUE_TYPE(features::kLinkManagedNoticeToChromeUIManagementURL)},
+@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kShowManagedUiDescription,
+ kOsWin | kOsMac | kOsLinux | kOsCrOS,
+ FEATURE_VALUE_TYPE(features::kShowManagedUi)},
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
#if !defined(OS_ANDROID)
{"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName,
-@@ -3940,7 +3940,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
#endif // defined(OS_MACOSX) || defined(OS_CHROMEOS)
@@ -91,7 +100,7 @@
{"autofill-always-show-server-cards-in-sync-transport",
flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
flag_descriptions::
-@@ -3948,7 +3948,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(
autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
@@ -100,7 +109,7 @@
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
{"enable-custom-mac-paper-sizes",
-@@ -3993,13 +3993,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
#endif // OS_CHROMEOS