diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_about__flags.cc')
-rw-r--r-- | www/chromium/files/patch-chrome_browser_about__flags.cc | 207 |
1 files changed, 113 insertions, 94 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 40a20edecf65..fced5539e0f5 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,36 +1,45 @@ ---- chrome/browser/about_flags.cc.orig 2020-09-08 19:13:59 UTC +--- chrome/browser/about_flags.cc.orig 2020-11-16 14:15:55 UTC +++ chrome/browser/about_flags.cc -@@ -184,7 +184,7 @@ - #include "ui/gl/gl_switches.h" - #include "ui/native_theme/native_theme_features.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/allocator/buildflags.h" - #endif - -@@ -840,7 +840,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -881,7 +881,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#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"}, - {"DocumentUseClientScore", "false"}, -@@ -1005,7 +1005,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc - nullptr, - }}; +@@ -1231,7 +1231,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP + }, + }; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#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::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { - {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}, -@@ -2495,13 +2495,13 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kCloudPrintXpsDescription, kOsWin, - SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, - #endif // OS_WIN +@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)}, + #endif // OS_CHROMEOS + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + { + "enable-accelerated-video-decode", + flag_descriptions::kAcceleratedVideoDecodeName, +@@ -2873,7 +2873,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsMac | kOsWin | kOsCrOS | kOsAndroid, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + }, +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + { + "disable-accelerated-video-encode", + flag_descriptions::kAcceleratedVideoEncodeName, +@@ -2979,13 +2979,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kForceEnableDevicesPageName, + flag_descriptions::kForceEnableDevicesPageDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kForceEnableDevicesPage)}, -#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", @@ -43,7 +52,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2689,7 +2689,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3182,7 +3182,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, #endif // OS_ANDROID @@ -52,7 +61,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -2699,7 +2699,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3192,7 +3192,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, @@ -61,107 +70,117 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -3437,7 +3437,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, +@@ -3990,7 +3990,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsAll, + FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#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) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, - flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -3487,7 +3487,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, - kOmniboxRichAutocompletionVariations, +@@ -4067,7 +4067,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kBookmarkPaths, + kOmniboxBookmarkPathsVariations, "OmniboxBundledExperimentV1")}, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#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", - flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3731,13 +3731,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4376,14 +4376,14 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, --#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) {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, --#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_ANDROID) - {"ntp-confirm-suggestion-removals", -@@ -4423,7 +4423,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5083,7 +5083,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #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) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -4440,7 +4440,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5100,7 +5100,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, --#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) - {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, -@@ -4466,7 +4466,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)}, + {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, +@@ -5687,7 +5687,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(autofill::features::kAutofillTouchToFill)}, + #endif // defined(OS_ANDROID) --#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) - {"sharing-peer-connection-receiver", - flag_descriptions::kSharingPeerConnectionReceiverName, -@@ -4477,7 +4477,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSharingPeerConnectionSenderName, - flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, - FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, + flag_descriptions::kGlobalMediaControlsDescription, +@@ -5728,7 +5728,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, +-#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) - {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName, -@@ -4552,13 +4552,13 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, - #endif + #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) +@@ -5914,7 +5914,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + password_manager::features::kEnablePasswordsAccountStorage)}, --#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) - {"enable-reopen-tab-in-product-help", - flag_descriptions::kReopenTabInProductHelpName, - flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop, - FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + {"passwords-account-storage-iph", + flag_descriptions::kEnablePasswordsAccountStorageIPHName, +@@ -5922,7 +5922,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE( + feature_engagement::kIPHPasswordsAccountStorageFeature)}, +-#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) - {"enable-audio-focus-enforcement", -@@ -5020,7 +5020,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableSyncTrustedVaultDescription, kOsAll, - FEATURE_VALUE_TYPE(switches::kSyncSupportTrustedVaultPassphrase)}, - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, - flag_descriptions::kGlobalMediaControlsDescription, - kOsWin | kOsMac | kOsLinux, -@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kGlobalMediaControlsSeamlessTransferDescription, - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(media::kGlobalMediaControlsSeamlessTransfer)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"autofill-always-return-cloud-tokenized-card", +@@ -6655,7 +6655,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, + #endif - #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) - {"win-use-native-spellchecker", +-#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) + {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, + flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, +@@ -6689,13 +6689,13 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kMuteNotificationsDuringScreenShare)}, + #endif // !defined(OS_ANDROID) + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + {"enable-ephemeral-guest-profiles-on-desktop", + flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName, + flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription, + kOsWin | kOsLinux | kOsMac, + FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)}, +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + + #if defined(OS_ANDROID) + {"decouple-sync-from-android-auto-sync", |