diff options
Diffstat (limited to 'www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc')
| -rw-r--r-- | www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc index 9804360fd8fc..b0ed2ac0d311 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,21 +1,29 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-02-04 14:46:08 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-06-25 12:08:48 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -49,7 +49,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe - absl::optional<FeatureConfig> GetClientSideFeatureConfig( +@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro + + std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + + // The IPH bubble for link capturing has a trigger set to ANY so that it + // always shows up. The per app specific guardrails are independently stored +@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi + + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { - absl::optional<FeatureConfig> config = FeatureConfig(); + std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1440,7 +1440,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1498,7 +1498,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi + #endif // BUILDFLAG(IS_ANDROID) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - if (kIPHAutofillExternalAccountProfileSuggestionFeature.name == - feature->name) { + if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { |