diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-03-29 22:42:38 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-03-29 23:12:41 +0200 |
| commit | d2c7aaaca13965ed2f7b6d3bd4930b5561fdf682 (patch) | |
| tree | af8ff48b5ed19039f09ff491783c4d806738009f /www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc | |
| parent | sysutils/py-salt: Fix TCP transport (diff) | |
www/chromium: update to 100.0.4896.60
Enable some more unit tests.
Security: ab2d7f62-af9d-11ec-a0b8-3065ec8fd3ec
(cherry picked from commit 1e683edf9a258d43c95b485ad96f5c39860770cb)
Diffstat (limited to 'www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc')
| -rw-r--r-- | www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index e06c94beb79b..1209be8e6a89 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-03-25 21:59:56 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -721,7 +721,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -834,7 +834,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ |