Add Password Autofill Manager to New Autofill

chrome/browser/autofill/autofill_external_delegate.cc

Index: chrome/browser/autofill/autofill_external_delegate.cc
diff --git a/chrome/browser/autofill/autofill_external_delegate.cc b/chrome/browser/autofill/autofill_external_delegate.cc
index 4105709df4993045f92069ceaa3933924acb55fc..7ca007160d406560254c54eee6cdb382e8656d92 100644
--- a/chrome/browser/autofill/autofill_external_delegate.cc
+++ b/chrome/browser/autofill/autofill_external_delegate.cc
@@ -24,6 +24,8 @@ AutofillExternalDelegate::AutofillExternalDelegate(
     AutofillManager* autofill_manager)
     : tab_contents_wrapper_(tab_contents_wrapper),
       autofill_manager_(autofill_manager),
+      password_autofill_manager_(
+          tab_contents_wrapper->web_contents()->GetRenderViewHost()),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_shown_autofill_popup_for_current_edit_(false),
@@ -33,6 +35,9 @@ AutofillExternalDelegate::AutofillExternalDelegate(
 
 void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id,
                                                                int list_index) {
+  if (unique_id == kPasswordEntryIds)
+    return;
+
   if (list_index == suggestions_options_index_ ||
       list_index == suggestions_clear_index_ ||
       unique_id == -1)
@@ -136,6 +141,22 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
 }
 
+void AutofillExternalDelegate::ShowPasswordSuggestions(
+    const std::vector<string16>& suggestions) {
+  if (suggestions.empty()) {
+    HideAutofillPopup();
+  }

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

nit: No need for curly braces.

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

Done.

+
+  std::vector<string16> empty;
+  std::vector<int> password_ids;
+  for (size_t i = 0; i < suggestions.size(); ++i) {
+    empty.push_back(string16());

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

Hmm, why are the suggestions all empty?

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

The suggestions still have values, it just the label and icon that are made
blank because they have no meaning for a password field (this is also done in
PasswordAutofillManager::ShowSuggestionPopup in the renderer).

[Ilya Sherman, 2012/03/22 01:20:06]

Ah, sorry, misread the code.  You could write this more briefly as:

std::vector<string16> empty(suggestions.size(), string16());
std::vector<int> password_ids(suggestions.size(), kPasswordEntryId);

+    password_ids.push_back(kPasswordEntryIds);
+  }
+
+  ApplyAutofillSuggestions(suggestions, empty, empty, password_ids, -1);
+}
+
 void AutofillExternalDelegate::DidEndTextFieldEditing() {
   has_shown_autofill_popup_for_current_edit_ = false;
 }
@@ -145,12 +166,16 @@ void AutofillExternalDelegate::DidAcceptAutofillSuggestions(
     int unique_id,
     unsigned index) {
   // If the selected element is a warning we don't want to do anything.
-  if (unique_id < 0)
+  if (unique_id < 0 && unique_id != kPasswordEntryIds)
     return;
 
-  // TODO(csharp): Add the password autofill manager.
-  // if (password_autofill_manager_->DidAcceptAutofillSuggestion(node, value))
-  //   return;
+  HideAutofillPopup();
+
+  // TODO(csharp) Fix how password are handled so that FindLoginInfo works.

[csharp, 2012/03/16 20:21:12]

I think this will work in mostly cases right now. The reason I can't use the
function from the password manager is that since the password code doesn't every
call OnQuery (like the other autofill code) when dealing with passwords we don't
know what element autofill is working on. 

The two basic solutions I see are:
1) add the field as a parameter to one of the callbacks and store it (I'm not
sure where a good place for this would be though).
2) I think with the removal and cleanup the password map in the manager I will
be able to keep the code like this.

I'd like to leave it like this for now and try and fix this when I address the
bug I filled against myself. If you want me to add the field as a parameter to
make the work in the meantime just let me know.

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

It seems like this should work in all cases, but you'd still need to let the
password manager know which suggestion was selected, right?  Right now you're
just returning early -- how does the password ever get filled this way?

+  if (unique_id == kPasswordEntryIds) {
+    // Accepting has been handled by the password manager.
+    return;
+  }
 
   if (suggestions_options_index_ != -1 &&
       index == static_cast<unsigned>(suggestions_options_index_)) {
@@ -172,11 +197,13 @@ void AutofillExternalDelegate::DidAcceptAutofillSuggestions(
   } else {
     FillAutofillFormData(unique_id, false);
   }
-
-  HideAutofillPopup();
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
+  if (password_autofill_manager_.DidClearAutofillSelection(
+          autofill_query_field_))
+    return;
+
   RenderViewHost* host =
       tab_contents_wrapper_->web_contents()->GetRenderViewHost();
   host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
@@ -189,6 +216,18 @@ void AutofillExternalDelegate::HideAutofillPopup() {
   HideAutofillPopupInternal();
 }
 
+void AutofillExternalDelegate::Reset() {
+  HideAutofillPopup();
+
+  password_autofill_manager_.Reset();
+}
+
+void AutofillExternalDelegate::AddPasswordFormMapping(
+      const webkit::forms::FormField& form,
+      const webkit::forms::PasswordFormFillData& fill_data) {
+    password_autofill_manager_.AddPasswordFormMapping(form, fill_data);
+}
+
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
   RenderViewHost* host =