Reland r38570. The underlying bug has been fix.

Move conditions of FormField creation to FormFieldHistoryManager; AutoFill does not have the same conditions. This required manipulating the FormField data structure to add necessary field data.

TBR=tony
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/603015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38711 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h
index 9711c38..dfaf9ce 100644
--- a/webkit/glue/form_field.h
+++ b/webkit/glue/form_field.h
@@ -6,6 +6,7 @@
 #define WEBKIT_GLUE_FORM_FIELD_H_
 
 #include "base/string16.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 
 namespace webkit_glue {
 
@@ -13,23 +14,27 @@ namespace webkit_glue {
 class FormField {
  public:
   FormField();
+  explicit FormField(const WebKit::WebInputElement& input_element);
   FormField(const string16& label,
             const string16& name,
-            const string16& html_input_type,
-            const string16& value);
+            const string16& value,
+            const string16& form_control_type,
+            WebKit::WebInputElement::InputType input_type);
 
   string16 label() const { return label_; }
   string16 name() const { return name_; }
-  string16 html_input_type() const { return html_input_type_; }
   string16 value() const { return value_; }
+  string16 form_control_type() const { return form_control_type_; }
+  WebKit::WebInputElement::InputType input_type() const { return input_type_; }
 
   void set_value(const string16& value) { value_ = value; }
 
  private:
   string16 label_;
   string16 name_;
-  string16 html_input_type_;
   string16 value_;
+  string16 form_control_type_;
+  WebKit::WebInputElement::InputType input_type_;
 };
 
 }  // namespace webkit_glue