[rAc] Persist selection of newly added cards and addresses.

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 2657 matching lines @@
     if (section == SECTION_CC) {
       CreditCard card;
       card.set_origin(kAutofillDialogOrigin);
       FillFormGroupFromOutputs(output, &card);
 
       // The card holder name comes from the billing address section.
       card.SetRawInfo(CREDIT_CARD_NAME,
                       GetValueFromSection(SECTION_BILLING, NAME_FULL));
 
       if (ShouldSaveDetailsLocally()) {
-        GetManager()->SaveImportedCreditCard(card);
+        std::string guid = GetManager()->SaveImportedCreditCard(card);
+        newly_saved_data_model_guids_[section] = guid;
         DCHECK(!profile()->IsOffTheRecord());
         newly_saved_card_.reset(new CreditCard(card));
       }
 
       AutofillCreditCardWrapper card_wrapper(&card);
       card_wrapper.FillFormStructure(inputs, compare, &form_structure_);
 
       // Again, CVC needs special-casing. Fill it in directly from |output|.
       SetOutputForFieldsOfType(
           CREDIT_CARD_VERIFICATION_CODE,
           GetValueForType(output, CREDIT_CARD_VERIFICATION_CODE));
     } else {
       AutofillProfile profile;
       profile.set_origin(kAutofillDialogOrigin);
       FillFormGroupFromOutputs(output, &profile);
 
-      if (ShouldSaveDetailsLocally())
-        SaveProfileGleanedFromSection(profile, section);
+      if (ShouldSaveDetailsLocally()) {
+        std::string guid = GetManager()->SaveImportedProfile(profile);
+        newly_saved_data_model_guids_[section] = guid;
+      }
 
       AutofillProfileWrapper profile_wrapper(&profile);
       profile_wrapper.FillFormStructure(inputs, compare, &form_structure_);
     }
   }
 }
 
 void AutofillDialogControllerImpl::FillOutputForSection(DialogSection section) {
   FillOutputForSectionWithComparator(
       section, base::Bind(common::DetailInputMatchesField, section));
@@ skipping 32 matching lines @@
   view_->GetUserInput(section, &output);
   for (DetailOutputMap::iterator iter = output.begin(); iter != output.end();
        ++iter) {
     if (iter->first->type == type)
       return iter->second;
   }
 
   return string16();
 }
 
-void AutofillDialogControllerImpl::SaveProfileGleanedFromSection(
-    const AutofillProfile& profile,
-    DialogSection section) {
-  GetManager()->SaveImportedProfile(profile);
-}
-
 SuggestionsMenuModel* AutofillDialogControllerImpl::
     SuggestionsMenuModelForSection(DialogSection section) {
   switch (section) {
     case SECTION_CC:
       return &suggested_cc_;
     case SECTION_BILLING:
       return &suggested_billing_;
     case SECTION_SHIPPING:
       return &suggested_shipping_;
     case SECTION_CC_BILLING:
@@ skipping 368 matching lines @@
   }
 
   if (!IsPayingWithWallet()) {
     for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
       DialogSection section = static_cast<DialogSection>(i);
       if (!SectionIsActive(section))
         continue;
 
       SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
       std::string item_key = model->GetItemKeyForCheckedItem();
-      if (IsASuggestionItemKey(item_key) || item_key == kSameAsBillingKey)
+      if (IsASuggestionItemKey(item_key) || item_key == kSameAsBillingKey) {
         PersistAutofillChoice(section, item_key);
+      } else if (item_key == kAddNewItemKey && ShouldSaveDetailsLocally()) {
+        DCHECK(newly_saved_data_model_guids_.count(section));
+        PersistAutofillChoice(section, newly_saved_data_model_guids_[section]);
+      }
     }
 
     profile_->GetPrefs()->SetBoolean(::prefs::kAutofillDialogSaveData,
                                      view_->SaveDetailsLocally());
   }
 
   // On a successful submit, if the user manually selected "pay without wallet",
   // stop trying to pay with Wallet on future runs of the dialog. On the other
   // hand, if there was an error that prevented the user from having the choice
   // of using Wallet, leave the pref alone.
@@ skipping 205 matching lines @@
 }
 
 void AutofillDialogControllerImpl::OnSubmitButtonDelayEnd() {
   if (!view_)
     return;
   ScopedViewUpdates updates(view_.get());
   view_->UpdateButtonStrip();
 }
 
 }  // namespace autofill