Add Password Autofill Manager to New Autofill

chrome/renderer/autofill/password_autofill_manager.cc

Index: chrome/renderer/autofill/password_autofill_manager.cc
diff --git a/chrome/renderer/autofill/password_autofill_manager.cc b/chrome/renderer/autofill/password_autofill_manager.cc
index 65dba44df5f7d4a1758b58f49681c7aabdfacc10..cb1752f2cb486358642e00881fdb61664a25c5b3 100644
--- a/chrome/renderer/autofill/password_autofill_manager.cc
+++ b/chrome/renderer/autofill/password_autofill_manager.cc
@@ -8,6 +8,7 @@
 #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"
@@ -204,6 +205,7 @@ namespace autofill {
 PasswordAutofillManager::PasswordAutofillManager(
     content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
+      disable_popup_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
@@ -410,7 +412,10 @@ bool PasswordAutofillManager::InputElementLostFocus() {
 }
 
 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);
@@ -443,6 +448,15 @@ void PasswordAutofillManager::OnFillPasswordForm(
     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));
   }
 }
 
@@ -477,6 +491,17 @@ bool PasswordAutofillManager::ShowSuggestionPopup(
 
   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;