Chromium Code Reviews| Index: components/autofill/core/common/autofill_regex_constants.cc |
| diff --git a/components/autofill/core/browser/autofill_regex_constants.cc b/components/autofill/core/common/autofill_regex_constants.cc |
| similarity index 58% |
| rename from components/autofill/core/browser/autofill_regex_constants.cc |
| rename to components/autofill/core/common/autofill_regex_constants.cc |
| index 57b961df461c281cf9a3a2a6c3a808ec43f02792..47c9883b857de4ecb2de60b81127dfc83c96af48 100644 |
| --- a/components/autofill/core/browser/autofill_regex_constants.cc |
| +++ b/components/autofill/core/common/autofill_regex_constants.cc |
| @@ -6,7 +6,7 @@ |
| // different compilers, we use a script to convert the UTF8 strings into |
| // numeric literals (\x##). |
| -#include "components/autofill/core/browser/autofill_regex_constants.h" |
| +#include "components/autofill/core/common/autofill_regex_constants.h" |
| namespace autofill { |
| @@ -16,110 +16,108 @@ namespace autofill { |
| const char kAttentionIgnoredRe[] = "attention|attn"; |
| const char kRegionIgnoredRe[] = |
| "province|region|other" |
| - "|provincia" // es |
| + "|provincia" // es |
| "|bairro|suburb"; // pt-BR, pt-PT |
| const char kAddressNameIgnoredRe[] = "address.*nickname|address.*label"; |
| const char kCompanyRe[] = |
| "company|business|organization|organisation" |
| - "|firma|firmenname" // de-DE |
| - "|empresa" // es |
| - "|societe|société" // fr-FR |
| - "|ragione.?sociale" // it-IT |
| - "|会社" // ja-JP |
| + "|firma|firmenname" // de-DE |
| + "|empresa" // es |
| + "|societe|société" // fr-FR |
| + "|ragione.?sociale" // it-IT |
| + "|会社" // ja-JP |
| "|название.?компании" // ru |
| - "|单位|公司" // zh-CN |
| - "|회사|직장"; // ko-KR |
| + "|单位|公司" // zh-CN |
| + "|회사|직장"; // ko-KR |
| const char kAddressLine1Re[] = |
| "^address$|address[_-]?line(one)?|address1|addr1|street" |
| "|(?:shipping|billing)address$" |
| "|strasse|straße|hausnummer|housenumber" // de-DE |
| - "|house.?name" // en-GB |
| - "|direccion|dirección" // es |
| - "|adresse" // fr-FR |
| - "|indirizzo" // it-IT |
| - "|^住所$|住所1" // ja-JP |
| - "|morada|endereço" // pt-BR, pt-PT |
| - "|Адрес" // ru |
| - "|地址" // zh-CN |
| - "|^주소.?$|주소.?1"; // ko-KR |
| + "|house.?name" // en-GB |
| + "|direccion|dirección" // es |
| + "|adresse" // fr-FR |
| + "|indirizzo" // it-IT |
| + "|^住所$|住所1" // ja-JP |
|
pkalinnikov
2017/05/10 13:45:13
Hm, the output of "git cl format" looks not much p
pkalinnikov
2017/05/10 13:54:23
However, when I open this file with a monospace fo
|
| + "|morada|endereço" // pt-BR, pt-PT |
| + "|Адрес" // ru |
| + "|地址" // zh-CN |
| + "|^주소.?$|주소.?1"; // ko-KR |
| const char kAddressLine1LabelRe[] = |
| "address" |
| - "|adresse" // fr-FR |
| + "|adresse" // fr-FR |
| "|indirizzo" // it-IT |
| - "|住所" // ja-JP |
| - "|地址" // zh-CN |
| - "|주소"; // ko-KR |
| + "|住所" // ja-JP |
| + "|地址" // zh-CN |
| + "|주소"; // ko-KR |
| const char kAddressLine2Re[] = |
| "address[_-]?line(2|two)|address2|addr2|street|suite|unit" |
| - "|adresszusatz|ergänzende.?angaben" // de-DE |
| - "|direccion2|colonia|adicional" // es |
| + "|adresszusatz|ergänzende.?angaben" // de-DE |
| + "|direccion2|colonia|adicional" // es |
| "|addresssuppl|complementnom|appartement" // fr-FR |
| - "|indirizzo2" // it-IT |
| - "|住所2" // ja-JP |
| - "|complemento|addrcomplement" // pt-BR, pt-PT |
| - "|Улица" // ru |
| - "|地址2" // zh-CN |
| - "|주소.?2"; // ko-KR |
| + "|indirizzo2" // it-IT |
| + "|住所2" // ja-JP |
| + "|complemento|addrcomplement" // pt-BR, pt-PT |
| + "|Улица" // ru |
| + "|地址2" // zh-CN |
| + "|주소.?2"; // ko-KR |
| const char kAddressLine2LabelRe[] = |
| "address|line" |
| - "|adresse" // fr-FR |
| + "|adresse" // fr-FR |
| "|indirizzo" // it-IT |
| - "|地址" // zh-CN |
| - "|주소"; // ko-KR |
| + "|地址" // zh-CN |
| + "|주소"; // ko-KR |
| const char kAddressLinesExtraRe[] = |
| "address.*line[3-9]|address[3-9]|addr[3-9]|street|line[3-9]" |
| - "|municipio" // es |
| + "|municipio" // es |
| "|batiment|residence" // fr-FR |
| - "|indirizzo[3-9]"; // it-IT |
| -const char kAddressLookupRe[] = |
| - "lookup"; |
| + "|indirizzo[3-9]"; // it-IT |
| +const char kAddressLookupRe[] = "lookup"; |
| const char kCountryRe[] = |
| "country|countries" |
| - "|país|pais" // es |
| - "|国" // ja-JP |
| - "|国家" // zh-CN |
| + "|país|pais" // es |
| + "|国" // ja-JP |
| + "|国家" // zh-CN |
| "|국가|나라"; // ko-KR |
| -const char kCountryLocationRe[] = |
| - "location"; |
| +const char kCountryLocationRe[] = "location"; |
| const char kZipCodeRe[] = |
| "zip|postal|post.*code|pcode" |
| - "|pin.?code" // en-IN |
| - "|postleitzahl" // de-DE |
| - "|\\bcp\\b" // es |
| - "|\\bcdp\\b" // fr-FR |
| - "|\\bcap\\b" // it-IT |
| - "|郵便番号" // ja-JP |
| + "|pin.?code" // en-IN |
| + "|postleitzahl" // de-DE |
| + "|\\bcp\\b" // es |
| + "|\\bcdp\\b" // fr-FR |
| + "|\\bcap\\b" // it-IT |
| + "|郵便番号" // ja-JP |
| "|codigo|codpos|\\bcep\\b" // pt-BR, pt-PT |
| - "|Почтовый.?Индекс" // ru |
| - "|邮政编码|邮编" // zh-CN |
| - "|郵遞區號" // zh-TW |
| - "|우편.?번호"; // ko-KR |
| + "|Почтовый.?Индекс" // ru |
| + "|邮政编码|邮编" // zh-CN |
| + "|郵遞區號" // zh-TW |
| + "|우편.?번호"; // ko-KR |
| const char kZip4Re[] = |
| "zip|^-$|post2" |
| "|codpos2"; // pt-BR, pt-PT |
| const char kCityRe[] = |
| "city|town" |
| - "|\\bort\\b|stadt" // de-DE |
| - "|suburb" // en-AU |
| + "|\\bort\\b|stadt" // de-DE |
| + "|suburb" // en-AU |
| "|ciudad|provincia|localidad|poblacion" // es |
| - "|ville|commune" // fr-FR |
| - "|localita" // it-IT |
| - "|市区町村" // ja-JP |
| - "|cidade" // pt-BR, pt-PT |
| - "|Город" // ru |
| - "|市" // zh-CN |
| - "|分區" // zh-TW |
| - "|^시[^도·・]|시[·・]?군[·・]?구"; // ko-KR |
| + "|ville|commune" // fr-FR |
| + "|localita" // it-IT |
| + "|市区町村" // ja-JP |
| + "|cidade" // pt-BR, pt-PT |
| + "|Город" // ru |
| + "|市" // zh-CN |
| + "|分區" // zh-TW |
| + "|^시[^도·・]|시[·・]?군[·・]?구"; // ko-KR |
| const char kStateRe[] = |
| "(?<!united )state|county|region|province" |
| - "|land" // de-DE |
| + "|land" // de-DE |
| "|county|principality" // en-UK |
| - "|都道府県" // ja-JP |
| - "|estado|provincia" // pt-BR, pt-PT |
| - "|область" // ru |
| - "|省" // zh-CN |
| - "|地區" // zh-TW |
| - "|^시[·・]?도"; // ko-KR |
| + "|都道府県" // ja-JP |
| + "|estado|provincia" // pt-BR, pt-PT |
| + "|область" // ru |
| + "|省" // zh-CN |
| + "|地區" // zh-TW |
| + "|^시[·・]?도"; // ko-KR |
| ///////////////////////////////////////////////////////////////////////////// |
| // credit_card_field.cc |
| @@ -135,18 +133,17 @@ const char kNameOnCardRe[] = |
| "|Имя.*карты" // ru |
| "|信用卡开户名|开户名|持卡人姓名" // zh-CN |
| "|持卡人姓名"; // zh-TW |
| -const char kNameOnCardContextualRe[] = |
| - "name"; |
| +const char kNameOnCardContextualRe[] = "name"; |
| const char kCardNumberRe[] = |
| "(add)?(?:card|cc|acct).?(?:number|#|no|num|field)" |
| - "|nummer" // de-DE |
| + "|nummer" // de-DE |
| "|credito|numero|número" // es |
| - "|numéro" // fr-FR |
| - "|カード番号" // ja-JP |
| - "|Номер.*карты" // ru |
| - "|信用卡号|信用卡号码" // zh-CN |
| - "|信用卡卡號" // zh-TW |
| - "|카드"; // ko-KR |
| + "|numéro" // fr-FR |
| + "|カード番号" // ja-JP |
| + "|Номер.*карты" // ru |
| + "|信用卡号|信用卡号码" // zh-CN |
| + "|信用卡卡號" // zh-TW |
| + "|카드"; // ko-KR |
| const char kCardCvcRe[] = |
| "verification|card.?identification|security.?code|card.?code" |
| "|security.?number|card.?pin|c-v-v" |
| @@ -168,22 +165,22 @@ const char kCardCvcRe[] = |
| const char kExpirationMonthRe[] = |
| "expir|exp.*mo|exp.*date|ccmonth|cardmonth|addmonth" |
| "|gueltig|gültig|monat" // de-DE |
| - "|fecha" // es |
| - "|date.*exp" // fr-FR |
| - "|scadenza" // it-IT |
| - "|有効期限" // ja-JP |
| - "|validade" // pt-BR, pt-PT |
| - "|Срок действия карты" // ru |
| - "|月"; // zh-CN |
| + "|fecha" // es |
| + "|date.*exp" // fr-FR |
| + "|scadenza" // it-IT |
| + "|有効期限" // ja-JP |
| + "|validade" // pt-BR, pt-PT |
| + "|Срок действия карты" // ru |
| + "|月"; // zh-CN |
| const char kExpirationYearRe[] = |
| "exp|^/|(add)?year" |
| "|ablaufdatum|gueltig|gültig|jahr" // de-DE |
| - "|fecha" // es |
| - "|scadenza" // it-IT |
| - "|有効期限" // ja-JP |
| - "|validade" // pt-BR, pt-PT |
| - "|Срок действия карты" // ru |
| - "|年|有效期"; // zh-CN |
| + "|fecha" // es |
| + "|scadenza" // it-IT |
| + "|有効期限" // ja-JP |
| + "|validade" // pt-BR, pt-PT |
| + "|Срок действия карты" // ru |
| + "|年|有效期"; // zh-CN |
| // Used to match a expiration date field with a two digit year. |
| // The following conditions must be met: |
| @@ -203,78 +200,74 @@ const char kExpirationDate4DigitYearRe[] = |
| // Used to match expiration date fields that do not specify a year length. |
| const char kExpirationDateRe[] = |
| "expir|exp.*date|^expfield$" |
| - "|gueltig|gültig" // de-DE |
| - "|fecha" // es |
| - "|date.*exp" // fr-FR |
| - "|scadenza" // it-IT |
| - "|有効期限" // ja-JP |
| - "|validade" // pt-BR, pt-PT |
| + "|gueltig|gültig" // de-DE |
| + "|fecha" // es |
| + "|date.*exp" // fr-FR |
| + "|scadenza" // it-IT |
| + "|有効期限" // ja-JP |
| + "|validade" // pt-BR, pt-PT |
| "|Срок действия карты"; // ru |
| -const char kGiftCardRe[] = |
| - "gift.?card"; |
| +const char kGiftCardRe[] = "gift.?card"; |
| const char kDebitGiftCardRe[] = |
| "(?:visa|mastercard|discover|amex|american express).*gift.?card"; |
| -const char kDebitCardRe[] = |
| - "debit.*card"; |
| - |
| +const char kDebitCardRe[] = "debit.*card"; |
| ///////////////////////////////////////////////////////////////////////////// |
| // email_field.cc |
| ///////////////////////////////////////////////////////////////////////////// |
| const char kEmailRe[] = |
| "e.?mail" |
| - "|courriel" // fr |
| - "|メールアドレス" // ja-JP |
| - "|Электронной.?Почты" // ru |
| - "|邮件|邮箱" // zh-CN |
| - "|電郵地址" // zh-TW |
| + "|courriel" // fr |
| + "|メールアドレス" // ja-JP |
| + "|Электронной.?Почты" // ru |
| + "|邮件|邮箱" // zh-CN |
| + "|電郵地址" // zh-TW |
| "|(?:이메일|전자.?우편|[Ee]-?mail)(.?주소)?"; // ko-KR |
| - |
| ///////////////////////////////////////////////////////////////////////////// |
| // name_field.cc |
| ///////////////////////////////////////////////////////////////////////////// |
| const char kNameIgnoredRe[] = |
| "user.?name|user.?id|nickname|maiden name|title|prefix|suffix" |
| - "|vollständiger.?name" // de-DE |
| - "|用户名" // zh-CN |
| + "|vollständiger.?name" // de-DE |
| + "|用户名" // zh-CN |
| "|(?:사용자.?)?아이디|사용자.?ID"; // ko-KR |
| const char kNameRe[] = |
| "^name|full.?name|your.?name|customer.?name|bill.?name|ship.?name" |
| "|name.*first.*last|firstandlastname" |
| "|nombre.*y.*apellidos" // es |
| - "|^nom" // fr-FR |
| - "|お名前|氏名" // ja-JP |
| - "|^nome" // pt-BR, pt-PT |
| - "|姓名" // zh-CN |
| - "|성명"; // ko-KR |
| + "|^nom" // fr-FR |
| + "|お名前|氏名" // ja-JP |
| + "|^nome" // pt-BR, pt-PT |
| + "|姓名" // zh-CN |
| + "|성명"; // ko-KR |
| const char kNameSpecificRe[] = |
| "^name" |
| - "|^nom" // fr-FR |
| + "|^nom" // fr-FR |
| "|^nome"; // pt-BR, pt-PT |
| const char kFirstNameRe[] = |
| "first.*name|initials|fname|first$|given.*name" |
| - "|vorname" // de-DE |
| - "|nombre" // es |
| + "|vorname" // de-DE |
| + "|nombre" // es |
| "|forename|prénom|prenom" // fr-FR |
| - "|名" // ja-JP |
| - "|nome" // pt-BR, pt-PT |
| - "|Имя" // ru |
| - "|이름"; // ko-KR |
| + "|名" // ja-JP |
| + "|nome" // pt-BR, pt-PT |
| + "|Имя" // ru |
| + "|이름"; // ko-KR |
| const char kMiddleInitialRe[] = "middle.*initial|m\\.i\\.|mi$|\\bmi\\b"; |
| const char kMiddleNameRe[] = |
| "middle.*name|mname|middle$" |
| "|apellido.?materno|lastlastname"; // es |
| const char kLastNameRe[] = |
| "last.*name|lname|surname|last$|secondname|family.*name" |
| - "|nachname" // de-DE |
| - "|apellido" // es |
| - "|famille|^nom" // fr-FR |
| - "|cognome" // it-IT |
| - "|姓" // ja-JP |
| + "|nachname" // de-DE |
| + "|apellido" // es |
| + "|famille|^nom" // fr-FR |
| + "|cognome" // it-IT |
| + "|姓" // ja-JP |
| "|morada|apelidos|surename|sobrenome" // pt-BR, pt-PT |
| - "|Фамилия" // ru |
| - "|\\b성(?:[^명]|\\b)"; // ko-KR |
| + "|Фамилия" // ru |
| + "|\\b성(?:[^명]|\\b)"; // ko-KR |
| ///////////////////////////////////////////////////////////////////////////// |
| // phone_field.cc |
| @@ -289,23 +282,18 @@ const char kPhoneRe[] = |
| "|телефон" // ru |
| "|电话" // zh-CN |
| "|(?:전화|핸드폰|휴대폰|휴대전화)(?:.?번호)?"; // ko-KR |
| -const char kCountryCodeRe[] = |
| - "country.*code|ccode|_cc"; |
| -const char kAreaCodeNotextRe[] = |
| - "^\\($"; |
| +const char kCountryCodeRe[] = "country.*code|ccode|_cc"; |
| +const char kAreaCodeNotextRe[] = "^\\($"; |
| const char kAreaCodeRe[] = |
| "area.*code|acode|area" |
| "|지역.?번호"; // ko-KR |
| -const char kPhonePrefixSeparatorRe[] = |
| - "^-$|^\\)$"; |
| -const char kPhoneSuffixSeparatorRe[] = |
| - "^-$"; |
| +const char kPhonePrefixSeparatorRe[] = "^-$|^\\)$"; |
| +const char kPhoneSuffixSeparatorRe[] = "^-$"; |
| const char kPhonePrefixRe[] = |
| "prefix|exchange" |
| "|preselection" // fr-FR |
| - "|ddd"; // pt-BR, pt-PT |
| -const char kPhoneSuffixRe[] = |
| - "suffix"; |
| + "|ddd"; // pt-BR, pt-PT |
| +const char kPhoneSuffixRe[] = "suffix"; |
| const char kPhoneExtensionRe[] = |
| "\\bext|ext\\b|extension" |
| "|ramal"; // pt-BR, pt-PT |