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

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/utf_string_conversions.h"
@@ skipping 634 matching lines @@
   GetDialogClientView()->UpdateDialogButtons();
   ContentsPreferredSizeChanged();
 }
 
 void AutofillDialogViews::UpdateNotificationArea() {
   DCHECK(notification_area_);
   notification_area_->SetNotifications(controller_->CurrentNotifications());
   ContentsPreferredSizeChanged();
 }
 
-void AutofillDialogViews::UpdateSection(DialogSection section) {
+void AutofillDialogViews::UpdateSection(DialogSection section,
+                                        UserInputAction action) {
   const DetailInputs& updated_inputs =
       controller_->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())
+
+    if (text_mapping != group->textfields.end() &&
+        (text_mapping->second->textfield()->text().empty() ||
+         action == CLEAR_USER_INPUT)) {
       text_mapping->second->textfield()->SetText(iter->initial_value);
+    }
 
     ComboboxMap::iterator combo_mapping = group->comboboxes.find(&input);
     if (combo_mapping != group->comboboxes.end()) {
       views::Combobox* combobox = combo_mapping->second;
       for (int i = 0; i < combobox->model()->GetItemCount(); ++i) {
         if (input.initial_value == combobox->model()->GetItemAt(i)) {
           combobox->SetSelectedIndex(i);
           break;
         }
       }
@@ skipping 717 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