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

chrome/browser/ui/cocoa/autofill/autofill_section_container.mm

 // Copyright (c) 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 54 matching lines @@
     *line1 = text.substr(0, position);
     *line2 = text.substr(position + line_return.length());
   }
 }
 
 // If the Autofill data comes from a credit card, make sure to overwrite the
 // CC comboboxes (even if they already have something in them). If the
 // Autofill data comes from an AutofillProfile, leave the comboboxes alone.
 // TODO(groby): This kind of logic should _really_ live on the delegate.
 bool ShouldOverwriteComboboxes(autofill::DialogSection section,
-                               autofill::AutofillFieldType type) {
+                               autofill::ServerFieldType type) {
   if (autofill::AutofillType(type).group() != autofill::CREDIT_CARD) {
     return false;
   }
 
   if (section == autofill::SECTION_CC) {
     return true;
   }
 
   return section == autofill::SECTION_CC_BILLING;
 }
 
 bool CompareInputRows(const autofill::DetailInput* input1,
                       const autofill::DetailInput* input2) {
   // Row ID -1 is sorted to the end of rows.
   if (input2->row_id == -1)
     return false;
   return input2->row_id < input1->row_id;
 }
 
 }
 
 @interface AutofillSectionContainer ()
 
 // A text field has been edited or activated - inform the delegate that it's
 // time to show a suggestion popup & possibly reset the validity of the input.
 - (void)textfieldEditedOrActivated:(NSControl<AutofillInputField>*)field
                             edited:(BOOL)edited;
 
 // Convenience method to retrieve a field type via the control's tag.
-- (autofill::AutofillFieldType)fieldTypeForControl:(NSControl*)control;
+- (autofill::ServerFieldType)fieldTypeForControl:(NSControl*)control;
 
 // Find the DetailInput* associated with a field type.
 - (const autofill::DetailInput*)detailInputForType:
-    (autofill::AutofillFieldType)type;
+    (autofill::ServerFieldType)type;
 
 // Takes an NSArray of controls and builds a DetailOutputMap from them.
 // Translates between Cocoa code and delegate, essentially.
 // All controls must inherit from NSControl and conform to AutofillInputView.
 - (void)fillDetailOutputs:(autofill::DetailOutputMap*)outputs
              fromControls:(NSArray*)controls;
 
 // Updates input fields based on delegate status. If |shouldClobber| is YES,
 // will clobber existing data and reset fields to the initial values.
 - (void)updateAndClobber:(BOOL)shouldClobber;
@@ skipping 196 matching lines @@
   // Make sure to overwrite the originating input if it is a text field.
   AutofillTextField* field =
       base::mac::ObjCCast<AutofillTextField>([inputs_ viewWithTag:input.type]);
   [field setFieldValue:@""];
 
   if (ShouldOverwriteComboboxes(section_, input.type)) {
     for (NSControl* control in [inputs_ subviews]) {
       AutofillPopUpButton* popup =
           base::mac::ObjCCast<AutofillPopUpButton>(control);
       if (popup) {
-        autofill::AutofillFieldType fieldType =
+        autofill::ServerFieldType fieldType =
             [self fieldTypeForControl:popup];
         if (autofill::AutofillType(fieldType).group() ==
                 autofill::CREDIT_CARD) {
           ui::ComboboxModel* model =
               delegate_->ComboboxModelForAutofillType(fieldType);
           DCHECK(model);
           [popup selectItemAtIndex:model->GetDefaultIndex()];
         }
       }
     }
@@ skipping 19 matching lines @@
   } else if (section_ == autofill::SECTION_CC) {
     fields = @[[suggestContainer_ inputField]];
   }
 
   autofill::DetailOutputMap detailOutputs;
   [self fillDetailOutputs:&detailOutputs fromControls:fields];
   autofill::ValidityData invalidInputs = delegate_->InputsAreValid(
       section_, detailOutputs, validationType);
 
   for (NSControl<AutofillInputField>* input in fields) {
-    const autofill::AutofillFieldType type = [self fieldTypeForControl:input];
+    const autofill::ServerFieldType type = [self fieldTypeForControl:input];
     if (invalidInputs.count(type))
       [input setValidityMessage:base::SysUTF16ToNSString(invalidInputs[type])];
     else
       [input setValidityMessage:@""];
     [validationDelegate_ updateMessageForField:input];
   }
 
   return invalidInputs.empty();
 }
 
 #pragma mark Internal API for AutofillSectionContainer.
 
 - (void)textfieldEditedOrActivated:(NSControl<AutofillInputField>*)field
                             edited:(BOOL)edited {
   AutofillTextField* textfield =
       base::mac::ObjCCastStrict<AutofillTextField>(field);
 
   // This only applies to textfields.
   if (!textfield)
     return;
 
-  autofill::AutofillFieldType type = [self fieldTypeForControl:field];
+  autofill::ServerFieldType type = [self fieldTypeForControl:field];
   string16 fieldValue = base::SysNSStringToUTF16([textfield fieldValue]);
 
   // Get the frame rectangle for the designated field, in screen coordinates.
   NSRect textFrameInScreen = [field convertRect:[field frame] toView:nil];
   textFrameInScreen.origin =
       [[field window] convertBaseToScreen:textFrameInScreen.origin];
 
   // And adjust for gfx::Rect being flipped compared to OSX coordinates.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   textFrameInScreen.origin.y =
@@ skipping 25 matching lines @@
       [self validateFor:autofill::VALIDATE_EDIT];
   }
 
   // Update the icon for the textfield.
   gfx::Image icon = delegate_->IconForField(type, fieldValue);
   if (!icon.IsEmpty()) {
     [[textfield cell] setIcon:icon.ToNSImage()];
   }
 }
 
