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 566 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_);
+  std::string guess = i18ninput::GuessCountry();
+  for (size_t section = SECTION_MIN; section <= SECTION_MAX; ++section) {
+    SetCountryCodeForSection(static_cast<DialogSection>(section), guess);
+  }
 
   // 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 459 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);
   }
 }
 
 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)
     return false;
 
   return true;
 }
 
-DetailOutputMap AutofillDialogControllerImpl::TakeUserInputSnapshot() {
-  DetailOutputMap snapshot;
+UserInputSnapshot AutofillDialogControllerImpl::TakeUserInputSnapshot() {
+  UserInputSnapshot snapshot;
   if (!view_)
     return snapshot;
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
     SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
     if (model->GetItemKeyForCheckedItem() != kAddNewItemKey)
       continue;
 
     DetailOutputMap outputs;
     view_->GetUserInput(section, &outputs);
     // Remove fields that are empty, at their default values, or invalid.
     for (DetailOutputMap::iterator it = outputs.begin(); it != outputs.end();
          ++it) {
       if (InputWasEdited(it->first->type, it->second) &&
           InputValidityMessage(section, it->first->type, it->second).empty()) {
-        snapshot.insert(std::make_pair(it->first, it->second));
+        snapshot.insert(std::make_pair(it->first->type, it->second));
       }
     }
   }
 
   return snapshot;
 }
 
 void AutofillDialogControllerImpl::RestoreUserInputFromSnapshot(
-    const DetailOutputMap& snapshot) {
+    const UserInputSnapshot& snapshot) {
   if (snapshot.empty())
     return;
 
-  DetailOutputWrapper wrapper(snapshot);
+  SnapshotWrapper 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 70 matching lines @@
           IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_CREDIT_CARD_SECURITY_CODE);
     }
     messages.Set(CREDIT_CARD_VERIFICATION_CODE, ccv_message);
   }
 
   // Validate the shipping phone number against the country code of the address.
   if (field_values.count(ADDRESS_HOME_COUNTRY) &&
       field_values.count(PHONE_HOME_WHOLE_NUMBER)) {
     i18n::PhoneObject phone_object(
         field_values[PHONE_HOME_WHOLE_NUMBER],
-        AutofillCountry::GetCountryCode(
-            field_values[ADDRESS_HOME_COUNTRY],
-            g_browser_process->GetApplicationLocale()));
+        common::GetCountryCode(field_values[ADDRESS_HOME_COUNTRY]));
     ValidityMessage phone_message(base::string16(), true);
     if (!phone_object.IsValidNumber()) {
       phone_message.text = l10n_util::GetStringUTF16(
           IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_PHONE_NUMBER);
     }
     messages.Set(PHONE_HOME_WHOLE_NUMBER, phone_message);
   }
 
   // Validate the billing phone number against the country code of the address.
   if (field_values.count(ADDRESS_BILLING_COUNTRY) &&
       field_values.count(PHONE_BILLING_WHOLE_NUMBER)) {
     i18n::PhoneObject phone_object(
         field_values[PHONE_BILLING_WHOLE_NUMBER],
-        AutofillCountry::GetCountryCode(
-            field_values[ADDRESS_BILLING_COUNTRY],
-            g_browser_process->GetApplicationLocale()));
+        common::GetCountryCode(field_values[ADDRESS_BILLING_COUNTRY]));
     ValidityMessage phone_message(base::string16(), true);
     if (!phone_object.IsValidNumber()) {
       phone_message.text = l10n_util::GetStringUTF16(
           IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_PHONE_NUMBER);
     }
     messages.Set(PHONE_BILLING_WHOLE_NUMBER, phone_message);
   }
 
   return messages;
 }
@@ skipping 67 matching lines @@
 
   // |input_showing_popup_| must be set before calling |Show()|.
   input_showing_popup_ = input;
 
   popup_controller_->Show(popup_values,
                           popup_labels,
                           popup_icons,
                           popup_ids);
 }
 
+void AutofillDialogControllerImpl::ComboboxItemSelected(
+    ui::ComboboxModel* model,
+    DialogSection section,
+    int index) {
+  if (model != &country_combobox_model_)
+    return;
+
+  const UserInputSnapshot snapshot = TakeUserInputSnapshot();
+
+  base::string16 country = model->GetItemAt(index);

[Evan Stade, 2013/11/25 19:52:06]

country_combobox_model_.countries()[index].country_code();

[Dan Beam, 2013/11/28 02:52:45]

Done.

+  SetCountryCodeForSection(section, common::GetCountryCode(country));
+
+  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 255 matching lines @@
 void AutofillDialogControllerImpl::UpdateAccountChooserView() {
   if (view_) {
     ScopedViewUpdates updates(view_.get());
     view_->UpdateAccountChooser();
     view_->UpdateNotificationArea();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
+

[Evan Stade, 2013/11/25 19:52:06]

intentional?

[Dan Beam, 2013/11/28 02:52:45]

nope, removed

 bool AutofillDialogControllerImpl::HandleKeyPressEventInInput(
     const content::NativeWebKeyboardEvent& event) {
   if (popup_controller_.get())
     return popup_controller_->HandleKeyPressEvent(event);
 
   return false;
 }
 
 bool AutofillDialogControllerImpl::RequestingCreditCardInfo() const {
   DCHECK_GT(form_structure_.field_count(), 0U);
@@ skipping 181 matching lines @@
   wallet_errors_.clear();
   GetWalletClient()->CancelRequests();
   SetIsSubmitting(false);
   wallet_error_notification_ = GetWalletError(error_type);
   account_chooser_model_.SetHadWalletError();
 }
 
 void AutofillDialogControllerImpl::SuggestionsUpdated() {
   ScopedViewUpdates updates(view_.get());
 
-  const DetailOutputMap snapshot = TakeUserInputSnapshot();
+  const UserInputSnapshot snapshot = TakeUserInputSnapshot();
 
   suggested_cc_.Reset();
   suggested_billing_.Reset();
   suggested_cc_billing_.Reset();
   suggested_shipping_.Reset();
   HidePopup();
 
   suggested_shipping_.AddKeyedItem(
       kSameAsBillingKey,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_USE_BILLING_FOR_SHIPPING));
@@ skipping 79 matching lines @@
       if (!HasCompleteAndVerifiedData(*cards[i], requested_cc_fields_))
         continue;
 
       suggested_cc_.AddKeyedItemWithIcon(
           cards[i]->guid(),
           cards[i]->Label(),
           rb.GetImageNamed(CreditCard::IconResourceId(cards[i]->type())));
     }
 
     const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
-    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(), profile.Label());
@@ skipping 216 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);
+
+  for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
+    if (AutofillType(it->type).GetStorableType() == ADDRESS_HOME_COUNTRY)
+      it->initial_value = common::GetCountryName(country_code);
+  }
+}
+
 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