Ask libaddressinput for address components to use in requestAutocomplete().

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 11 matching lines @@
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_common.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/new_credit_card_bubble_controller.h"
 #endif
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 554 matching lines @@
         AutofillMetrics::SECURITY_METRIC_CROSS_ORIGIN_FRAME);
   }
 
   // Fail if the author didn't specify autocomplete types.
   if (!has_types) {
     callback_.Run(NULL);
     delete this;
     return;
   }
 
-  common::BuildInputsForSection(SECTION_CC,
-                                &requested_cc_fields_);
-  common::BuildInputsForSection(SECTION_BILLING,
-                                &requested_billing_fields_);
-  common::BuildInputsForSection(SECTION_CC_BILLING,
-                                &requested_cc_billing_fields_);
-  common::BuildInputsForSection(SECTION_SHIPPING,
-                                &requested_shipping_fields_);
+  const std::string& country_code =
+      GetManager()->GetDefaultCountryCodeForNewAddress();
+  for (size_t section = SECTION_MIN; section <= SECTION_MAX; ++section) {
+    SetCountryCodeForSection(static_cast<DialogSection>(section), country_code);
+  }
 
   // Test whether we need to show the shipping section. If filling that section
   // would be a no-op, don't show it.
   const DetailInputs& inputs = RequestedFieldsForSection(SECTION_SHIPPING);
   EmptyDataModelWrapper empty_wrapper;
   cares_about_shipping_ = empty_wrapper.FillFormStructure(
       inputs,
       base::Bind(common::DetailInputMatchesField, SECTION_SHIPPING),
       &form_structure_);
 
@@ skipping 462 matching lines @@
     legal_document_link_ranges_.push_back(gfx::Range(
         link_start, link_start + documents[i]->display_name().size()));
   }
   legal_documents_text_ = text;
 }
 
 void AutofillDialogControllerImpl::ResetSectionInput(DialogSection section) {
   SetEditingExistingData(section, false);
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
+  std::string country_code = GetCountryCodeForSection(section);
   for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
-    it->initial_value = common::GetHardcodedValueForType(it->type);
+    it->initial_value = common::GetInitialValueForType(it->type, country_code);

[Evan Stade, 2013/12/05 03:09:18]

I think it's simpler if you leave this code alone (see my comment about
GetHardcodedValueForType), but make sure ComboboxModel::GetDefaultIndex() works
the way you want it to for CountryComboboxModel and the view respects that.

   }
 }
 
 void AutofillDialogControllerImpl::ShowEditUiIfBadSuggestion(
     DialogSection section) {
   // |CreateWrapper()| returns an empty wrapper if |IsEditingExistingData()|, so
   // get the wrapper before this potentially happens below.
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
 
   // If the chosen item in |model| yields an empty suggestion text, it is
   // invalid. In this case, show the edit UI and highlight invalid fields.
   SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
   string16 unused, unused2;
   if (IsASuggestionItemKey(model->GetItemKeyForCheckedItem()) &&
       !SuggestionTextForSection(section, &unused, &unused2)) {
     SetEditingExistingData(section, true);
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   if (wrapper && IsEditingExistingData(section))
-    wrapper->FillInputs(inputs);
+    wrapper->FillInputs(inputs, GetCountryCodeForSection(section));
 }
 
 bool AutofillDialogControllerImpl::InputWasEdited(ServerFieldType type,
                                                   const base::string16& value) {
   if (value.empty())
     return false;
 
   // If this is a combobox at the default value, don't preserve it.
   ui::ComboboxModel* model = ComboboxModelForAutofillType(type);
   if (model && model->GetItemAt(model->GetDefaultIndex()) == value)
@@ skipping 33 matching lines @@
   if (snapshot.empty())
     return;
 
   FieldMapWrapper wrapper(snapshot);
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
     if (!SectionIsActive(section))
       continue;
 
     DetailInputs* inputs = MutableRequestedFieldsForSection(section);
-    wrapper.FillInputs(inputs);
+    wrapper.FillInputs(inputs, GetCountryCodeForSection(section));
 
     for (size_t i = 0; i < inputs->size(); ++i) {
       if (InputWasEdited((*inputs)[i].type, (*inputs)[i].initial_value)) {
         SuggestionsMenuModelForSection(section)->SetCheckedItem(kAddNewItemKey);
         break;
       }
     }
   }
 }
 