-- (autofill::AutofillFieldType)fieldTypeForControl:(NSControl*)control {
+- (autofill::ServerFieldType)fieldTypeForControl:(NSControl*)control {
   DCHECK([control tag]);
-  return static_cast<autofill::AutofillFieldType>([control tag]);
+  return static_cast<autofill::ServerFieldType>([control tag]);
 }
 
 - (const autofill::DetailInput*)detailInputForType:
-    (autofill::AutofillFieldType)type {
+    (autofill::ServerFieldType)type {
   for (size_t i = 0; i < detailInputs_.size(); ++i) {
     if (detailInputs_[i]->type == type)
       return detailInputs_[i];
   }
   // TODO(groby): Needs to be NOTREACHED. Can't, due to the fact that tests
   // blindly call setFieldValue:forInput:, even for non-existing inputs.
   return NULL;
 }
 
 - (void)fillDetailOutputs:(autofill::DetailOutputMap*)outputs
              fromControls:(NSArray*)controls {
   for (NSControl<AutofillInputField>* input in controls) {
     DCHECK([input isKindOfClass:[NSControl class]]);
     DCHECK([input conformsToProtocol:@protocol(AutofillInputField)]);
-    autofill::AutofillFieldType fieldType = [self fieldTypeForControl:input];
+    autofill::ServerFieldType fieldType = [self fieldTypeForControl:input];
     DCHECK([self detailInputForType:fieldType]);
     NSString* value = [input fieldValue];
     outputs->insert(std::make_pair([self detailInputForType:fieldType],
                                    base::SysNSStringToUTF16(value)));
   }
 }
 
 - (NSTextField*)makeDetailSectionLabel:(NSString*)labelText {
   base::scoped_nsobject<NSTextField> label([[NSTextField alloc] init]);
   [label setFont:
@@ skipping 131 matching lines @@
   }
 
   return view.autorelease();
 }
 
 @end
 
 
 @implementation AutofillSectionContainer (ForTesting)
 
-- (NSControl*)getField:(autofill::AutofillFieldType)type {
+- (NSControl*)getField:(autofill::ServerFieldType)type {
   return [inputs_ viewWithTag:type];
 }
 
 - (void)setFieldValue:(NSString*)text
              forInput:(const autofill::DetailInput&)input {
   if ([self detailInputForType:input.type] != &input)
     return;
 
   NSControl<AutofillInputField>* field = [inputs_ viewWithTag:input.type];
   [field setFieldValue:text];
 }
 
 - (void)setSuggestionFieldValue:(NSString*)text {
   [[suggestContainer_ inputField] setFieldValue:text];
 }
 
 - (void)activateFieldForInput:(const autofill::DetailInput&)input {
   if ([self detailInputForType:input.type] != &input)
     return;
 
   NSControl<AutofillInputField>* field = [inputs_ viewWithTag:input.type];
   [[field window] makeFirstResponder:field];
 }
 
 @end