aboutsummaryrefslogtreecommitdiff
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.cc116
1 files changed, 55 insertions, 61 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 90d337fb7e23..0486e7a5451e 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,24 +1,33 @@
---- chrome/browser/about_flags.cc.orig 2021-06-09 22:13:54 UTC
+--- chrome/browser/about_flags.cc.orig 2021-07-21 14:11:02 UTC
+++ chrome/browser/about_flags.cc
-@@ -937,7 +937,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
- heap_profiling::kMemlogSamplingRate5MB},
- };
+@@ -192,7 +192,7 @@
+ #include "ui/gl/gl_switches.h"
+ #include "ui/native_theme/native_theme_features.h"
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "base/allocator/buildflags.h"
+ #endif
+
+@@ -992,7 +992,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio
+ nullptr,
+ }};
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \
defined(OS_WIN)
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
-@@ -1225,7 +1225,7 @@ const FeatureEntry::FeatureVariation
- nullptr,
- }};
-
+@@ -1263,7 +1263,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
+ nullptr,
+ },
+ };
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ||
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) ||
// defined(OS_WIN)
const FeatureEntry::FeatureVariation
-@@ -3076,7 +3076,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3151,7 +3151,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)},
#endif // defined(OS_CHROMEOS)
@@ -27,7 +36,7 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -3094,7 +3094,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3169,7 +3169,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
@@ -36,7 +45,7 @@
{
"disable-accelerated-video-encode",
flag_descriptions::kAcceleratedVideoEncodeName,
-@@ -3439,7 +3439,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3510,7 +3510,7 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
@@ -45,7 +54,7 @@
{"enable-save-data", flag_descriptions::kEnableSaveDataName,
flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
SINGLE_VALUE_TYPE(
-@@ -3449,7 +3449,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3520,7 +3520,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableNavigationPredictorDescription,
kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)},
@@ -54,7 +63,7 @@
{"enable-preconnect-to-search",
flag_descriptions::kEnablePreconnectToSearchName,
flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
-@@ -4307,7 +4307,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4346,7 +4346,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll,
FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)},
@@ -63,16 +72,16 @@
defined(OS_WIN)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
-@@ -4410,7 +4410,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kKeywordSpaceTriggering,
- kOmniboxKeywordSpaceTriggeringVariations,
- "OmniboxBundledExperimentV1")},
+@@ -4443,7 +4443,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kOmniboxKeywordSpaceTriggeringSettingName,
+ flag_descriptions::kOmniboxKeywordSpaceTriggeringSettingDescription,
+ kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kKeywordSpaceTriggeringSetting)},
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ||
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) ||
// defined(OS_WIN)
- {"enable-speculative-service-worker-start-on-query-input",
-@@ -4706,14 +4706,14 @@ const FeatureEntry kFeatureEntries[] = {
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -4721,7 +4721,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
#endif // !defined(OS_ANDROID)
@@ -81,33 +90,16 @@
defined(OS_CHROMEOS)
{"direct-manipulation-stylus",
flag_descriptions::kDirectManipulationStylusName,
- flag_descriptions::kDirectManipulationStylusDescription,
- kOsWin | kOsMac | kOsLinux,
- FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)},
+@@ -4732,7 +4732,7 @@ const FeatureEntry kFeatureEntries[] = {
+ {"webui-feedback", flag_descriptions::kWebuiFeedbackName,
+ flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
-#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_ANDROID)
-@@ -5350,7 +5350,7 @@ const FeatureEntry kFeatureEntries[] = {
- chromeos::assistant::features::kAssistantBetterOnboarding)},
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
--#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)
- {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName,
- flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop,
-@@ -5367,7 +5367,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kRemoteCopyProgressNotificationName,
- flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)},
--#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)
-
- {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName,
-@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5373,7 +5373,7 @@ const FeatureEntry kFeatureEntries[] = {
kSharingDeviceExpirationVariations,
"SharingDeviceExpiration")},
@@ -116,7 +108,7 @@
{"sharing-hub-desktop-app-menu",
flag_descriptions::kSharingHubDesktopAppMenuName,
flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop,
-@@ -5407,7 +5407,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5382,7 +5382,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSharingHubDesktopOmniboxName,
flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop,
FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)},
@@ -125,7 +117,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
{"ash-enable-pip-rounded-corners",
-@@ -5889,7 +5889,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5856,7 +5856,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
@@ -134,7 +126,7 @@
defined(OS_CHROMEOS)
{"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
flag_descriptions::kGlobalMediaControlsDescription,
-@@ -5930,7 +5930,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5897,7 +5897,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalMediaControlsOverlayControlsDescription,
kOsWin | kOsMac | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)},
@@ -143,7 +135,7 @@
// defined(OS_CHROMEOS)
#if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
-@@ -6122,7 +6122,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6089,7 +6089,7 @@ const FeatureEntry kFeatureEntries[] = {
kPasswordsAccountStorageVariations,
"ButterForPasswords")},
@@ -152,7 +144,7 @@
defined(OS_CHROMEOS)
{"passwords-account-storage-iph",
flag_descriptions::kEnablePasswordsAccountStorageIPHName,
-@@ -6130,7 +6130,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6097,7 +6097,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsWin | kOsMac | kOsLinux,
FEATURE_VALUE_TYPE(
feature_engagement::kIPHPasswordsAccountStorageFeature)},
@@ -161,16 +153,16 @@
// defined(OS_CHROMEOS)
{"autofill-always-return-cloud-tokenized-card",
-@@ -6731,7 +6731,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(features::kEnableIncognitoShortcutOnDesktop)},
- #endif // defined(OS_WIN)
+@@ -6701,7 +6701,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(features::kIncognitoBrandConsistencyForAndroid)},
+ #endif
-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
{"incognito-brand-consistency-for-desktop",
flag_descriptions::kIncognitoBrandConsistencyForDesktopName,
-@@ -6823,7 +6823,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6806,7 +6806,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(language::kDetailedLanguageSettings)},
#endif
@@ -179,16 +171,18 @@
{"commander", flag_descriptions::kCommanderName,
flag_descriptions::kCommanderDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kCommander)},
-@@ -6860,7 +6860,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)},
- #endif
-
--#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)
+@@ -6835,8 +6835,8 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kSyncAutofillWalletOfferDataDescription, kOsAll,
+ FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)},
+
+-#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS)) && \
++#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
++ defined(OS_CHROMEOS)) && \
+ BUILDFLAG(ENABLE_PRINTING)
{"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName,
flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop,
-@@ -6879,14 +6879,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6855,14 +6855,14 @@ const FeatureEntry kFeatureEntries[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -205,16 +199,16 @@
// BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
#if defined(OS_ANDROID)
-@@ -7162,7 +7162,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7148,7 +7148,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kVaapiAV1Decoder)},
#endif // defined(OS_CHROMEOS)
-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
-+#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
defined(OS_MAC)
{
"ui-debug-tools",
-@@ -7243,7 +7243,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7225,7 +7225,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)},
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 01:36:52 +0000