Change DetailOutputMap to FieldValueMap

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 1322 matching lines @@
          it != group->comboboxes.end(); ++it) {
       if (AutofillType(it->first->type).group() == CREDIT_CARD)
         it->second->SetSelectedIndex(it->second->model()->GetDefaultIndex());
     }
   }
 
   UpdateSectionImpl(section, false);
 }
 
 void AutofillDialogViews::GetUserInput(DialogSection section,
-                                       DetailOutputMap* output) {
+                                       FieldValueMap* output) {
   DetailsGroup* group = GroupForSection(section);
   for (TextfieldMap::const_iterator it = group->textfields.begin();
        it != group->textfields.end(); ++it) {
-    output->insert(std::make_pair(it->first, it->second->text()));
+    output->insert(std::make_pair(it->first->type, it->second->text()));
   }
   for (ComboboxMap::const_iterator it = group->comboboxes.begin();
        it != group->comboboxes.end(); ++it) {
-    output->insert(std::make_pair(it->first,
+    output->insert(std::make_pair(it->first->type,
         it->second->model()->GetItemAt(it->second->selected_index())));
   }
 }
 
 base::string16 AutofillDialogViews::GetCvc() {
   return GroupForSection(GetCreditCardSection())->suggested_info->
       decorated_textfield()->text();
 }
 
 bool AutofillDialogViews::HitTestInput(const DetailInput& input,
@@ skipping 829 matching lines @@
       }
     }
   }
 }
 
 bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
                                         ValidationType validation_type) {
   DCHECK(group.container->visible());
 
   scoped_ptr<DetailInput> cvc_input;
-  DetailOutputMap detail_outputs;
+  FieldValueMap detail_outputs;
 
   if (group.manual_input->visible()) {
     for (TextfieldMap::const_iterator iter = group.textfields.begin();
          iter != group.textfields.end(); ++iter) {
       if (!iter->second->editable())
         continue;
 
-      detail_outputs[iter->first] = iter->second->text();
+      detail_outputs[iter->first->type] = iter->second->text();
     }
     for (ComboboxMap::const_iterator iter = group.comboboxes.begin();
          iter != group.comboboxes.end(); ++iter) {
       if (!iter->second->enabled())
         continue;
 
       views::Combobox* combobox = iter->second;
       base::string16 item =
           combobox->model()->GetItemAt(combobox->selected_index());
-      detail_outputs[iter->first] = item;
+      detail_outputs[iter->first->type] = item;
     }
   } else if (group.section == GetCreditCardSection()) {
     DecoratedTextfield* decorated_cvc =
         group.suggested_info->decorated_textfield();
     if (decorated_cvc->visible()) {
       cvc_input.reset(new DetailInput);
       cvc_input->type = CREDIT_CARD_VERIFICATION_CODE;
-      detail_outputs[cvc_input.get()] = decorated_cvc->text();
+      detail_outputs[cvc_input->type] = decorated_cvc->text();
     }
   }
 
   ValidityMessages validity = delegate_->InputsAreValid(group.section,
                                                         detail_outputs);
   MarkInputsInvalid(group.section, validity, validation_type == VALIDATE_FINAL);
 
   // If there are any validation errors, sure or unsure, the group is invalid.
   return !validity.HasErrors();
 }
@@ skipping 152 matching lines @@
 
   return NULL;
 }
 
 void AutofillDialogViews::DetailsContainerBoundsChanged() {
   if (error_bubble_)
     error_bubble_->UpdatePosition();
 }
 
 void AutofillDialogViews::SetIconsForSection(DialogSection section) {
-  DetailOutputMap user_input;
+  FieldValueMap user_input;
   GetUserInput(section, &user_input);
-  FieldValueMap field_values;
-  for (DetailOutputMap::const_iterator user_input_it = user_input.begin();
-       user_input_it != user_input.end();
-       ++user_input_it) {
-    const DetailInput* field_detail = user_input_it->first;
-    const string16& field_value = user_input_it->second;
-    field_values[field_detail->type] = field_value;
-  }
-  FieldIconMap field_icons = delegate_->IconsForFields(field_values);
+  FieldIconMap field_icons = delegate_->IconsForFields(user_input);
   TextfieldMap* textfields = &GroupForSection(section)->textfields;
   for (TextfieldMap::const_iterator textfield_it = textfields->begin();
        textfield_it != textfields->end();
        ++textfield_it) {
     ServerFieldType field_type = textfield_it->first->type;
     FieldIconMap::const_iterator field_icon_it = field_icons.find(field_type);
     DecoratedTextfield* textfield = textfield_it->second;
     if (field_icon_it != field_icons.end())
       textfield->SetIcon(field_icon_it->second);
     else
@@ skipping 29 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