Add back organization field for autofill settings.

components/autofill/core/browser/address_i18n.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 "components/autofill/core/browser/address_i18n.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 using ::i18n::addressinput::AddressData;
 using ::i18n::addressinput::AddressField;
 
 scoped_ptr<AddressData> CreateAddressData(
     const base::Callback<base::string16(const AutofillType&)>& get_info) {
   scoped_ptr<AddressData> address_data(new AddressData());
   address_data->recipient = base::UTF16ToUTF8(
       get_info.Run(AutofillType(NAME_FULL)));
+  address_data->organization = base::UTF16ToUTF8(
+      get_info.Run(AutofillType(COMPANY_NAME)));
   address_data->region_code = base::UTF16ToUTF8(
       get_info.Run(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE)));
   address_data->administrative_area = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_STATE)));
   address_data->locality = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_CITY)));
   address_data->dependent_locality = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_DEPENDENT_LOCALITY)));
   address_data->sorting_code = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_SORTING_CODE)));
@@ skipping 27 matching lines @@
     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::ORGANIZATION:
+        return COMPANY_NAME;
     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:
@@ skipping 28 matching lines @@
       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 COMPANY_NAME:
+      if (field)
+        *field = ::i18n::addressinput::ORGANIZATION;
+      return true;
     case NAME_BILLING_FULL:
     case NAME_FULL:
       if (field)
         *field = ::i18n::addressinput::RECIPIENT;
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace i18n
 }  // namespace autofill