Add Password Autofill Manager to New Autofill

chrome/renderer/autofill/password_autofill_manager.cc

 // Copyright (c) 2011 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/password_autofill_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/common/autofill_messages.h"
+#include "chrome/renderer/autofill/form_autofill_util.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 176 matching lines @@
 }  // namespace
 
 namespace autofill {
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, public:
 
 PasswordAutofillManager::PasswordAutofillManager(
     content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
+      disable_popup_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 PasswordAutofillManager::~PasswordAutofillManager() {
 }
 
 bool PasswordAutofillManager::TextFieldDidEndEditing(
     const WebKit::WebInputElement& element) {
   LoginToPasswordInfoMap::const_iterator iter =
       login_to_password_info_.find(element);
@@ skipping 186 matching lines @@
     bool is_focused) {
   // TODO(jcivelli): http://crbug.com/51644 Implement behavior.
   return false;
 }
 
 bool PasswordAutofillManager::InputElementLostFocus() {
   return false;
 }
 
 void PasswordAutofillManager::OnFillPasswordForm(
-    const webkit::forms::PasswordFormFillData& form_data) {
+    const webkit::forms::PasswordFormFillData& form_data,
+    bool disable_popup) {
+  disable_popup_ = disable_popup;
+
   FormElementsList forms;
   // We own the FormElements* in forms.
   FindFormElements(render_view()->GetWebView(), form_data.basic_data, &forms);
   FormElementsList::iterator iter;
   for (iter = forms.begin(); iter != forms.end(); ++iter) {
     scoped_ptr<FormElements> form_elements(*iter);
 
     // If wait_for_username is true, we don't want to initially fill the form
     // until the user types in a valid username.
     if (!form_data.wait_for_username)
@@ skipping 12 matching lines @@
     // We might have already filled this form if there are two <form> elements
     // with identical markup.
     if (login_to_password_info_.find(username_element) !=
         login_to_password_info_.end())
       continue;
 
     PasswordInfo password_info;
     password_info.fill_data = form_data;
     password_info.password_field = password_element;
     login_to_password_info_[username_element] = password_info;
+
+    webkit::forms::FormData form;
+    webkit::forms::FormField field;
+    FindFormAndFieldForInputElement(
+        username_element, &form, &field, REQUIRE_NONE);
+    Send(new AutofillHostMsg_AddPasswordFormMapping(
+        routing_id(),
+        field,
+        form_data));
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, private:
 
 void PasswordAutofillManager::GetSuggestions(
     const webkit::forms::PasswordFormFillData& fill_data,
     const string16& input,
     std::vector<string16>* suggestions) {
@@ skipping 14 matching lines @@
   WebKit::WebFrame* frame = user_input.document().frame();
   if (!frame)
     return false;
 
   WebKit::WebView* webview = frame->view();
   if (!webview)
     return false;
 
   std::vector<string16> suggestions;
   GetSuggestions(fill_data, user_input.value(), &suggestions);
+
+  if (disable_popup_) {
+    WebKit::WebInputElement selected_element = user_input;
+    gfx::Rect bounding_box(selected_element.boundsInViewportSpace());
+    Send(new AutofillHostMsg_ShowPasswordSuggestions(routing_id(),
+                                                     bounding_box,
+                                                     suggestions));

[Ilya Sherman, 2012/03/20 00:58:55]

Hmm, I really don't like that the PasswordAutofillManager code (in the renderer)
mirrors so much of the AutofillAgent logic.  Have you explored whether it would
be feasible to refactor the code so that more of it is shared?  (It might not be
viable, since the password autofill code tries to do inline autocompletion,
whereas the rest of the autofill code currently doesn't.)

What happens if both the Autofill code and the Password Autofill code try to
show a popup?  Do they race?

[csharp, 2012/03/21 14:10:31]

I didn't look much into if we could refactor to share the code between the
classes. With my little poking around I don't feel like there are too many easy
gains, a fair amount of the code looked just different enough to make
refactoring it to be shared a challenge. I could be wrong though.

As far as I can tell there should never be a race condition between them because
the Autofill code will only be aware of the option to show a popup after the
Password manager has declined it. Even if they both try to show one at the same
time, they both go to the same function:
  webview->applyAutofillSuggestions(
      user_input, suggestions, labels, icons, ids, -1);
So one will just replace the other, there will never be two popups.

+    return !suggestions.empty();
+  }
+
+
   if (suggestions.empty()) {
     webview->hidePopups();
     return false;
   }
 
   std::vector<string16> labels(suggestions.size());
   std::vector<string16> icons(suggestions.size());
   std::vector<int> ids(suggestions.size(), 0);
   webview->applyAutofillSuggestions(
       user_input, suggestions, labels, icons, ids, -1);
@@ skipping 96 matching lines @@
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(input);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_input = input;
   *found_password = iter->second;
   return true;
 }
 
 }  // namespace autofill