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

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 205 matching lines @@
       last_indexed_page_id_(-1),
       opened_by_user_gesture_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       devtools_agent_(NULL),
       devtools_client_(NULL),
       file_chooser_completion_(NULL),
       history_back_list_count_(0),
       history_forward_list_count_(0),
       has_unload_listener_(false),
       decrement_shared_popup_at_destruction_(false),
-      form_field_autofill_request_id_(0),
-      form_field_autofill_node_id_(0),
+      autofill_query_id_(0),
       popup_notification_visible_(false),
       spelling_panel_visible_(false),
       delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync),
       preferred_width_(0),
       send_preferred_width_changes_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           notification_provider_(new NotificationProvider(this))),
       determine_page_text_after_loading_stops_(false),
       view_type_(ViewType::INVALID),
       browser_window_id_(-1),
@@ skipping 988 matching lines @@
       routing_id_, message, default_value, frame_url, type, &success, result));
   return success;
 }
 
 void RenderView::AddGURLSearchProvider(const GURL& osd_url, bool autodetected) {
   if (!osd_url.is_empty())
     Send(new ViewHostMsg_PageHasOSDD(routing_id_, page_id_, osd_url,
                                      autodetected));
 }
 
-void RenderView::QueryFormFieldAutofill(const std::wstring& field_name,
-                                        const std::wstring& text,
-                                        int64 node_id) {
-  static int message_id_counter = 0;
-  form_field_autofill_request_id_ = message_id_counter++;
-  form_field_autofill_node_id_ = node_id;
-  Send(new ViewHostMsg_QueryFormFieldAutofill(
-      routing_id_, form_field_autofill_request_id_, field_name, text));
-}
-
-void RenderView::RemoveStoredAutofillEntry(const std::wstring& name,
-                                           const std::wstring& value) {
-  Send(new ViewHostMsg_RemoveAutofillEntry(routing_id_, name, value));
-}
-
 void RenderView::OnQueryFormFieldAutofillAck(
-    int request_id,
-    const std::vector<std::wstring>& suggestions,
+    int query_id,
+    const std::vector<string16>& suggestions,
     int default_suggestion_index) {
-  if (!webview() || request_id != form_field_autofill_request_id_)
-    return;
-
-  webview()->AutofillSuggestionsForNode(
-      form_field_autofill_node_id_, suggestions, default_suggestion_index);
+  if (webview() && query_id == autofill_query_id_ && !suggestions.empty()) {
+    webview()->applyAutofillSuggestions(
+        autofill_query_node_, suggestions, default_suggestion_index);
+  }
+  autofill_query_node_.reset();
 }
 
 void RenderView::OnPopupNotificationVisibilityChanged(bool visible) {
   popup_notification_visible_ = visible;
 }
 
 uint32 RenderView::GetCPBrowsingContext() {
   uint32 context = 0;
   Send(new ViewHostMsg_GetCPBrowsingContext(&context));
   return context;
@@ skipping 439 matching lines @@
 
   history_back_list_count_++;
   history_forward_list_count_ = 0;
 }
 
 void RenderView::didUpdateInspectorSettings() {
   Send(new ViewHostMsg_UpdateInspectorSettings(
       routing_id_, webview()->inspectorSettings().utf8()));
 }
 
+void RenderView::queryAutofillSuggestions(const WebNode& node,
+                                          const WebString& name,
+                                          const WebString& value) {
+  static int query_counter = 0;
+  autofill_query_id_ = query_counter++;
+  autofill_query_node_ = node;
+  Send(new ViewHostMsg_QueryFormFieldAutofill(
+      routing_id_, autofill_query_id_, name, value));
+}
+
+void RenderView::removeAutofillSuggestions(const WebString& name,
+                                           const WebString& value) {
+  Send(new ViewHostMsg_RemoveAutofillEntry(routing_id_, name, value));
+}
+
 // WebKit::WebWidgetClient ----------------------------------------------------
 
 // We are supposed to get a single call to Show for a newly created RenderView
 // that was created via RenderView::CreateWebView.  So, we wait until this
 // point to dispatch the ShowView message.
 //
 // This method provides us with the information about how to display the newly
 // created RenderView (i.e., as a constrained popup or as a new tab).
 //
 void RenderView::show(WebNavigationPolicy policy) {
@@ skipping 1550 matching lines @@
     NavigationState* navigation_state =
         NavigationState::FromDataSource(frame->dataSource());
     html_to_load = &navigation_state->postponed_data();
   }
   LoadNavigationErrorPage(
       frame, WebURLRequest(), original_error, *html_to_load, true);
 }
 
 void RenderView::OnMoveOrResizeStarted() {
   if (webview())
-    webview()->HideAutofillPopup();
+    webview()->hideAutofillPopup();
 }
 
 void RenderView::OnResize(const gfx::Size& new_size,
                           const gfx::Rect& resizer_rect) {
   if (webview())
-    webview()->HideAutofillPopup();
+    webview()->hideAutofillPopup();
   RenderWidget::OnResize(new_size, resizer_rect);
 }
 
 void RenderView::OnClearFocusedNode() {
   if (webview())
     webview()->clearFocusedNode();
 }
 
 void RenderView::OnSetBackground(const SkBitmap& background) {
   if (webview())
@@ skipping 343 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }