| Index: third_party/libaddressinput/chromium/chrome_address_validator.h
|
| diff --git a/third_party/libaddressinput/chromium/chrome_address_validator.h b/third_party/libaddressinput/chromium/chrome_address_validator.h
|
| index 7a2c7c6f72bde9b3daa0dea85ff4956d03e4a883..ef1f434996f1c23ae081a53fb43e2d218468c91c 100644
|
| --- a/third_party/libaddressinput/chromium/chrome_address_validator.h
|
| +++ b/third_party/libaddressinput/chromium/chrome_address_validator.h
|
| @@ -10,6 +10,7 @@
|
| #include <map>
|
| #include <memory>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| @@ -95,11 +96,13 @@ class AddressValidator {
|
| virtual void LoadRules(const std::string& region_code);
|
|
|
| // Returns the list of sub-regions (recorded as sub-keys) of the region
|
| - // (recorded as rule) indicated by |region_code|. So, if the |region_code| is
|
| + // (recorded as rule) indicated by |region_code|, while the device language
|
| + // is set to |language|. So, if the |region_code| is
|
| // a country code, sub-region means the country's admin area.
|
| // This function should be called when the rules are loaded.
|
| - virtual std::vector<std::string> GetRegionSubKeys(
|
| - const std::string& region_code);
|
| + virtual std::vector<std::pair<std::string, std::string>> GetRegionSubKeys(
|
| + const std::string& region_code,
|
| + const std::string& language);
|
|
|
| // Validates the |address| and populates |problems| with the validation
|
| // problems, filtered according to the |filter| parameter.
|
|
|