Add Password Autofill Manager to New Autofill

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::RenderViewHost;
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     TabContentsWrapper* tab_contents_wrapper,
     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),
       suggestions_clear_index_(-1),
-      suggestions_options_index_(-1) {
+      suggestions_options_index_(-1),
+      renderer_hiding_popup_(false) {
 }
 
 void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id,
                                                                int list_index) {
+  if (password_autofill_manager_.DidSelectAutofillSuggestion(
+          autofill_query_field_))
+    return;
+
   if (list_index == suggestions_options_index_ ||
       list_index == suggestions_clear_index_ ||
       unique_id == -1)
     return;
 
   FillAutofillFormData(unique_id, true);
 }
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const webkit::forms::FormData& form,
                                        const webkit::forms::FormField& field,
                                        const gfx::Rect& bounds,
                                        bool display_warning_if_disabled) {
+  if (!renderer_hiding_popup_) {

[csharp, 2012/03/08 16:48:37]

I tried to send this message in the constructor, but that failed (I assume
because the renderer isn't ready to take messages at that point) and I'd like to
keep this call within this class, so this seems like the best way to do it...
but it seems hacky to be checking this every query.

[Ilya Sherman, 2012/03/08 23:22:14]

Hmm, I don't think I like having this message dissociated from the message that
sends the list of passwords over the renderer, as that could lead to race
conditions.  I'd prefer to just add a boolean to the
AutofillMsg_FillPasswordForm message.  If you prefer to dissociate the messages,
could you please describe your reasoning a bit?

[csharp, 2012/03/09 16:20:19]

I hadn't thought about adding it there. I've set it up to do that now.

+    renderer_hiding_popup_ = true;
+
+    RenderViewHost* host =
+        tab_contents_wrapper_->web_contents()->GetRenderViewHost();
+    host->Send(new AutofillMsg_DisableRendererPopup(host->GetRoutingID()));
+  }
+
   autofill_query_form_ = form;
   autofill_query_field_ = field;
   display_warning_if_disabled_ = display_warning_if_disabled;
   autofill_query_id_ = query_id;
 
   OnQueryPlatformSpecific(query_id, form, field, bounds);
 }
 
 void AutofillExternalDelegate::OnSuggestionsReturned(
     int query_id,
@@ skipping 82 matching lines @@
 }
 
 void AutofillExternalDelegate::DidAcceptAutofillSuggestions(
     const string16& value,
     int unique_id,
     unsigned index) {
   // If the selected element is a warning we don't want to do anything.
   if (unique_id < 0)
     return;
 
-  // TODO(csharp): Add the password autofill manager.
-  // if (password_autofill_manager_->DidAcceptAutofillSuggestion(node, value))
-  //   return;
+  if (password_autofill_manager_.DidAcceptAutofillSuggestion(
+          autofill_query_field_, value)) {
+    // Accepting has been handled by the password manager. Just make sure
+    // to hide the popup.
+    HideAutofillPopup();
+    return;
+  }
 
   if (suggestions_options_index_ != -1 &&
       index == static_cast<unsigned>(suggestions_options_index_)) {
     // User selected 'Autofill Options'.
     autofill_manager_->OnShowAutofillDialog();
   } else if (suggestions_clear_index_ != -1 &&
              index == static_cast<unsigned>(suggestions_clear_index_)) {
     // User selected 'Clear form'.
     RenderViewHost* host =
         tab_contents_wrapper_->web_contents()->GetRenderViewHost();
     host->Send(new AutofillMsg_ClearForm(host->GetRoutingID()));
   } else if (!unique_id) {
     // User selected an Autocomplete entry, so we fill directly.
     RenderViewHost* host =
         tab_contents_wrapper_->web_contents()->GetRenderViewHost();
     host->Send(new AutofillMsg_SetNodeText(
         host->GetRoutingID(),
         value));
   } 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()));
 }
 
 void AutofillExternalDelegate::HideAutofillPopup() {
   suggestions_clear_index_ = -1;
   suggestions_options_index_ = -1;
 
   HideAutofillPopupInternal();
 }
 
+void AutofillExternalDelegate::FrameClosing(int frame_id) {

[Ilya Sherman, 2012/03/08 23:22:14]

nit: int -> long long?

[csharp, 2012/03/09 16:20:19]

Removed

+  password_autofill_manager_.FrameClosing(frame_id);
+}
+
+void AutofillExternalDelegate::FillPasswordForm(
+      const webkit::forms::FormField& form,
+      const webkit::forms::PasswordFormFillData& fill_data,
+      int frame_id) {

[Ilya Sherman, 2012/03/08 23:22:14]

nit: int -> long long?

[csharp, 2012/03/09 16:20:19]

Removed

+    password_autofill_manager_.FillPasswordForm(form, fill_data, frame_id);
+}
+
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
   RenderViewHost* host =
       tab_contents_wrapper_->web_contents()->GetRenderViewHost();
 
   if (is_preview) {
     host->Send(new AutofillMsg_SetAutofillActionPreview(
         host->GetRoutingID()));
   } else {
     host->Send(new AutofillMsg_SetAutofillActionFill(
@@ skipping 12 matching lines @@
 // none, so all platforms use the default.
 
 #if !defined(OS_ANDROID) && !defined(TOOLKIT_GTK)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContentsWrapper*, AutofillManager*) {
   return NULL;
 }
 
 #endif