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 | 93 |
1 files changed, 34 insertions, 59 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 68863a9468ba..734b8c074466 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/about_flags.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/about_flags.cc -@@ -173,7 +173,7 @@ +@@ -179,7 +179,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -873,7 +873,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -879,7 +879,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,7 +18,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -1038,7 +1038,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc +@@ -1044,7 +1044,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc nullptr, }}; @@ -26,25 +26,8 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { - {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}}; -@@ -1154,14 +1154,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat - {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), - nullptr}}; - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = { - {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}}; - - const FeatureEntry::FeatureVariation kTranslateBubbleUIVariations[] = { - {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}}; --#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS -+#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD - - const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { - {security_state::features::kMarkHttpAsFeatureParameterName, -@@ -2264,13 +2264,13 @@ const FeatureEntry kFeatureEntries[] = { + {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}, +@@ -2485,13 +2485,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -60,24 +43,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2307,14 +2307,14 @@ const FeatureEntry kFeatureEntries[] = { - "OverrideTranslateTriggerInIndia")}, - #endif // OS_ANDROID - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, - flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, - FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi, - kTranslateBubbleUIVariations, - "UseButtonTranslateBubbleUI")}, --#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS -+#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD - - #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) - {"enable-native-notifications", -@@ -2404,13 +2404,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2614,13 +2614,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, #endif // OS_CHROMEOS @@ -93,16 +59,25 @@ #if defined(OS_ANDROID) {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2475,7 +2475,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid, - FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)}, +@@ -2675,7 +2675,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, + FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, #endif // OS_ANDROID -#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, + flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableNavigationPredictorDescription, + kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, +-#endif // OS_CHROMEOS || OS_LINUX ++#endif // OS_CHROMEOS || OS_LINUX || OS_BSD + {"enable-preconnect-to-search", + flag_descriptions::kEnablePreconnectToSearchName, + flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, +@@ -3399,7 +3399,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, @@ -111,7 +86,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -3204,7 +3204,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3454,7 +3454,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, kOmniboxRichAutocompletionVariations, "OmniboxBundledExperimentV1")}, @@ -120,7 +95,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3416,13 +3416,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3670,13 +3670,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -136,7 +111,7 @@ #if !defined(OS_ANDROID) {"ntp-confirm-suggestion-removals", -@@ -4052,7 +4052,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4361,7 +4361,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -145,7 +120,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -4065,7 +4065,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4378,7 +4378,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -154,25 +129,25 @@ // defined(OS_CHROMEOS) {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, -@@ -4107,7 +4107,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSharingDeriveVapidKeyDescription, kOsAll, - FEATURE_VALUE_TYPE(kSharingDeriveVapidKey)}, +@@ -4404,7 +4404,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"sharing-peer-connection-receiver", flag_descriptions::kSharingPeerConnectionReceiverName, -@@ -4118,7 +4118,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4415,7 +4415,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) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) // defined(OS_CHROMEOS) - {"sharing-qr-code-generator", -@@ -4193,13 +4193,13 @@ const FeatureEntry kFeatureEntries[] = { + {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName, +@@ -4490,13 +4490,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -188,7 +163,7 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4654,7 +4654,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4937,7 +4937,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, @@ -197,7 +172,7 @@ {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, kOsWin | kOsMac | kOsLinux, -@@ -4671,7 +4671,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4954,7 +4954,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, |