@@ skipping 501 matching lines @@
       }
       break;
 
     case ADDRESS_HOME_LINE1:
       break;
 
     case ADDRESS_HOME_LINE2:
       return base::string16();  // Line 2 is optional - always valid.
 
     case ADDRESS_HOME_CITY:
+    case ADDRESS_HOME_DEPENDENT_LOCALITY:
     case ADDRESS_HOME_COUNTRY:
       break;
 
     case ADDRESS_HOME_STATE:
       if (!value.empty() && !autofill::IsValidState(value)) {
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_REGION);
       }
       break;
 
     case ADDRESS_HOME_ZIP:
       if (!value.empty() && !autofill::IsValidZip(value)) {
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_ZIP_CODE);
       }
       break;
 
+    case ADDRESS_HOME_SORTING_CODE:
+      break;
+
     case NAME_FULL:
       // Wallet requires a first and last billing name.
       if (section == SECTION_CC_BILLING && !value.empty() &&
           !IsCardHolderNameValidForWallet(value)) {
         DCHECK(IsPayingWithWallet());
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_WALLET_REQUIRES_TWO_NAMES);
       }
       break;
 
+    case COMPANY_NAME:
+      break;
+
     case PHONE_HOME_WHOLE_NUMBER:  // Used in shipping section.
       break;
 
     case PHONE_BILLING_WHOLE_NUMBER:  // Used in billing section.
       break;
 
     default:
       NOTREACHED();  // Trying to validate unknown field.
       break;
   }
@@ skipping 185 matching lines @@
       content_bounds,
       base::i18n::IsRTL() ?
           base::i18n::RIGHT_TO_LEFT : base::i18n::LEFT_TO_RIGHT);
   popup_controller_->set_hide_on_outside_click(true);
   popup_controller_->Show(popup_values,
                           popup_labels,
                           popup_icons,
                           popup_ids);
 }
 
+void AutofillDialogControllerImpl::ComboboxItemSelected(ServerFieldType type,
+                                                        int index) {
+  ui::ComboboxModel* model = ComboboxModelForAutofillType(type);
+  if (model != &country_combobox_model_ || model->IsItemSeparatorAt(index))

[Evan Stade, 2013/12/05 03:09:18]

are you sure the isitemseparatorat is necessary? seems that should never be
selected

+    return;
+
+  std::string country_code =
+      country_combobox_model_.countries()[index]->country_code();
+  DialogSection section = AutofillType(type).group() == ADDRESS_BILLING ?
+      IsPayingWithWallet() ? SECTION_CC_BILLING : SECTION_BILLING :
+      SECTION_SHIPPING;
+  if (country_code == GetCountryCodeForSection(section))
+    return;
+
+  ScopedViewUpdates updates(view_.get());
+  const FieldValueMap snapshot = TakeUserInputSnapshot();
+
+  SetCountryCodeForSection(section, country_code);
+
+  ResetSectionInput(section);
+  RestoreUserInputFromSnapshot(snapshot);
+  UpdateSection(section);
+}
+
 void AutofillDialogControllerImpl::FocusMoved() {
   HidePopup();
 }
 
 bool AutofillDialogControllerImpl::ShouldShowErrorBubble() const {
   return !input_showing_popup_;
 }
 
 void AutofillDialogControllerImpl::ViewClosed() {
   GetManager()->RemoveObserver(this);
@@ skipping 221 matching lines @@
         GetManager()->GetCreditCardByGUID(pair.first)));
   } else {
     wrapper.reset(new AutofillProfileWrapper(
         GetManager()->GetProfileByGUID(pair.first),
         AutofillType(input_showing_popup_->type),
         pair.second));
   }
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
-    wrapper->FillInputs(MutableRequestedFieldsForSection(section));
+    wrapper->FillInputs(MutableRequestedFieldsForSection(section),
+                        GetCountryCodeForSection(section));
     view_->FillSection(section, *input_showing_popup_);
   }
 
   GetMetricLogger().LogDialogPopupEvent(
       AutofillMetrics::DIALOG_POPUP_FORM_FILLED);
 
   // TODO(estade): not sure why it's necessary to do this explicitly.
   HidePopup();
 }
 
