| Index: third_party/libaddressinput/chromium/cpp/src/rule.h
|
| diff --git a/third_party/libaddressinput/chromium/cpp/src/rule.h b/third_party/libaddressinput/chromium/cpp/src/rule.h
|
| index cc0a3d7a3b34596505bfa1213d872493a4fc020c..81308de712b814ca0af8f327169eda4d84678910 100644
|
| --- a/third_party/libaddressinput/chromium/cpp/src/rule.h
|
| +++ b/third_party/libaddressinput/chromium/cpp/src/rule.h
|
| @@ -165,17 +165,28 @@ class Rule {
|
| int GetInvalidFieldMessageId(AddressField field) const;
|
|
|
| // Outputs the sub key for a given user input. For example, Texas will map to
|
| - // TX.
|
| + // TX. If |canonicalize_latin_name| is true, then canonicalizes latin names,
|
| + // too. This can lead to changing a latinized name into local script.
|
| + // |sub_key| should not be NULL.
|
| bool CanonicalizeSubKey(const std::string& user_input,
|
| + bool canonicalize_latin_name,
|
| std::string* sub_key) const;
|
|
|
| private:
|
| // Finds |target| in |values| and sets |sub_key| to the associated value from
|
| - // |sub_keys_|, or returns false if |target| is not in |values|.
|
| + // |sub_keys_|. Returns false if |target| is not in |values|. |sub_key| should
|
| + // not be NULL.
|
| bool GetMatchingSubKey(const std::string& target,
|
| const std::vector<std::string>& values,
|
| std::string* sub_key) const;
|
|
|
| + // Finds |target| in |values| and sets |value| to the associated value from
|
| + // |values|. Returns false if |target| is not in |values|. |value| should not
|
| + // be NULL.
|
| + bool GetMatchingValue(const std::string& target,
|
| + const std::vector<std::string>& values,
|
| + std::string* value) const;
|
| +
|
| std::string key_;
|
| std::string name_;
|
| std::string latin_name_;
|
|
|