diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:36 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:36 +0000 |
| commit | bc218bd8b5a06b381ac7a99e1301bb900076bb34 (patch) | |
| tree | cf43eb4c48540fcc93cdb1fde1536438b0ece281 /cpp/src/address_ui.cc | |
| parent | c29dd2308a9beb970579e2a38ff1d02f218565a7 (diff) | |
| parent | 5074e7546d9b6344ece890f6d1a99c3fd9132272 (diff) | |
| download | src-android-m-preview.tar.gz | |
Merge from Chromium at DEPS revision db3f05efe0f9HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-m-preview-2android-m-preview-1android-m-previewub-webview-m40-releasemaster-soongmastermain
This commit was generated by merge_to_master.py.
Change-Id: I07ba5e568405463b1b643a6e88d60d6d35bba2b7
Diffstat (limited to 'cpp/src/address_ui.cc')
| -rw-r--r-- | cpp/src/address_ui.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/address_ui.cc b/cpp/src/address_ui.cc index 33f0797..5df8b3d 100644 --- a/cpp/src/address_ui.cc +++ b/cpp/src/address_ui.cc @@ -39,7 +39,9 @@ namespace { std::string GetLabelForField(const Localization& localization, AddressField field, int admin_area_name_message_id, - int postal_code_name_message_id) { + int postal_code_name_message_id, + int locality_name_message_id, + int sublocality_name_message_id) { int messageId; switch (field) { case SORTING_CODE: @@ -52,10 +54,10 @@ std::string GetLabelForField(const Localization& localization, messageId = admin_area_name_message_id; break; case LOCALITY: - messageId = IDS_LIBADDRESSINPUT_LOCALITY_LABEL; + messageId = locality_name_message_id; break; case DEPENDENT_LOCALITY: - messageId = IDS_LIBADDRESSINPUT_DISTRICT; + messageId = sublocality_name_message_id; break; case POSTAL_CODE: messageId = postal_code_name_message_id; @@ -132,7 +134,9 @@ std::vector<AddressUiComponent> BuildComponents( component.name = GetLabelForField(localization, format_it->GetField(), rule.GetAdminAreaNameMessageId(), - rule.GetPostalCodeNameMessageId()); + rule.GetPostalCodeNameMessageId(), + rule.GetLocalityNameMessageId(), + rule.GetSublocalityNameMessageId()); result.push_back(component); } |