Don't store the submit element on the FormData structure as it's no longer used.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/661413

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

4 files changed, 2 insertions, 14 deletions

diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 8599ad0..38d233c 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1553,7 +1553,6 @@ struct ParamTraits<FormData> {
     WriteParam(m, p.labels);
     WriteParam(m, p.elements);
     WriteParam(m, p.values);
-    WriteParam(m, p.submit);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
@@ -1562,8 +1561,7 @@ struct ParamTraits<FormData> {
       ReadParam(m, iter, &p->action) &&
       ReadParam(m, iter, &p->labels) &&
       ReadParam(m, iter, &p->elements) &&
-      ReadParam(m, iter, &p->values) &&
-      ReadParam(m, iter, &p->submit);
+      ReadParam(m, iter, &p->values);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<FormData>");
diff --git a/chrome/renderer/form_manager.cc b/chrome/renderer/form_manager.cc
index 9731e7a..31e65d1 100644
--- a/chrome/renderer/form_manager.cc
+++ b/chrome/renderer/form_manager.cc
@@ -186,12 +186,6 @@ void FormManager::FormElementToFormData(WebFrame* frame,
     form->labels.push_back(LabelForElement(input_element));
     form->elements.push_back(input_element.nameForAutofill());
     form->values.push_back(input_element.value());
-
-    // TODO(jhawkins): It's possible for a form to have more than one submit
-    // input element.  The FormData structure probably doesn't need to keep
-    // track of the name of any submit button.
-    if (input_element.inputType() == WebInputElement::Submit)
-      form->submit = input_element.nameForAutofill();
   }
 }
 
diff --git a/webkit/glue/form_data.h b/webkit/glue/form_data.h
index f1a7911..aab222e 100644
--- a/webkit/glue/form_data.h
+++ b/webkit/glue/form_data.h
@@ -23,8 +23,6 @@ struct FormData {
   std::vector<string16> elements;
   // A vector of element values.
   std::vector<string16> values;
-  // The name of the submit button to be used to submit (optional).
-  string16 submit;
 };
 
 #endif  // WEBKIT_GLUE_FORM_DATA_H__
diff --git a/webkit/glue/password_form_dom_manager.cc b/webkit/glue/password_form_dom_manager.cc
index 0ec4a71..e46560c 100644
--- a/webkit/glue/password_form_dom_manager.cc
+++ b/webkit/glue/password_form_dom_manager.cc
@@ -13,8 +13,7 @@ using WebKit::WebPasswordFormData;
 namespace webkit_glue {
 
 PasswordForm* PasswordFormDomManager::CreatePasswordForm(
-    const WebFormElement& webform)
-{
+    const WebFormElement& webform) {
   WebPasswordFormData web_password_form(webform);
   if (web_password_form.isValid())
     return new PasswordForm(web_password_form);
@@ -36,7 +35,6 @@ void PasswordFormDomManager::InitFillData(
   result->basic_data.values.push_back(preferred_match->username_value);
   result->basic_data.elements.push_back(form_on_page.password_element);
   result->basic_data.values.push_back(preferred_match->password_value);
-  result->basic_data.submit = form_on_page.submit_element;
   result->wait_for_username = wait_for_username_before_autofill;
 
   // Copy additional username/value pairs.