Store the language code for the address in autofill profile.

chrome/browser/ui/autofill/autofill_dialog_common.cc

 // Copyright 2013 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_common.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
@@ skipping 78 matching lines @@
 bool IsI18nInputEnabled() {
 #if defined(OS_ANDROID)
   return false;
 #else
   return true;
 #endif
 }
 
 void BuildI18nAddressInputs(AddressType address_type,
                             const std::string& country_code,
-                            DetailInputs* inputs) {
+                            DetailInputs* inputs,
+                            std::string* language_code) {
 #if defined(OS_ANDROID)
   NOTREACHED();
 #else
-  i18ninput::BuildAddressInputs(address_type, country_code, inputs);
+  i18ninput::BuildAddressInputs(address_type, country_code, inputs,
+                                language_code);
 #endif
 }
 
 // Constructs |inputs| from template data for a given |dialog_section|.
 void BuildInputsForSection(DialogSection dialog_section,
                            const std::string& country_code,
-                           DetailInputs* inputs) {
+                           DetailInputs* inputs,
+                           std::string* language_code) {
   using l10n_util::GetStringUTF16;
 
   const DetailInput kCCInputs[] = {
     { DetailInput::LONG,
       CREDIT_CARD_NUMBER,
       GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_CARD_NUMBER) },
     { DetailInput::SHORT,
       CREDIT_CARD_EXP_MONTH,
       GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_EXPIRY_MONTH) },
     { DetailInput::SHORT,
@@ skipping 67 matching lines @@
       PHONE_HOME_WHOLE_NUMBER,
       GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_PHONE_NUMBER) },
   };
 
   switch (dialog_section) {
     case SECTION_CC:
       BuildInputs(kCCInputs, arraysize(kCCInputs), inputs);
       break;
 
     case SECTION_BILLING:
-      if (IsI18nInputEnabled())
-        BuildI18nAddressInputs(ADDRESS_TYPE_BILLING, country_code, inputs);
-      else
+      if (IsI18nInputEnabled()) {
+        BuildI18nAddressInputs(ADDRESS_TYPE_BILLING, country_code, inputs,
+                               language_code);
+      } else {
         BuildInputs(kBillingInputs, arraysize(kBillingInputs), inputs);
+      }
 
       BuildInputs(kBillingPhoneInputs, arraysize(kBillingPhoneInputs), inputs);
       BuildInputs(kEmailInputs, arraysize(kEmailInputs), inputs);
       break;
 
     case SECTION_CC_BILLING:
       BuildInputs(kCCInputs, arraysize(kCCInputs), inputs);
 
       if (IsI18nInputEnabled()) {
         // Wallet only supports US billing addresses.
         const std::string hardcoded_country_code = "US";
         BuildI18nAddressInputs(ADDRESS_TYPE_BILLING,
                                hardcoded_country_code,
-                               inputs);
+                               inputs,
+                               language_code);
         DCHECK_EQ(inputs->back().type, ADDRESS_BILLING_COUNTRY);
         inputs->back().length = DetailInput::NONE;
         const std::string& app_locale =
             g_browser_process->GetApplicationLocale();
         inputs->back().initial_value =
             AutofillCountry(hardcoded_country_code, app_locale).name();
       } else {
         BuildInputs(kBillingInputs, arraysize(kBillingInputs), inputs);
       }
 
       BuildInputs(kBillingPhoneInputs, arraysize(kBillingPhoneInputs), inputs);
       break;
 
     case SECTION_SHIPPING:
-      if (IsI18nInputEnabled())
-        BuildI18nAddressInputs(ADDRESS_TYPE_SHIPPING, country_code, inputs);
-      else
+      if (IsI18nInputEnabled()) {
+        BuildI18nAddressInputs(ADDRESS_TYPE_SHIPPING, country_code, inputs,
+                               language_code);
+      } else {
         BuildInputs(kShippingInputs, arraysize(kShippingInputs), inputs);
+      }
 
       BuildInputs(
           kShippingPhoneInputs, arraysize(kShippingPhoneInputs), inputs);
       break;
   }
 }
 
 AutofillMetrics::DialogUiEvent DialogSectionToUiItemAddedEvent(
     DialogSection section) {
   switch (section) {
@@ skipping 37 matching lines @@
 std::vector<ServerFieldType> TypesFromInputs(const DetailInputs& inputs) {
   std::vector<ServerFieldType> types;
   for (size_t i = 0; i < inputs.size(); ++i) {
     types.push_back(inputs[i].type);
   }
   return types;
 }
 
 }  // namespace common
 }  // namespace autofill