Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: third_party/libaddressinput/chromium/cpp/src/address_validator.cc

Issue 131223004: [rac] Format an address for display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/libaddressinput/chromium/cpp/src/address_validator.cc
diff --git a/third_party/libaddressinput/chromium/cpp/src/address_validator.cc b/third_party/libaddressinput/chromium/cpp/src/address_validator.cc
index 7ec36afa3241d91d3f5140250bed9406c7a3d96a..d21640feb56dbd058c0c7390802ee17c1c1ad6cf 100644
--- a/third_party/libaddressinput/chromium/cpp/src/address_validator.cc
+++ b/third_party/libaddressinput/chromium/cpp/src/address_validator.cc
@@ -115,7 +115,7 @@ class AddressValidatorImpl : public AddressValidator {
field_it = country_rule.GetRequired().begin();
field_it != country_rule.GetRequired().end();
++field_it) {
- if (address.GetField(*field_it).empty() &&
+ if (address.GetFieldValue(*field_it).empty() &&
FilterAllows(
filter, *field_it, AddressProblem::MISSING_REQUIRED_FIELD)) {
problems->push_back(AddressProblem(
@@ -146,7 +146,7 @@ class AddressValidatorImpl : public AddressValidator {
// Validate the field values, e.g. state names in US.
AddressField sub_field_type =
static_cast<AddressField>(ruleset->field() + 1);
- const std::string& sub_field = address.GetField(sub_field_type);
+ const std::string& sub_field = address.GetFieldValue(sub_field_type);
const std::vector<std::string>& sub_keys = rule.GetSubKeys();
if (!sub_field.empty() &&
!sub_keys.empty() &&

Powered by Google App Engine
This is Rietveld 408576698