@@ skipping 578 matching lines @@
       suggested_cc_.AddKeyedItemWithIcon(
           cards[i]->guid(),
           cards[i]->Label(),
           rb.GetImageNamed(CreditCard::IconResourceId(cards[i]->type())));
     }
 
     const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
     std::vector<base::string16> labels;
     AutofillProfile::CreateDifferentiatingLabels(profiles, &labels);
     DCHECK_EQ(labels.size(), profiles.size());
-    const std::string app_locale = g_browser_process->GetApplicationLocale();
     for (size_t i = 0; i < profiles.size(); ++i) {
       const AutofillProfile& profile = *profiles[i];
       if (!HasCompleteAndVerifiedData(profile, requested_shipping_fields_) ||
           HasInvalidAddress(*profiles[i])) {
         continue;
       }
 
       // Don't add variants for addresses: name is part of credit card and we'll
       // just ignore email and phone number variants.
       suggested_shipping_.AddKeyedItem(profile.guid(), labels[i]);
@@ skipping 65 matching lines @@
     ShowEditUiIfBadSuggestion(section);
     UpdateSection(section);
   }
 
   UpdateForErrors();
 }
 
 void AutofillDialogControllerImpl::FillOutputForSectionWithComparator(
     DialogSection section,
     const InputFieldComparator& compare) {
-  const DetailInputs& inputs = RequestedFieldsForSection(section);
-
   if (!SectionIsActive(section))
     return;
 
+  const DetailInputs& inputs = RequestedFieldsForSection(section);
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
   if (wrapper) {
     // Only fill in data that is associated with this section.
     const DetailInputs& inputs = RequestedFieldsForSection(section);
     wrapper->FillFormStructure(inputs, 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.
     if (section == SECTION_CC)
@@ skipping 126 matching lines @@
 
   DCHECK_EQ(&model, &suggested_shipping_);
   return SECTION_SHIPPING;
 }
 
 DetailInputs* AutofillDialogControllerImpl::MutableRequestedFieldsForSection(
     DialogSection section) {
   return const_cast<DetailInputs*>(&RequestedFieldsForSection(section));
 }
 
+std::string AutofillDialogControllerImpl::GetCountryCodeForSection(
+    DialogSection section) const {
+  if (section == SECTION_BILLING || section == SECTION_CC_BILLING)
+    return billing_country_code_;
+  if (section == SECTION_SHIPPING)
+    return shipping_country_code_;
+  return "US";
+}
+
+void AutofillDialogControllerImpl::SetCountryCodeForSection(
+    DialogSection section,
+    const std::string& country_code) {
+  if (section == SECTION_BILLING || section == SECTION_CC_BILLING)
+    billing_country_code_ = country_code;
+  else if (section == SECTION_SHIPPING)
+    shipping_country_code_ = country_code;
+
+  DetailInputs* inputs = MutableRequestedFieldsForSection(section);
+  inputs->clear();
+
+  common::BuildInputsForSection(section, inputs, country_code);
+
+  const std::string& ui_locale = g_browser_process->GetApplicationLocale();
+  base::string16 country_name = AutofillCountry(country_code, ui_locale).name();
+  for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
+    if (AutofillType(it->type).GetStorableType() == ADDRESS_HOME_COUNTRY)
+      it->initial_value = country_name;
+  }
+}
+
 void AutofillDialogControllerImpl::HidePopup() {
   if (popup_controller_.get())
     popup_controller_->Hide();
   input_showing_popup_ = NULL;
 }
 
 void AutofillDialogControllerImpl::SetEditingExistingData(
     DialogSection section, bool editing) {
   if (editing)
     section_editing_state_.insert(section);
@@ skipping 528 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