Add Password Autofill Manager to New Autofill

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/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 68 matching lines @@
     IPC_MESSAGE_HANDLER(AutofillMsg_SetAutofillActionFill,
                         OnSetAutofillActionFill)
     IPC_MESSAGE_HANDLER(AutofillMsg_ClearForm,
                         OnClearForm)
     IPC_MESSAGE_HANDLER(AutofillMsg_SetAutofillActionPreview,
                         OnSetAutofillActionPreview)
     IPC_MESSAGE_HANDLER(AutofillMsg_ClearPreviewedForm,
                         OnClearPreviewedForm)
     IPC_MESSAGE_HANDLER(AutofillMsg_SetNodeText,
                         OnSetNodeText)
+    IPC_MESSAGE_HANDLER(AutofillMsg_AcceptPasswordAutofillSuggestion,
+                        OnAcceptPasswordAutofillSuggestion)
     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<webkit::forms::FormData> forms;
   form_cache_.ExtractForms(*frame, &forms);
@@ skipping 124 matching lines @@
   // properly at this point (http://bugs.webkit.org/show_bug.cgi?id=16976) and
   // it is needed to trigger autofill.
   weak_ptr_factory_.InvalidateWeakPtrs();
   MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&AutofillAgent::TextFieldDidChangeImpl,
                    weak_ptr_factory_.GetWeakPtr(), element));
 }
 
 void AutofillAgent::TextFieldDidChangeImpl(const WebInputElement& element) {
-  if (password_autofill_manager_->TextDidChangeInTextField(element))
+  if (password_autofill_manager_->TextDidChangeInTextField(element)) {
+    autofill_query_element_ = element;
     return;
+  }
 
   ShowSuggestions(element, false, true, false);
 
   webkit::forms::FormData form;
   webkit::forms::FormField field;
   if (FindFormAndFieldForInputElement(element, &form, &field, REQUIRE_NONE)) {
     Send(new AutofillHostMsg_TextFieldDidChange(routing_id(), form, field,
                                                 base::TimeTicks::Now()));
   }
 }
 
 void AutofillAgent::textFieldDidReceiveKeyDown(const WebInputElement& element,
                                                const WebKeyboardEvent& event) {
-  if (password_autofill_manager_->TextFieldHandlingKeyDown(element, event))
+  if (password_autofill_manager_->TextFieldHandlingKeyDown(element, event)) {
+    autofill_query_element_ = element;
     return;
+  }
 
   if (event.windowsKeyCode == ui::VKEY_DOWN ||
       event.windowsKeyCode == ui::VKEY_UP)
     ShowSuggestions(element, true, true, true);
 }
 
 void AutofillAgent::OnSuggestionsReturned(int query_id,
                                           const std::vector<string16>& values,
                                           const std::vector<string16>& labels,
                                           const std::vector<string16>& icons,
@@ skipping 131 matching lines @@
 }
 
 void AutofillAgent::OnClearPreviewedForm() {
   didClearAutofillSelection(autofill_query_element_);
 }
 
 void AutofillAgent::OnSetNodeText(const string16& value) {
   SetNodeText(value, &autofill_query_element_);
 }
 
+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(
+      autofill_query_element_,
+      value);
+  DCHECK(handled);
+}
+
 void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
                                     bool display_warning_if_disabled) {
   // If autocomplete is disabled at the form level, then we might want to show
   // a warning in place of suggestions. However, if autocomplete is disabled
   // specifically for this field, we never want to show a warning. Otherwise,
   // we might interfere with custom popups (e.g. search suggestions) used by
   // the website.
   const WebFormElement form = element.form();
@@ skipping 72 matching lines @@
 
 void AutofillAgent::SetNodeText(const string16& value,
                                 WebKit::WebInputElement* node) {
   string16 substring = value;
   substring = substring.substr(0, node->maxLength());
 
   node->setValue(substring, true);
 }
 
 }  // namespace autofill