Move autofill related WebView{Delegate} methods into the WebKit API....

webkit/glue/editor_client_impl.cc

 // Copyright (c) 2006-2008 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.
 
 // The Mac interface forwards most of these commands to the application layer,
 // and I'm not really sure what to do about most of them.
 
 #include "config.h"
 
 #include "Document.h"
@@ skipping 653 matching lines @@
   if (!input_element)
     return;
 
   WebFrameImpl* webframe =
       WebFrameImpl::FromFrame(input_element->document()->frame());
   webkit_glue::PasswordAutocompleteListener* listener =
       webframe->GetPasswordListener(input_element);
   if (!listener)
     return;
 
-  std::wstring value =
-      webkit_glue::StringToStdWString(input_element->value());
+  string16 value =
+      webkit_glue::StringToString16(input_element->value());
   listener->OnBlur(input_element, value);
 }
 
 void EditorClientImpl::textDidChangeInTextField(WebCore::Element* element) {
   DCHECK(element->hasLocalName(WebCore::HTMLNames::inputTag));
   // Note that we only show the autofill popup in this case if the caret is at
   // the end.  This matches FireFox and Safari but not IE.
   Autofill(static_cast<WebCore::HTMLInputElement*>(element),
            false, false, true);
 }
@@ skipping 13 matching lines @@
   // Cancel any pending DoAutofill call.
   autofill_args_.clear();
   autofill_timer_.stop();
 
   // Let's try to trigger autofill for that field, if applicable.
   if (!input_element->isEnabledFormControl() || !input_element->isTextField() ||
       input_element->isPasswordField() || !input_element->autoComplete()) {
     return false;
   }
 
-  std::wstring name = AutofillForm::GetNameForInputElement(input_element);
+  string16 name = AutofillForm::GetNameForInputElement(input_element);
   if (name.empty())  // If the field has no name, then we won't have values.
     return false;
 
   // Don't attempt to autofill with values that are too large.
   if (input_element->value().length() > kMaximumTextSizeForAutofill)
     return false;
 
   autofill_args_ = new AutofillArgs();
   autofill_args_->input_element = input_element;
   autofill_args_->autofill_form_only = autofill_form_only;
   autofill_args_->autofill_on_empty_value = autofill_on_empty_value;
   autofill_args_->require_caret_at_end = require_caret_at_end;
   autofill_args_->backspace_or_delete_pressed = backspace_or_delete_pressed_;
 
   if (!require_caret_at_end) {
     DoAutofill(NULL);
   } else {
     // We post a task for doing the autofill as the caret position is not set
     // properly at this point (http://bugs.webkit.org/show_bug.cgi?id=16976)
     // and we need it to determine whether or not to trigger autofill.
     autofill_timer_.startOneShot(0.0);
   }
   return true;
 }
 
 void EditorClientImpl::DoAutofill(WebCore::Timer<EditorClientImpl>* timer) {
   OwnPtr<AutofillArgs> args(autofill_args_.release());
   WebCore::HTMLInputElement* input_element = args->input_element.get();
 
-  std::wstring value = webkit_glue::StringToStdWString(input_element->value());
+  string16 value = webkit_glue::StringToString16(input_element->value());
 
   // Enforce autofill_on_empty_value and caret_at_end.
   bool is_caret_at_end = args->require_caret_at_end ?
       input_element->selectionStart() == input_element->selectionEnd() &&
       input_element->selectionEnd() == static_cast<int>(value.length()) :
       true;  // When |require_caret_at_end| is false, just pretend we are at
              // the end.
   if ((!args->autofill_on_empty_value && value.empty()) || !is_caret_at_end) {
     webview_->HideAutoCompletePopup();
     return;
   }
 
   // First let's see if there is a password listener for that element.
   // We won't trigger form autofill in that case, as having both behavior on
   // a node would be confusing.
   WebFrameImpl* webframe =
       WebFrameImpl::FromFrame(input_element->document()->frame());
   webkit_glue::PasswordAutocompleteListener* listener =
       webframe->GetPasswordListener(input_element);
   if (listener) {
     if (args->autofill_form_only)
       return;
 
     listener->OnInlineAutocompleteNeeded(
         input_element, value, args->backspace_or_delete_pressed, true);
     return;
   }
 
   // Then trigger form autofill.
-  std::wstring name = AutofillForm::GetNameForInputElement(input_element);
+  string16 name = AutofillForm::GetNameForInputElement(input_element);
   ASSERT(static_cast<int>(name.length()) > 0);
 
-  if (webview_->delegate())
-    webview_->delegate()->QueryFormFieldAutofill(name, value,
-        reinterpret_cast<int64>(input_element));
+  if (webview_->client()) {
+    webview_->client()->queryAutofillSuggestions(
+        webkit_glue::NodeToWebNode(input_element), name, value);
+  }
 }
 
 void EditorClientImpl::CancelPendingAutofill() {
   autofill_args_.clear();
   autofill_timer_.stop();
 }
 
 void EditorClientImpl::OnAutofillSuggestionAccepted(
     WebCore::HTMLInputElement* text_field) {
   WebFrameImpl* webframe =
       WebFrameImpl::FromFrame(text_field->document()->frame());
   webkit_glue::PasswordAutocompleteListener* listener =
       webframe->GetPasswordListener(text_field);
-  std::wstring value = webkit_glue::StringToStdWString(text_field->value());
+  string16 value = webkit_glue::StringToString16(text_field->value());
   // Password listeners need to autocomplete other fields that depend on the
   // input element with autofill suggestions.
   if (listener)
     listener->OnInlineAutocompleteNeeded(text_field, value, false, false);
 }
 
 bool EditorClientImpl::doTextFieldCommandFromEvent(
     WebCore::Element* element,
     WebCore::KeyboardEvent* event) {
   // Remember if backspace was pressed for the autofill.  It is not clear how to
@@ skipping 101 matching lines @@
 
 void EditorClientImpl::getGuessesForWord(const WebCore::String&,
                                          WTF::Vector<WebCore::String>& guesses) {
   NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::setInputMethodState(bool enabled) {
   if (webview_->client())
     webview_->client()->setInputMethodEnabled(enabled);
 }