Use street address collapser instead of line separator.

chrome/browser/ui/autofill/autofill_dialog_i18n_input.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/address_i18n.h"
@@ skipping 42 matching lines @@
                         const std::string& country_code,
                         DetailInputs* inputs,
                         std::string* language_code) {
   const std::vector<AddressUiComponent>& components(
       BuildComponents(country_code, language_code));
 
   const bool billing = address_type == common::ADDRESS_TYPE_BILLING;
 
   for (size_t i = 0; i < components.size(); ++i) {
     const AddressUiComponent& component = components[i];
-    ServerFieldType server_type = TypeForField(component.field, address_type);
+    ServerFieldType server_type = i18n::TypeForField(component.field, billing);
     DetailInput::Length length = LengthFromHint(component.length_hint);
     base::string16 placeholder = base::UTF8ToUTF16(component.name);
     DetailInput input = { length, server_type, placeholder };
     inputs->push_back(input);
   }
 
   ServerFieldType server_type =
       billing ? ADDRESS_BILLING_COUNTRY : ADDRESS_HOME_COUNTRY;
   base::string16 placeholder_text =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_COUNTRY);
@@ skipping 37 matching lines @@
   for (size_t i = 0; i < arraysize(more_required_fields); ++i) {
     if (profile.GetInfo(AutofillType(more_required_fields[i]),
                         app_locale).empty()) {
       return false;
     }
   }
 
   return true;
 }
 
-ServerFieldType TypeForField(AddressField address_field,
-                             common::AddressType address_type) {
-  bool billing = address_type == common::ADDRESS_TYPE_BILLING;
-  switch (address_field) {
-    case ::i18n::addressinput::COUNTRY:
-      return billing ? ADDRESS_BILLING_COUNTRY : ADDRESS_HOME_COUNTRY;
-    case ::i18n::addressinput::ADMIN_AREA:
-      return billing ? ADDRESS_BILLING_STATE : ADDRESS_HOME_STATE;
-    case ::i18n::addressinput::LOCALITY:
-      return billing ? ADDRESS_BILLING_CITY : ADDRESS_HOME_CITY;
-    case ::i18n::addressinput::DEPENDENT_LOCALITY:
-      return billing ? ADDRESS_BILLING_DEPENDENT_LOCALITY :
-                       ADDRESS_HOME_DEPENDENT_LOCALITY;
-    case ::i18n::addressinput::POSTAL_CODE:
-      return billing ? ADDRESS_BILLING_ZIP : ADDRESS_HOME_ZIP;
-    case ::i18n::addressinput::SORTING_CODE:
-      return billing ? ADDRESS_BILLING_SORTING_CODE : ADDRESS_HOME_SORTING_CODE;
-    case ::i18n::addressinput::STREET_ADDRESS:
-      return billing ? ADDRESS_BILLING_STREET_ADDRESS :
-                       ADDRESS_HOME_STREET_ADDRESS;
-    case ::i18n::addressinput::RECIPIENT:
-      return billing ? NAME_BILLING_FULL : NAME_FULL;
-  }
-  NOTREACHED();
-  return UNKNOWN_TYPE;
-}
-
-bool FieldForType(ServerFieldType server_type, AddressField* field) {
-  switch (server_type) {
-    case ADDRESS_BILLING_COUNTRY:
-    case ADDRESS_HOME_COUNTRY:
-      if (field)
-        *field = ::i18n::addressinput::COUNTRY;
-      return true;
-    case ADDRESS_BILLING_STATE:
-    case ADDRESS_HOME_STATE:
-      if (field)
-        *field = ::i18n::addressinput::ADMIN_AREA;
-      return true;
-    case ADDRESS_BILLING_CITY:
-    case ADDRESS_HOME_CITY:
-      if (field)
-        *field = ::i18n::addressinput::LOCALITY;
-      return true;
-    case ADDRESS_BILLING_DEPENDENT_LOCALITY:
-    case ADDRESS_HOME_DEPENDENT_LOCALITY:
-      if (field)
-        *field = ::i18n::addressinput::DEPENDENT_LOCALITY;
-      return true;
-    case ADDRESS_BILLING_SORTING_CODE:
-    case ADDRESS_HOME_SORTING_CODE:
-      if (field)
-        *field = ::i18n::addressinput::SORTING_CODE;
-      return true;
-    case ADDRESS_BILLING_ZIP:
-    case ADDRESS_HOME_ZIP:
-      if (field)
-        *field = ::i18n::addressinput::POSTAL_CODE;
-      return true;
-    case ADDRESS_BILLING_STREET_ADDRESS:
-    case ADDRESS_BILLING_LINE1:
-    case ADDRESS_BILLING_LINE2:
-    case ADDRESS_HOME_STREET_ADDRESS:
-    case ADDRESS_HOME_LINE1:
-    case ADDRESS_HOME_LINE2:
-      if (field)
-        *field = ::i18n::addressinput::STREET_ADDRESS;
-      return true;
-    case NAME_BILLING_FULL:
-    case NAME_FULL:
-      if (field)
-        *field = ::i18n::addressinput::RECIPIENT;
-      return true;
-    default:
-      return false;
-  }
-}
-
 }  // namespace i18ninput
 }  // namespace autofill