[Autofill] Distinguish between native field types and potentially HTML field types.

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/strings/utf_string_conversions.h"
@@ skipping 2004 matching lines @@
     view->ScrollRectToVisible(view->GetLocalBounds());
     error_bubble_.reset(new ErrorBubble(view, error_message->second));
   }
 }
 
 void AutofillDialogViews::MarkInputsInvalid(DialogSection section,
                                             const ValidityData& validity_data) {
   DetailsGroup* group = GroupForSection(section);
   DCHECK(group->container->visible());
 
-  typedef std::map<AutofillFieldType,
+  typedef std::map<ServerFieldType,
       base::Callback<void(const base::string16&)> > FieldMap;
   FieldMap field_map;
 
   if (group->manual_input->visible()) {
     for (TextfieldMap::const_iterator iter = group->textfields.begin();
          iter != group->textfields.end(); ++iter) {
       field_map[iter->first->type] = base::Bind(
           &AutofillDialogViews::SetValidityForInput<DecoratedTextfield>,
           base::Unretained(this),
           iter->second);
@@ skipping 96 matching lines @@
 
   return all_valid;
 }
 
 void AutofillDialogViews::TextfieldEditedOrActivated(
     views::Textfield* textfield,
     bool was_edit) {
   DetailsGroup* group = GroupForView(textfield);
   DCHECK(group);
 
-  // Figure out the AutofillFieldType this textfield represents.
-  AutofillFieldType type = UNKNOWN_TYPE;
+  // Figure out the ServerFieldType this textfield represents.
+  ServerFieldType type = UNKNOWN_TYPE;
   DecoratedTextfield* decorated = NULL;
 
   // Look for the input in the manual inputs.
   for (TextfieldMap::const_iterator iter = group->textfields.begin();
        iter != group->textfields.end();
        ++iter) {
     decorated = iter->second;
     if (decorated == textfield) {
       delegate_->UserEditedOrActivatedInput(group->section,
                                               iter->first,
@@ skipping 117 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