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.cc144
1 files changed, 81 insertions, 63 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index ccc2117a566b..1237bf8ca2e9 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 2025-09-22 06:24:40 UTC
+--- chrome/browser/about_flags.cc.orig 2025-10-02 04:28:32 UTC
+++ chrome/browser/about_flags.cc
-@@ -329,12 +329,12 @@
+@@ -332,12 +332,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"
-@@ -905,6 +905,26 @@ const FeatureEntry::FeatureVariation
+@@ -895,6 +895,26 @@ const FeatureEntry::FeatureVariation
std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
nullptr}};
@@ -42,7 +42,7 @@
const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
{"UIClipboardMaximumAge", "60"}};
const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1285,7 +1305,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada
+@@ -1280,7 +1300,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[] = {
-@@ -3921,7 +3941,7 @@ const FeatureEntry::FeatureVariation
+@@ -3914,7 +3934,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[] =
-@@ -4217,7 +4237,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
+@@ -4174,7 +4194,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari
std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
};
@@ -69,7 +69,7 @@
const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
{"TranslationAPIAcceptLanguagesCheck", "false"},
{"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4258,7 +4278,7 @@ const FeatureEntry::FeatureVariation
+@@ -4215,7 +4235,7 @@ const FeatureEntry::FeatureVariation
1, nullptr},
};
@@ -78,7 +78,16 @@
const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
{"BackoffTime", "0h"},
{"BackoffMultiplierBase", "0.0"},
-@@ -5469,7 +5489,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4886,7 +4906,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[] = {
+@@ -5461,7 +5481,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_WIN)
@@ -87,7 +96,7 @@
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5768,7 +5788,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5751,7 +5771,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,
-@@ -5982,7 +6002,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5962,7 +5982,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,
-@@ -6015,6 +6035,16 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5991,6 +6011,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)
-@@ -6916,7 +6946,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6884,7 +6914,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::
-@@ -7320,7 +7350,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7279,7 +7309,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)},
-@@ -7825,7 +7855,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7772,7 +7802,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,
-@@ -8786,7 +8816,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8734,7 +8764,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,
-@@ -9413,7 +9443,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9333,7 +9363,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)},
-@@ -9438,7 +9468,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9358,7 +9388,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
@@ -176,7 +185,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -9894,7 +9924,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9802,7 +9832,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,
-@@ -10080,7 +10110,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9988,7 +10018,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,
-@@ -10579,7 +10609,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10493,7 +10523,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),
-@@ -10702,7 +10732,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10616,7 +10646,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,
-@@ -10731,7 +10761,7 @@ const FeatureEntry kFeatureEntries[] = {
+ {"enable-generic-oidc-auth-profile-management",
+ flag_descriptions::kEnableGenericOidcAuthProfileManagementName,
+ flag_descriptions::kEnableGenericOidcAuthProfileManagementDescription,
+@@ -10637,7 +10667,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,
-@@ -11296,7 +11326,7 @@ const FeatureEntry kFeatureEntries[] = {
- PLATFORM_FEATURE_NAME_TYPE("CrOSLateBootGravedigger")},
- #endif // BUILDFLAG(IS_CHROMEOS)
+@@ -11175,7 +11205,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,
-@@ -11455,7 +11485,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11334,7 +11364,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,
-@@ -11558,7 +11588,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11425,7 +11455,7 @@ const FeatureEntry kFeatureEntries[] = {
"HistoryOptInEducationalTipVariations")},
#endif // BUILDFLAG(IS_ANDROID)
@@ -248,16 +257,16 @@
{"supervised-user-local-web-approvals",
flag_descriptions::kSupervisedUserLocalWebApprovalsName,
flag_descriptions::kSupervisedUserLocalWebApprovalsDescription,
-@@ -11784,7 +11814,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11622,7 +11652,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,
-@@ -11883,7 +11913,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kAutofillEnableBuyNowPayLaterDescription,
+@@ -11727,7 +11757,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,
-@@ -11917,7 +11947,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11755,7 +11785,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,
-@@ -12247,7 +12277,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12103,7 +12133,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)},
-@@ -12291,7 +12321,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12147,7 +12177,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,
-@@ -12311,7 +12341,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,
+@@ -12167,7 +12197,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::
-@@ -12443,7 +12473,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,
+@@ -12306,7 +12336,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,
-@@ -12479,7 +12509,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif // BUILDFLAG(IS_ANDROID)
+@@ -12335,7 +12365,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,
-@@ -12494,7 +12524,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12350,7 +12380,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,
-@@ -12745,7 +12775,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12613,7 +12643,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)},
-@@ -12831,7 +12861,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12706,7 +12736,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,
-@@ -12954,7 +12984,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12829,7 +12859,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,
-@@ -12978,7 +13008,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12860,7 +12890,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,
-@@ -13016,7 +13046,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12898,7 +12928,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,
-@@ -13065,7 +13095,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -12950,7 +12980,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::
+@@ -13215,7 +13245,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,