[imperative autofill] handle filling in <select>

chrome/browser/ui/autofill/autofill_dialog_controller.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/autofill/autofill_dialog_controller.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
@@ skipping 302 matching lines @@
     FillOutputForSection(SECTION_EMAIL);
     FillOutputForSection(SECTION_CC);
     FillOutputForSection(SECTION_BILLING);
     if (view_->UseBillingForShipping()) {
       FillOutputForSectionWithComparator(
           SECTION_BILLING,
           base::Bind(DetailInputMatchesFieldWithSection, "shipping"));
     } else {
       FillOutputForSection(SECTION_SHIPPING);
     }
+    callback_.Run(&form_structure_);
+  } else {
+    callback_.Run(NULL);

[Dan Beam, 2012/12/04 03:31:51]

this part lgtm :)

   }
 
-  callback_.Run(&form_structure_);
   delete this;
 }
 
 void AutofillDialogController::GenerateComboboxModels() {
   PersonalDataManager* manager =
       PersonalDataManagerFactory::GetForProfile(profile_);
   const std::vector<CreditCard*>& cards = manager->credit_cards();
   for (size_t i = 0; i < cards.size(); ++i) {
     suggested_cc_.AddItem(cards[i]->guid(), cards[i]->Label());
   }
@@ skipping 46 matching lines @@
     std::string guid = model->GetItemKeyAt(suggestion_selection);
     PersonalDataManager* manager =
         PersonalDataManagerFactory::GetForProfile(profile_);
     FormGroup* form_group = section == SECTION_CC ?
         static_cast<FormGroup*>(manager->GetCreditCardByGUID(guid)) :
         static_cast<FormGroup*>(manager->GetProfileByGUID(guid));
     // TODO(estade): we shouldn't let this happen.
     if (!form_group)
       return;
 
-    for (size_t i = 0; i < form_structure_.field_count(); ++i) {
-      AutofillField* field = form_structure_.field(i);
-      // Only fill in data that is associated with this section.
-      const DetailInputs& inputs = RequestedFieldsForSection(section);
-      for (size_t j = 0; j < inputs.size(); ++j) {
-        if (compare.Run(inputs[j], *field)) {
-          form_group->FillFormField(*field, 0, field);
-          break;
-        }
-      }
-    }
+    FillFormStructureForSection(*form_group, section, compare);
   } else {
     // The user manually input data.
     DetailOutputMap output;
     view_->GetUserInput(section, &output);
 
-    // First fill in |form_structure_| to return to the page.
-    for (size_t i = 0; i < form_structure_.field_count(); ++i) {
-      AutofillField* field = form_structure_.field(i);
-      for (DetailOutputMap::iterator iter = output.begin();
-           iter != output.end(); ++iter) {
-        if (!iter->second.empty() && compare.Run(*iter->first, *field)) {
-          // TODO(estade): handle select controls and such. Also, canonicalize
-          // the entered data.
-          field->value = iter->second;
-          break;
-        }
-      }
-    }
-
-    // Next, save the info as new or edited data.
+    // Save the info as new or edited data, then fill it into |form_structure_|.
     PersonalDataManager* manager =
         PersonalDataManagerFactory::GetForProfile(profile_);
     if (section == SECTION_CC) {
       CreditCard card;
       FillFormGroupFromOutputs(output, &card);
       manager->SaveImportedCreditCard(card);
+      FillFormStructureForSection(card, section, compare);
+
+      // CVC needs special-casing because the CreditCard class doesn't store
+      // or handle them. Fill it in directly from |output|.
+      for (size_t i = 0; i < form_structure_.field_count(); ++i) {
+        AutofillField* field = form_structure_.field(i);
+        if (field->type() != CREDIT_CARD_VERIFICATION_CODE)
+          continue;
+
+        for (DetailOutputMap::iterator iter = output.begin();
+             iter != output.end(); ++iter) {
+          if (!iter->second.empty() && compare.Run(*iter->first, *field)) {
+            field->value = iter->second;
+            break;
+          }
+        }
+      }
     } else {
       AutofillProfile profile;
       FillFormGroupFromOutputs(output, &profile);
       manager->SaveImportedProfile(profile);
+      FillFormStructureForSection(profile, section, compare);
     }
   }
 }
 
 void AutofillDialogController::FillOutputForSection(DialogSection section) {
   FillOutputForSectionWithComparator(section,
                                      base::Bind(DetailInputMatchesField));
 }
 
+void AutofillDialogController::FillFormStructureForSection(
+    const FormGroup& form_group,
+    DialogSection section,
+    const InputFieldComparator& compare) {
+  for (size_t i = 0; i < form_structure_.field_count(); ++i) {
+    AutofillField* field = form_structure_.field(i);
+    // Only fill in data that is associated with this section.
+    const DetailInputs& inputs = RequestedFieldsForSection(section);
+    for (size_t j = 0; j < inputs.size(); ++j) {
+      if (compare.Run(inputs[j], *field)) {
+        form_group.FillFormField(*field, 0, field);
+        break;
+      }
+    }
+  }
+}
+
 SuggestionsComboboxModel* AutofillDialogController::SuggestionsModelForSection(
     DialogSection section) {
   switch (section) {
     case SECTION_EMAIL:
       return &suggested_email_;
     case SECTION_CC:
       return &suggested_cc_;
     case SECTION_BILLING:
       return &suggested_billing_;
     case SECTION_SHIPPING:
       return &suggested_shipping_;
   }
 
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace autofill