aboutsummaryrefslogtreecommitdiff
path: root/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc')
-rw-r--r--www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc144
1 files changed, 81 insertions, 63 deletions
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
index cf10e4f19e5d..843289bf666c 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2025-09-23 12:08:14 UTC
+--- chrome/browser/about_flags.cc.orig 2025-10-21 16:57:35 UTC
+++ chrome/browser/about_flags.cc
-@@ -330,12 +330,12 @@
+@@ -333,12 +333,12 @@
#include "components/stylus_handwriting/win/features.h"
#endif
@@ -15,7 +15,7 @@
#include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#include "chrome/browser/enterprise/webstore/features.h"
-@@ -906,6 +906,26 @@ const FeatureEntry::FeatureVariation
+@@ -896,6 +896,26 @@ const FeatureEntry::FeatureVariation
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
nullptr}};
@@ -42,7 +42,7 @@
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
{"UIClipboardMaximumAge", "60"}};
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1286,7 +1306,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
+@@ -1281,7 +1301,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -51,7 +51,7 @@
// A limited number of combinations of the rich autocompletion params.
const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
-@@ -3922,7 +3942,7 @@ const FeatureEntry::FeatureVariation
+@@ -3915,7 +3935,7 @@ const FeatureEntry::FeatureVariation
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -60,7 +60,7 @@
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
{{"link_capturing_state", "on_by_default"}};
const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
-@@ -4218,7 +4238,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
+@@ -4175,7 +4195,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
};
@@ -69,7 +69,7 @@
const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
{"TranslationAPIAcceptLanguagesCheck", "false"},
{"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4259,7 +4279,7 @@ const FeatureEntry::FeatureVariation
+@@ -4216,7 +4236,7 @@ const FeatureEntry::FeatureVariation
1, nullptr},
};
@@ -78,7 +78,16 @@
const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
{"BackoffTime", "0h"},
{"BackoffMultiplierBase", "0.0"},
-@@ -5478,7 +5498,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4887,7 +4907,7 @@ const FeatureEntry::FeatureVariation kMobilePromoOnDes
+ };
+
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ const FeatureEntry::FeatureParam kNtpEnterpriseShortcutsWithFakeData[] = {
+ {"use_fake_data", "true"}};
+ const FeatureEntry::FeatureVariation kNtpEnterpriseShortcutsVariations[] = {
+@@ -5470,7 +5490,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_WIN)
@@ -87,7 +96,7 @@
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5777,7 +5797,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5760,7 +5780,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableIsolatedWebAppDevModeName,
flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
@@ -96,7 +105,7 @@
{"enable-iwa-key-distribution-component",
flag_descriptions::kEnableIwaKeyDistributionComponentName,
flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
-@@ -5991,7 +6011,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5971,7 +5991,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kUseSCContentSharingPicker)},
#endif // BUILDFLAG(IS_MAC)
@@ -105,7 +114,7 @@
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -6024,6 +6044,16 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6000,6 +6020,16 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWaylandSessionManagementName,
flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
@@ -122,7 +131,7 @@
#endif // BUILDFLAG(IS_LINUX)
#if BUILDFLAG(ENABLE_VR)
-@@ -6925,7 +6955,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6893,7 +6923,7 @@ const FeatureEntry kFeatureEntries[] = {
"MlUrlScoring")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -131,7 +140,7 @@
{"contextual-search-box-uses-contextual-search-provider",
flag_descriptions::kContextualSearchBoxUsesContextualSearchProviderName,
flag_descriptions::
-@@ -7329,7 +7359,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7288,7 +7318,7 @@ const FeatureEntry kFeatureEntries[] = {
kNumSrpZpsRelatedSearches,
"PowerTools")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -140,7 +149,7 @@
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(history_embeddings::kHistoryEmbeddings)},
-@@ -7834,7 +7864,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7781,7 +7811,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -149,7 +158,7 @@
{"cups-ipp-printing-backend",
flag_descriptions::kCupsIppPrintingBackendName,
flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
-@@ -8795,7 +8825,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8743,7 +8773,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
#endif // !BUILDFLAG(IS_CHROMEOS)
@@ -158,7 +167,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -9422,7 +9452,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9342,7 +9372,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -167,7 +176,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
-@@ -9447,7 +9477,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9367,7 +9397,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
@@ -176,7 +185,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -9903,7 +9933,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9811,7 +9841,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -185,7 +194,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -10089,7 +10119,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9997,7 +10027,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kReduceTransferSizeUpdatedIPCDescription, kOsAll,
FEATURE_VALUE_TYPE(network::features::kReduceTransferSizeUpdatedIPC)},
@@ -194,7 +203,7 @@
{"reduce-user-agent-data-linux-platform-version",
flag_descriptions::kReduceUserAgentDataLinuxPlatformVersionName,
flag_descriptions::kReduceUserAgentDataLinuxPlatformVersionDescription,
-@@ -10588,7 +10618,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10502,7 +10532,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@@ -203,16 +212,16 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10711,7 +10741,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10625,7 +10655,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kRcapsDynamicProfileCountryDescription, kOsAll,
FEATURE_VALUE_TYPE(switches::kDynamicProfileCountry)},
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- {"third-party-profile-management",
- flag_descriptions::kThirdPartyProfileManagementName,
- flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10740,7 +10770,7 @@ const FeatureEntry kFeatureEntries[] = {
+ {"enable-generic-oidc-auth-profile-management",
+ flag_descriptions::kEnableGenericOidcAuthProfileManagementName,
+ flag_descriptions::kEnableGenericOidcAuthProfileManagementDescription,
+@@ -10646,7 +10676,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -221,16 +230,16 @@
{"enable-user-navigation-capturing-pwa",
flag_descriptions::kPwaNavigationCapturingName,
flag_descriptions::kPwaNavigationCapturingDescription,
-@@ -11305,7 +11335,7 @@ const FeatureEntry kFeatureEntries[] = {
- PLATFORM_FEATURE_NAME_TYPE("CrOSLateBootGravedigger")},
- #endif // BUILDFLAG(IS_CHROMEOS)
+@@ -11184,7 +11214,7 @@ const FeatureEntry kFeatureEntries[] = {
+ kOsMac | kOsWin | kOsLinux,
+ FEATURE_VALUE_TYPE(net::features::kPersistDeviceBoundSessions)},
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"replace-sync-promos-with-sign-in-promos-desktop",
flag_descriptions::kReplaceSyncPromosWithSignInPromosName,
flag_descriptions::kReplaceSyncPromosWithSignInPromosDescription,
-@@ -11464,7 +11494,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11343,7 +11373,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCanvasHibernationDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
@@ -239,7 +248,7 @@
{"enable-history-sync-optin",
flag_descriptions::kEnableHistorySyncOptinName,
flag_descriptions::kEnableHistorySyncOptinDescription,
-@@ -11567,7 +11597,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11434,7 +11464,7 @@ const FeatureEntry kFeatureEntries[] = {
"HistoryOptInEducationalTipVariations")},
#endif // BUILDFLAG(IS_ANDROID)
@@ -248,16 +257,16 @@
{"supervised-user-local-web-approvals",
flag_descriptions::kSupervisedUserLocalWebApprovalsName,
flag_descriptions::kSupervisedUserLocalWebApprovalsDescription,
-@@ -11793,7 +11823,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11631,7 +11661,7 @@ const FeatureEntry kFeatureEntries[] = {
segmentation_platform::features::kSegmentationSurveyPage)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
{"autofill-enable-buy-now-pay-later",
flag_descriptions::kAutofillEnableBuyNowPayLaterName,
- flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
-@@ -11892,7 +11922,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kAutofillEnableBuyNowPayLaterDescription,
+@@ -11736,7 +11766,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
@@ -266,7 +275,7 @@
{"translation-api", flag_descriptions::kTranslationAPIName,
flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
-@@ -11926,7 +11956,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11764,7 +11794,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
password_manager::features::kPasswordFormClientsideClassifier)},
@@ -275,7 +284,7 @@
{"contextual-cueing", flag_descriptions::kContextualCueingName,
flag_descriptions::kContextualCueingDescription,
kOsLinux | kOsMac | kOsWin,
-@@ -12256,7 +12286,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12112,7 +12142,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
#endif // !BUILDFLAG(IS_ANDROID)
@@ -284,25 +293,25 @@
{"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
-@@ -12300,7 +12330,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12156,7 +12186,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- {"autofill-enable-amount-extraction-desktop",
- flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
- flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
-@@ -12320,7 +12350,7 @@ const FeatureEntry kFeatureEntries[] = {
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ {"autofill-enable-amount-extraction",
+ flag_descriptions::kAutofillEnableAmountExtractionName,
+ flag_descriptions::kAutofillEnableAmountExtractionDescription,
+@@ -12176,7 +12206,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(blink::features::kClipboardChangeEvent)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- {"autofill-enable-amount-extraction-allowlist-desktop",
- flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
- flag_descriptions::
-@@ -12452,7 +12482,7 @@ const FeatureEntry kFeatureEntries[] = {
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ {"autofill-enable-amount-extraction-allowlist",
+ flag_descriptions::kAutofillEnableAmountExtractionAllowlistName,
+ flag_descriptions::kAutofillEnableAmountExtractionAllowlistDescription,
+@@ -12315,7 +12345,7 @@ const FeatureEntry kFeatureEntries[] = {
apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -311,8 +320,8 @@
{"chrome-web-store-navigation-throttle",
flag_descriptions::kChromeWebStoreNavigationThrottleName,
flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
-@@ -12488,7 +12518,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif // BUILDFLAG(IS_ANDROID)
+@@ -12344,7 +12374,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(supervised_user::kSupervisedUserBlockInterstitialV3)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -320,7 +329,7 @@
{"autofill-enable-amount-extraction-testing",
flag_descriptions::kAutofillEnableAmountExtractionTestingName,
flag_descriptions::kAutofillEnableAmountExtractionTestingDescription,
-@@ -12503,7 +12533,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12359,7 +12389,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableWebAppPredictableAppUpdatingDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebAppPredictableAppUpdating)},
@@ -329,7 +338,7 @@
{"root-scrollbar-follows-browser-theme",
flag_descriptions::kRootScrollbarFollowsTheme,
flag_descriptions::kRootScrollbarFollowsThemeDescription,
-@@ -12754,7 +12784,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12622,7 +12652,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -338,7 +347,7 @@
{"tab-group-home", tabs::flag_descriptions::kTabGroupHomeName,
tabs::flag_descriptions::kTabGroupHomeDescription, kOsDesktop,
FEATURE_VALUE_TYPE(tabs::kTabGroupHome)},
-@@ -12840,7 +12870,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12715,7 +12745,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -347,7 +356,7 @@
{"enable-site-search-allow-user-override-policy",
flag_descriptions::kEnableSiteSearchAllowUserOverridePolicyName,
flag_descriptions::kEnableSiteSearchAllowUserOverridePolicyDescription,
-@@ -12963,7 +12993,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12838,7 +12868,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -356,16 +365,16 @@
{"lens-search-side-panel-default-width-change",
flag_descriptions::kLensSearchSidePanelDefaultWidthChangeName,
flag_descriptions::kLensSearchSidePanelDefaultWidthChangeDescription,
-@@ -12987,7 +13017,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12869,7 +12899,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
{"autofill-enable-buy-now-pay-later-for-klarna",
flag_descriptions::kAutofillEnableBuyNowPayLaterForKlarnaName,
flag_descriptions::kAutofillEnableBuyNowPayLaterForKlarnaDescription,
-@@ -13025,7 +13055,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12907,7 +12937,7 @@ const FeatureEntry kFeatureEntries[] = {
autofill::features::kAutofillEnableDownstreamCardAwarenessIph)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -374,12 +383,21 @@
{"enable-lens-overlay-back-to-page",
flag_descriptions::kLensOverlayBackToPageName,
flag_descriptions::kLensOverlayBackToPageDescription, kOsDesktop,
-@@ -13074,7 +13104,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12959,7 +12989,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
{"autofill-enable-buy-now-pay-later-for-externally-linked",
flag_descriptions::kAutofillEnableBuyNowPayLaterForExternallyLinkedName,
flag_descriptions::
+@@ -13224,7 +13254,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif // !BUILDFLAG(IS_ANDROID),
+
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ {"enable-ntp-enterprise-shortcuts",
+ flag_descriptions::kEnableNtpEnterpriseShortcutsName,
+ flag_descriptions::kEnableNtpEnterpriseShortcutsDescription,