Move PasswordAutocompleteListener into the WebKit API (AGAIN)

Copy of: http://codereview.chromium.org/360013/show
Head to create as new patch due to messy merge.

Review URL: http://codereview.chromium.org/376017

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

2 files changed, 8 insertions, 8 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 7bd76e0..e325e34 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -73,7 +73,7 @@
 #include "webkit/api/public/WebDataSource.h"
 #include "webkit/api/public/WebDevToolsAgent.h"
 #include "webkit/api/public/WebDragData.h"
-#include "webkit/api/public/WebForm.h"
+#include "webkit/api/public/WebFormElement.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebHistoryItem.h"
 #include "webkit/api/public/WebNode.h"
@@ -134,7 +134,7 @@ using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebEditingAction;
 using WebKit::WebFindOptions;
-using WebKit::WebForm;
+using WebKit::WebFormElement;
 using WebKit::WebFrame;
 using WebKit::WebHistoryItem;
 using WebKit::WebMediaPlayer;
@@ -2024,7 +2024,7 @@ void RenderView::unableToImplementPolicyWithError(
   NOTREACHED();  // Since we said we can handle all requests.
 }
 
-void RenderView::willSubmitForm(WebFrame* frame, const WebForm& form) {
+void RenderView::willSubmitForm(WebFrame* frame, const WebFormElement& form) {
   NavigationState* navigation_state =
       NavigationState::FromDataSource(frame->provisionalDataSource());
 
@@ -2039,7 +2039,7 @@ void RenderView::willSubmitForm(WebFrame* frame, const WebForm& form) {
   navigation_state->set_password_form_data(
       PasswordFormDomManager::CreatePasswordForm(form));
 
-  if (form.isAutoCompleteEnabled()) {
+  if (form.autoComplete()) {
     scoped_ptr<FormFieldValues> form_values(FormFieldValues::Create(form));
     if (form_values.get())
       Send(new ViewHostMsg_FormFieldValuesSubmitted(routing_id_,
@@ -3724,15 +3724,15 @@ void RenderView::focusAccessibilityObject(
 }
 
 void RenderView::SendPasswordForms(WebFrame* frame) {
-  WebVector<WebForm> forms;
+  WebVector<WebFormElement> forms;
   frame->forms(forms);
 
   std::vector<PasswordForm> password_forms;
   for (size_t i = 0; i < forms.size(); ++i) {
-    const WebForm& form = forms[i];
+    const WebFormElement& form = forms[i];
 
     // Respect autocomplete=off.
-    if (form.isAutoCompleteEnabled()) {
+    if (form.autoComplete()) {
       scoped_ptr<PasswordForm> password_form(
           PasswordFormDomManager::CreatePasswordForm(form));
       if (password_form.get())
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index ca199de..53d7e95 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -283,7 +283,7 @@ class RenderView : public RenderWidget,
   virtual void unableToImplementPolicyWithError(
       WebKit::WebFrame* frame, const WebKit::WebURLError& error);
   virtual void willSubmitForm(WebKit::WebFrame* frame,
-      const WebKit::WebForm& form);
+      const WebKit::WebFormElement& form);
   virtual void willPerformClientRedirect(
       WebKit::WebFrame* frame, const WebKit::WebURL& from,
       const WebKit::WebURL& to, double interval, double fire_time);