rAc: don't clobber user input when accepting autofill popup suggestion

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 <string>
 
 #include "base/bind.h"
@@ skipping 835 matching lines @@
     DialogSection section) const {
   return section != SECTION_CC_BILLING || !IsSubmitPausedOn(wallet::VERIFY_CVV);
 }
 
 void AutofillDialogControllerImpl::EditClickedForSection(
     DialogSection section) {
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   scoped_ptr<DataModelWrapper> model = CreateWrapper(section);
   model->FillInputs(inputs);
   section_editing_state_[section] = true;
-  view_->UpdateSection(section);
+  view_->UpdateSection(section, CLEAR_USER_INPUT);
 }
 
 void AutofillDialogControllerImpl::EditCancelledForSection(
     DialogSection section) {
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   for (size_t i = 0; i < inputs->size(); ++i)
     (*inputs)[i].initial_value.clear();
   section_editing_state_[section] = false;
-  view_->UpdateSection(section);
+  view_->UpdateSection(section, CLEAR_USER_INPUT);
 }
 
 gfx::Image AutofillDialogControllerImpl::IconForField(
     AutofillFieldType type, const string16& user_input) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (type == CREDIT_CARD_VERIFICATION_CODE)
     return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT);
 
   // For the credit card, we show a few grayscale images, and possibly one
   // color image if |user_input| is a valid card number.
@@ skipping 388 matching lines @@
 
   FormGroup* form_group = section_showing_popup_ == SECTION_CC ?
       static_cast<FormGroup*>(GetManager()->GetCreditCardByGUID(pair.first)) :
       // TODO(estade): need to use the variant, |pair.second|.
       static_cast<FormGroup*>(GetManager()->GetProfileByGUID(pair.first));
   DCHECK(form_group);
 
   FillInputFromFormGroup(
       form_group,
       MutableRequestedFieldsForSection(section_showing_popup_));
-  view_->UpdateSection(section_showing_popup_);
+  view_->UpdateSection(section_showing_popup_, KEEP_USER_INPUT);
 
   metric_logger_.LogDialogPopupEvent(
       dialog_type_, AutofillMetrics::DIALOG_POPUP_FORM_FILLED);
 
   // TODO(estade): not sure why it's necessary to do this explicitly.
   HidePopup();
 }
 
 void AutofillDialogControllerImpl::RemoveSuggestion(const string16& value,
                                                     int identifier) {
@@ skipping 792 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill