Add Password Autofill Manager to New Autofill

chrome/browser/autofill/autofill_external_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "chrome/browser/autofill/password_autofill_manager.h"
 #include "webkit/forms/form_data.h"
 #include "webkit/forms/form_field.h"
+#include "webkit/forms/password_form_dom_manager.h"
 
 class AutofillManager;
 class TabContentsWrapper;
 
 namespace gfx {
 class Rect;
 }
 
 // TODO(csharp): A lot of the logic in this class is copied from autofillagent.
 // Once Autofill is moved out of WebKit this class should be the only home for
@@ skipping 40 matching lines @@
   void DidAcceptAutofillSuggestions(const string16& value,
                                     int unique_id,
                                     unsigned index);
 
   // Informs the delegate that the Autofill previewed form should be cleared.
   virtual void ClearPreviewedForm();
 
   // Hide the Autofill poup.
   virtual void HideAutofillPopup();
 
+  // Inform the Password Manager of a closing frame.
+  void FrameClosing();
+
+  // Inform the Password Manager of a filled form.
+  void PasswordFormMapping(

[Ilya Sherman, 2012/03/09 22:00:26]

nit: Perhaps "AddPasswordFormMapping"?

[csharp, 2012/03/12 15:11:56]

Done.

+      const webkit::forms::FormField& form,
+      const webkit::forms::PasswordFormFillData& fill_data);
+
   // Platforms that wish to implement an external Autofill delegate
   // MUST implement this.  The 1st arg is the tab contents that owns
   // this delegate; the second is the Autofill manager owned by the
   // tab contents.
   static AutofillExternalDelegate* Create(TabContentsWrapper*,
                                           AutofillManager*);
  protected:
   explicit AutofillExternalDelegate(TabContentsWrapper* tab_contents_wrapper,
                                     AutofillManager* autofill_manager);
 
@@ skipping 19 matching lines @@
  private:
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
 
   TabContentsWrapper* tab_contents_wrapper_;  // weak; owns me.
   AutofillManager* autofill_manager_;  // weak.
 
+  // Password Autofill manager, handles all password related Autofilling.
+  PasswordAutofillManager password_autofill_manager_;
+
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
   // The current form and field selected by Autofill.
   webkit::forms::FormData autofill_query_form_;
   webkit::forms::FormField autofill_query_field_;
 
   // Should we display a warning if Autofill is disabled?
   bool display_warning_if_disabled_;
 
   // Have we already shown Autofill suggestions for the field the user is
   // currently editing?  Used to keep track of state for metrics logging.
   bool has_shown_autofill_popup_for_current_edit_;
 
   // The menu index of the "Clear" menu item.
   int suggestions_clear_index_;
 
   // The menu index of the "Autofill options..." menu item.
   int suggestions_options_index_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_