Chrome-side implementation of AutocompleteErrorEvent#reason.

chrome/renderer/autofill/autofill_agent.cc

 // Copyright (c) 2012 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/autofill/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 142 matching lines @@
     IPC_MESSAGE_HANDLER(AutofillMsg_SetAutofillActionPreview,
                         OnSetAutofillActionPreview)
     IPC_MESSAGE_HANDLER(AutofillMsg_ClearPreviewedForm,
                         OnClearPreviewedForm)
     IPC_MESSAGE_HANDLER(AutofillMsg_SetNodeText,
                         OnSetNodeText)
     IPC_MESSAGE_HANDLER(AutofillMsg_AcceptDataListSuggestion,
                         OnAcceptDataListSuggestion)
     IPC_MESSAGE_HANDLER(AutofillMsg_AcceptPasswordAutofillSuggestion,
                         OnAcceptPasswordAutofillSuggestion)
-    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteSuccess,
-                        OnRequestAutocompleteSuccess)
-    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteError,
-                        OnRequestAutocompleteError)
+    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteResult,
+                        OnRequestAutocompleteResult)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void AutofillAgent::DidFinishDocumentLoad(WebFrame* frame) {
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
   std::vector<FormData> forms;
   form_cache_.ExtractForms(*frame, &forms);
@@ skipping 42 matching lines @@
                                            const WebFormElement& form) {
   FormData form_data;
   if (!in_flight_request_form_.isNull() ||
       !WebFormElementToFormData(form,
                                 WebFormControlElement(),
                                 REQUIRE_AUTOCOMPLETE,
                                 EXTRACT_OPTIONS,
                                 &form_data,
                                 NULL)) {
     WebFormElement(form).finishRequestAutocomplete(
-        WebFormElement::AutocompleteResultError);
+        WebFormElement::AutocompleteResultErrorDisabled);
     return;
   }
 
   // Cancel any pending Autofill requests and hide any currently showing popups.
   ++autofill_query_id_;
   HidePopups();
 
   in_flight_request_form_ = form;
   Send(new AutofillHostMsg_RequestAutocomplete(
       routing_id(),
@@ skipping 355 matching lines @@
 void AutofillAgent::OnAcceptPasswordAutofillSuggestion(const string16& value) {
   // We need to make sure this is handled here because the browser process
   // skipped it handling because it believed it would be handled here. If it
   // isn't handled here then the browser logic needs to be updated.
   bool handled = password_autofill_manager_->DidAcceptAutofillSuggestion(
       element_,
       value);
   DCHECK(handled);
 }
 
-void AutofillAgent::FinishAutocompleteRequest(
-    WebFormElement::AutocompleteResult result) {
+void AutofillAgent::OnRequestAutocompleteResult(
+    WebFormElement::AutocompleteResult result, const FormData& form_data) {
   DCHECK(!in_flight_request_form_.isNull());
+  if (result == WebFormElement::AutocompleteResultSuccess)
+    FillFormIncludingNonFocusableElements(form_data, in_flight_request_form_);
   in_flight_request_form_.finishRequestAutocomplete(result);
   in_flight_request_form_.reset();
 }
 
-void AutofillAgent::OnRequestAutocompleteSuccess(const FormData& form_data) {
-  FillFormIncludingNonFocusableElements(form_data, in_flight_request_form_);
-  FinishAutocompleteRequest(WebFormElement::AutocompleteResultSuccess);
-}
-
-void AutofillAgent::OnRequestAutocompleteError() {
-  FinishAutocompleteRequest(WebFormElement::AutocompleteResultError);
-}
-
 void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
                                     bool display_warning_if_disabled) {
   if (!element.isEnabled() || element.isReadOnly() || !element.isTextField() ||
       element.isPasswordField() || !element.suggestedValue().isEmpty())
     return;
 
   // Don't attempt to autofill with values that are too large or if filling
   // criteria are not met.
@@ skipping 123 matching lines @@
     web_view->hidePopups();
 
   HideHostPopups();
 }
 
 void AutofillAgent::HideHostPopups() {
   Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
 }
 
 }  // namespace autofill