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

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // Copyright (c) 2012 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/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 1715 matching lines @@
   }
 
   // Show an error bubble when the user focuses the input.
   if (focused_now) {
     focused_now->ScrollRectToVisible(focused_now->GetLocalBounds());
     ShowErrorBubbleForViewIfNecessary(focused_now);
   }
 }
 
 void AutofillDialogViews::OnSelectedIndexChanged(views::Combobox* combobox) {
-  DetailsGroup* group = GroupForView(combobox);
-  ValidateGroup(*group, VALIDATE_EDIT);
-  SetEditabilityForSection(group->section);
+  DialogSection section = GroupForView(combobox)->section;
+  int index = combobox->selected_index();
+  delegate_->ComboboxItemSelected(combobox->model(), section, index);
+  ValidateGroup(*GroupForSection(section), VALIDATE_EDIT);
+  SetEditabilityForSection(section);
 }
 
 void AutofillDialogViews::StyledLabelLinkClicked(const gfx::Range& range,
                                                  int event_flags) {
   delegate_->LegalDocumentLinkClicked(range);
 }
 
 void AutofillDialogViews::OnMenuButtonClicked(views::View* source,
                                               const gfx::Point& point) {
   DCHECK_EQ(kSuggestedButtonClassName, source->GetClassName());
@@ skipping 137 matching lines @@
   AddChildView(sign_in_web_view_);
 
   overlay_view_ = new OverlayView(delegate_);
   overlay_view_->SetVisible(false);
 }
 
 views::View* AutofillDialogViews::CreateDetailsContainer() {
   details_container_ = new DetailsContainerView(
       base::Bind(&AutofillDialogViews::DetailsContainerBoundsChanged,
                  base::Unretained(this)));
+
   // A box layout is used because it respects widget visibility.
   details_container_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     CreateDetailsSection(iter->second.section);
     details_container_->AddChildView(iter->second.container);
   }
 
   return details_container_;
 }
 
 void AutofillDialogViews::CreateDetailsSection(DialogSection section) {
   // Inputs container (manual inputs + combobox).
   views::View* inputs_container = CreateInputsContainer(section);
+  DetailsGroup* group = GroupForSection(section);
 
-  DetailsGroup* group = GroupForSection(section);
   // Container (holds label + inputs).
   group->container = new SectionContainer(
       delegate_->LabelForSection(section),
       inputs_container,
       group->suggested_button);
   DCHECK(group->suggested_button->parent());
   UpdateDetailsGroupState(*group);
 }
 
 views::View* AutofillDialogViews::CreateInputsContainer(DialogSection section) {
@@ skipping 14 matching lines @@
   group->suggested_button = new SuggestedButton(this);
   group->manual_input = manual_inputs;
   group->suggested_info = suggested_info;
 
   return info_view;
 }
 
 // TODO(estade): we should be using Chrome-style constrained window padding
 // values.
 views::View* AutofillDialogViews::InitInputsView(DialogSection section) {
-  const DetailInputs& inputs = delegate_->RequestedFieldsForSection(section);
   TextfieldMap* textfields = &GroupForSection(section)->textfields;
+  textfields->clear();
+
   ComboboxMap* comboboxes = &GroupForSection(section)->comboboxes;
+  comboboxes->clear();
 
   views::View* view = new views::View();
   views::GridLayout* layout = new views::GridLayout(view);
   view->SetLayoutManager(layout);
 
+  const DetailInputs& inputs = delegate_->RequestedFieldsForSection(section);
   for (DetailInputs::const_iterator it = inputs.begin();
        it != inputs.end(); ++it) {
     const DetailInput& input = *it;
     ui::ComboboxModel* input_model =
         delegate_->ComboboxModelForAutofillType(input.type);
     scoped_ptr<views::View> view_to_add;
     if (input_model) {
       views::Combobox* combobox = new views::Combobox(input_model);
       combobox->set_listener(this);
       comboboxes->insert(std::make_pair(&input, combobox));
@@ skipping 55 matching lines @@
   loading_shield_->SetVisible(dialog_mode == LOADING);
   sign_in_web_view_->SetVisible(dialog_mode == SIGN_IN);
   notification_area_->SetVisible(dialog_mode == DETAIL_INPUT);
   scrollable_area_->SetVisible(dialog_mode == DETAIL_INPUT);
   FocusInitialView();
 }
 
 void AutofillDialogViews::UpdateSectionImpl(
     DialogSection section,
     bool clobber_inputs) {
-  // Reset all validity marks for this section.
-  if (clobber_inputs)
-    MarkInputsInvalid(section, ValidityMessages(), true);
+  DetailsGroup* group = GroupForSection(section);
+
+  if (clobber_inputs) {
+    views::View* parent = group->manual_input->parent();
+    int add_index = parent->GetIndexOf(group->manual_input);
+    parent->RemoveChildView(group->manual_input);
+    group->manual_input = InitInputsView(section);
+    parent->AddChildViewAt(group->manual_input, add_index);

[Dan Beam, 2013/11/22 00:15:24]

^ there are still paint issues here, but the rest should be good to review

+  }
 
   const DetailInputs& updated_inputs =
       delegate_->RequestedFieldsForSection(section);
-  DetailsGroup* group = GroupForSection(section);
 
   for (DetailInputs::const_iterator iter = updated_inputs.begin();
        iter != updated_inputs.end(); ++iter) {
     const DetailInput& input = *iter;
+
     TextfieldMap::iterator text_mapping = group->textfields.find(&input);
-
     if (text_mapping != group->textfields.end()) {
       DecoratedTextfield* decorated = text_mapping->second;
       if (decorated->text().empty() || clobber_inputs)
         decorated->SetText(iter->initial_value);
     }
 
     ComboboxMap::iterator combo_mapping = group->comboboxes.find(&input);
     if (combo_mapping != group->comboboxes.end()) {
       views::Combobox* combobox = combo_mapping->second;
       if (combobox->selected_index() == combobox->model()->GetDefaultIndex() ||
@@ skipping 114 matching lines @@
          iter != group->comboboxes.end(); ++iter) {
       const ValidityMessage& message =
           messages.GetMessageOrDefault(iter->first->type);
       if (overwrite_unsure || message.sure)
         SetValidityForInput(iter->second, message.text);
     }
   } else {
     // Purge invisible views from |validity_map_|.
     std::map<views::View*, base::string16>::iterator it;
     for (it = validity_map_.begin(); it != validity_map_.end();) {
-      DCHECK(GroupForView(it->first));
       if (GroupForView(it->first) == group)
         validity_map_.erase(it++);
       else
         ++it;
     }
 
     if (section == GetCreditCardSection()) {
       // Special case CVC as it's not part of |group->manual_input|.
       const ValidityMessage& message =
           messages.GetMessageOrDefault(CREDIT_CARD_VERIFICATION_CODE);
@@ skipping 262 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill