Store the language code for the address in autofill profile.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 679 matching lines @@
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
 
     std::string country_code;
     CountryComboboxModel* model = CountryComboboxModelForSection(section);
     if (model)
       country_code = model->GetDefaultCountryCode();
 
     DetailInputs* inputs = MutableRequestedFieldsForSection(section);
-    common::BuildInputsForSection(section, country_code, inputs);
+    common::BuildInputsForSection(
+        section, country_code, inputs,
+        MutableAddressLanguageCodeForSection(section));
   }
 
   // Test whether we need to show the shipping section. If filling that section
   // would be a no-op, don't show it.
   cares_about_shipping_ = form_structure_.FillFields(
       RequestedTypesForSection(SECTION_SHIPPING),
       base::Bind(common::ServerTypeMatchesField, SECTION_SHIPPING),
       base::Bind(NullGetInfo),
       g_browser_process->GetApplicationLocale());
 
@@ skipping 1133 matching lines @@
   if (inputs.empty())
     return messages;
 
   AddressValidator::Status status = AddressValidator::SUCCESS;
   if (section != SECTION_CC) {
     AutofillProfile profile;
     FillFormGroupFromOutputs(inputs, &profile);
     AddressData address_data;
     i18ninput::CreateAddressData(base::Bind(&GetInfoFromProfile, profile),
                                  &address_data);
+    address_data.language_code = AddressLanguageCodeForSection(section);
 
     AddressProblems problems;
     status = GetValidator()->ValidateAddress(address_data,
                                              AddressProblemFilter(),
                                              &problems);
     common::AddressType address_type = section == SECTION_SHIPPING ?
         common::ADDRESS_TYPE_SHIPPING : common::ADDRESS_TYPE_BILLING;
     for (size_t i = 0; i < problems.size(); ++i) {
       const AddressProblem& problem = problems[i];
       bool sure = problem.type != AddressProblem::MISSING_REQUIRED_FIELD;
@@ skipping 1186 matching lines @@
 }
 
 void AutofillDialogControllerImpl::FillOutputForSectionWithComparator(
     DialogSection section,
     const FormStructure::InputFieldComparator& compare) {
   if (!SectionIsActive(section))
     return;
 
   DetailInputs inputs;
   std::string country_code = CountryCodeForSection(section);
-  common::BuildInputsForSection(section, country_code, &inputs);
+  common::BuildInputsForSection(section, country_code, &inputs,
+                                MutableAddressLanguageCodeForSection(section));
   std::vector<ServerFieldType> types = common::TypesFromInputs(inputs);
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
   if (wrapper) {
     // Only fill in data that is associated with this section.
     wrapper->FillFormStructure(types, compare, &form_structure_);
 
     // CVC needs special-casing because the CreditCard class doesn't store or
     // handle them. This isn't necessary when filling the combined CC and
     // billing section as CVC comes from |full_wallet_| in this case.
@@ skipping 33 matching lines @@
       AutofillCreditCardWrapper card_wrapper(&card);
       card_wrapper.FillFormStructure(types, compare, &form_structure_);
 
       // Again, CVC needs special-casing. Fill it in directly from |output|.
       SetOutputForFieldsOfType(
           CREDIT_CARD_VERIFICATION_CODE,
           output[CREDIT_CARD_VERIFICATION_CODE]);
     } else {
       AutofillProfile profile;
       FillFormGroupFromOutputs(output, &profile);
+      profile.set_language_code(AddressLanguageCodeForSection(section));
 
       if (ShouldSaveDetailsLocally()) {
         profile.set_origin(RulesAreLoaded(section) ?
             kAutofillDialogOrigin : source_url_.GetOrigin().spec());
 
         std::string guid = GetManager()->SaveImportedProfile(profile);
         newly_saved_data_model_guids_[section] = guid;
       }
 
       AutofillProfileWrapper profile_wrapper(&profile);
@@ skipping 128 matching lines @@
 
   FieldValueMap inputs;
   view_->GetUserInput(section, &inputs);
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(inputs, &profile);
 
   AddressData user_input;
   i18ninput::CreateAddressData(
       base::Bind(&GetInfoFromProfile, profile), &user_input);
+  user_input.language_code = AddressLanguageCodeForSection(section);
 
   static const size_t kSuggestionsLimit = 10;
   AddressValidator::Status status = GetValidator()->GetSuggestions(
       user_input, focused_field, kSuggestionsLimit,
       &i18n_validator_suggestions_);
 
   if (status != AddressValidator::SUCCESS)
     return;
 
   for (size_t i = 0; i < i18n_validator_suggestions_.size(); ++i) {
@@ skipping 17 matching lines @@
     }
   }
   popup_icons->resize(popup_values->size());
 }
 
 DetailInputs* AutofillDialogControllerImpl::MutableRequestedFieldsForSection(
     DialogSection section) {
   return const_cast<DetailInputs*>(&RequestedFieldsForSection(section));
 }
 
+std::string* AutofillDialogControllerImpl::MutableAddressLanguageCodeForSection(
+    DialogSection section) {
+  switch (section) {
+    case SECTION_BILLING:
+      return &billing_address_language_code_;
+    case SECTION_SHIPPING:
+      return &shipping_address_language_code_;
+    default:

[Ilya Sherman, 2014/03/29 01:24:42]

please explicitly list all SECTION_'s rather than using a default case, so that
the compiler will catch it if someone forgets to update this switch stmt.

[please use gerrit instead, 2014/04/02 21:54:52]

Done.

+      return NULL;
+  }
+}
+
+std::string AutofillDialogControllerImpl::AddressLanguageCodeForSection(
+    DialogSection section) {
+  std::string* language_code = MutableAddressLanguageCodeForSection(section);
+  return language_code != NULL ? *language_code : std::string();
+}
+
 std::vector<ServerFieldType> AutofillDialogControllerImpl::
     RequestedTypesForSection(DialogSection section) const {
   return common::TypesFromInputs(RequestedFieldsForSection(section));
 }
 
 std::string AutofillDialogControllerImpl::CountryCodeForSection(
     DialogSection section) {
   base::string16 country;
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
@@ skipping 25 matching lines @@
     FieldValueMap outputs;
     view_->GetUserInput(section, &outputs);
 
     // If |country_name| is the same as the view, no-op and let the caller know.
     if (outputs[CountryTypeForSection(section)] == country_name)
       return false;
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   inputs->clear();
-  common::BuildInputsForSection(section, country_code, inputs);
+  common::BuildInputsForSection(section, country_code, inputs,
+                                MutableAddressLanguageCodeForSection(section));
   return true;
 }
 
 void AutofillDialogControllerImpl::HidePopup() {
   if (popup_controller_.get())
     popup_controller_->Hide();
   popup_input_type_ = UNKNOWN_TYPE;
 }
 
 void AutofillDialogControllerImpl::SetEditingExistingData(
@@ skipping 237 matching lines @@
 }
 
 scoped_ptr<wallet::Address>AutofillDialogControllerImpl::
     CreateTransientAddress() {
   // If not using billing for shipping, just scrape the view.
   FieldValueMap output;
   view_->GetUserInput(SECTION_SHIPPING, &output);
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(output, &profile);
+  profile.set_language_code(
+      AddressLanguageCodeForSection(SECTION_SHIPPING));
   CanonicalizeState(validator_.get(), &profile);
 
   return scoped_ptr<wallet::Address>(new wallet::Address(profile));
 }
 
 void AutofillDialogControllerImpl::GetFullWallet() {
   DCHECK(is_submitting_);
   DCHECK(IsPayingWithWallet());
   DCHECK(wallet_items_);
   DCHECK(!active_instrument_id_.empty());
@@ skipping 300 matching lines @@
     return;
 
   if (newly_saved_card_) {
     scoped_ptr<AutofillProfile> billing_profile;
     if (IsManuallyEditingSection(SECTION_BILLING)) {
       // Scrape the view as the user's entering or updating information.
       FieldValueMap outputs;
       view_->GetUserInput(SECTION_BILLING, &outputs);
       billing_profile.reset(new AutofillProfile);
       FillFormGroupFromOutputs(outputs, billing_profile.get());
+      billing_profile->set_language_code(
+          AddressLanguageCodeForSection(SECTION_BILLING));
     } else {
       // Just snag the currently suggested profile.
       std::string item_key = SuggestionsMenuModelForSection(SECTION_BILLING)->
           GetItemKeyForCheckedItem();
       AutofillProfile* profile = GetManager()->GetProfileByGUID(item_key);
       billing_profile.reset(new AutofillProfile(*profile));
     }
 
     ShowNewCreditCardBubble(newly_saved_card_.Pass(),
                             billing_profile.Pass());
@@ skipping 16 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill