Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into master.lion
Browse files Browse the repository at this point in the history
  • Loading branch information
blueboxd committed Feb 1, 2024
2 parents 53c9dd9 + 072dde4 commit 81f2e16
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'MNhASYP6ZVlHl8MT2UzlSGnCH9LMHjUMkz49rrlsb7wC',
'version': 'Cwp-cRksMvELPD_6Gt9Cse08DbIIA8_am3yQuDCx_wYC',
},
],
'condition': 'checkout_android',
Expand Down Expand Up @@ -1846,7 +1846,7 @@ deps = {
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'e082b08475761a2ba6a3349dfea72f704c8b68d4',

'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '27a452da21893a06fe6a08ac2ff0b24ef6016d41',
Var('webrtc_git') + '/src.git' + '@' + '657b65fa188fbb2ddd18307e55af4847e44c0e0f',

# Wuffs' canonical repository is at github.com/google/wuffs, but we use
# Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,10 @@ private ProductionSupportedFlagList() {}
"When enabled, the precedence is given to the field label over the name when they"
+ " match different types. Applied only for parsing of address forms in"
+ " Turkish."),
Flag.baseFeature(
AutofillFeatures.AUTOFILL_UPLOAD_VOTES_FOR_FIELDS_WITH_EMAIL,
"When enabled, autofill will issues votes for EMAIL_ADDRESS field types on fields"
+ " where the content matches a valid email format."),
Flag.baseFeature(
FeatureConstants.KEYBOARD_ACCESSORY_PAYMENT_VIRTUAL_CARD_FEATURE,
"When enabled, merchant bound virtual cards will be offered in the keyboard "
Expand Down
44 changes: 44 additions & 0 deletions testing/variations/fieldtrial_testing_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,28 @@
]
}
],
"AutofillEnableFillingPhoneCountryCodesByAddressCountryCodes": [
{
"platforms": [
"android",
"chromeos",
"chromeos_lacros",
"fuchsia",
"ios",
"linux",
"mac",
"windows"
],
"experiments": [
{
"name": "Enabled",
"enable_features": [
"AutofillEnableFillingPhoneCountryCodesByAddressCountryCodes"
]
}
]
}
],
"AutofillEnableFpanRiskBasedAuthentication": [
{
"platforms": [
Expand Down Expand Up @@ -1937,6 +1959,28 @@
]
}
],
"AutofillUploadVotesForFieldsWithEmail": [
{
"platforms": [
"android",
"android_webview",
"chromeos",
"chromeos_lacros",
"ios",
"linux",
"mac",
"windows"
],
"experiments": [
{
"name": "Enabled",
"enable_features": [
"AutofillUploadVotesForFieldsWithEmail"
]
}
]
}
],
"AutofillUpstream": [
{
"platforms": [
Expand Down
2 changes: 1 addition & 1 deletion third_party/webrtc
Submodule webrtc updated from 27a452 to 657b65

0 comments on commit 81f2e16

Please sign in to comment.