Better filling on suggestion of password fields in Password Manager.

components/autofill/content/renderer/password_autofill_agent.h

 // Copyright 2013 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 COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 29 matching lines @@
   bool TextDidChangeInTextField(const blink::WebInputElement& element);
 
   // Function that should be called whenever the value of |element| changes due
   // to user input. This is separate from TextDidChangeInTextField() as that
   // function may trigger UI and should only be called when other UI won't be
   // shown.
   void UpdateStateForTextChange(const blink::WebInputElement& element);
 
   // Fills the username and password fields of this form with the given values.
   // Returns true if the fields were filled, false otherwise.
-  bool FillSuggestion(const blink::WebNode& node,
+  bool FillSuggestion(const blink::WebFormControlElement& node,
                       const blink::WebString& username,
                       const blink::WebString& password);
 
   // Previews the username and password fields of this form with the given
   // values. Returns true if the fields were previewed, false otherwise.
-  bool PreviewSuggestion(const blink::WebNode& node,
+  bool PreviewSuggestion(const blink::WebFormControlElement& node,
                          const blink::WebString& username,
                          const blink::WebString& password);
 
   // Clears the preview for the username and password fields, restoring both to
   // their previous filled state. Return false if no login information was
   // found for the form.
-  bool DidClearAutofillSelection(const blink::WebNode& node);
+  bool DidClearAutofillSelection(
+      const blink::WebFormControlElement& control_element);
 
   // Shows an Autofill popup with username suggestions for |element|. If
   // |show_all| is |true|, will show all possible suggestions for that element,
   // otherwise shows suggestions based on current value of |element|.
   // If |generation_popup_showing| is true, this function will return false
   // as both UIs should not be shown at the same time. This function should
   // still be called in this situation so that UMA stats can be logged.
   // Returns true if any suggestions were shown, false otherwise.
   bool ShowSuggestions(const blink::WebInputElement& element,
                        bool show_all,
@@ skipping 20 matching lines @@
   enum ProvisionallySaveRestriction {
     RESTRICTION_NONE,
     RESTRICTION_NON_EMPTY_PASSWORD
   };
 
   struct PasswordInfo {
     blink::WebInputElement password_field;
     PasswordFormFillData fill_data;
     // The user manually edited the password more recently than the username was
     // changed.
-    bool password_was_edited_last;
-    // The user edited the username field after page loading.
-    bool username_was_edited;
-    PasswordInfo();
+    bool password_was_edited_last = false;
+    // The user accepted a suggestion from a dropdown on a password field.
+    bool password_field_suggestion_was_accepted = false;
+    // The key under which PasswordAutofillManager can find info for filling.
+    int key = -1;
   };
   typedef std::map<blink::WebInputElement, PasswordInfo>
       WebInputToPasswordInfoMap;
   typedef std::map<blink::WebElement, int> WebElementToPasswordInfoKeyMap;
   typedef std::map<blink::WebInputElement, blink::WebInputElement>
       PasswordToLoginMap;
 
   // This class keeps track of autofilled password input elements and makes sure
   // the autofilled password value is not accessible to JavaScript code until
   // the user interacts with the page.
@@ skipping 45 matching lines @@
   // Scans the given frame for password forms and sends them up to the browser.
   // If |only_visible| is true, only forms visible in the layout are sent.
   void SendPasswordForms(bool only_visible);
 
   // Instructs the browser to show a pop-up suggesting which credentials could
   // be filled. |show_in_password_field| should indicate whether the pop-up is
   // to be shown on the password field instead of on the username field. If the
   // username exists, it should be passed as |user_input|. If there is no
   // username, pass the password field in |user_input|. In the latter case, no
   // username value will be shown in the pop-up.
-  bool ShowSuggestionPopup(const PasswordFormFillData& fill_data,
+  bool ShowSuggestionPopup(const PasswordInfo& password_info,
                            const blink::WebInputElement& user_input,
                            bool show_all,
                            bool show_on_password_field);
 
-  // Finds the PasswordInfo that corresponds to the passed in element. The
-  // passed in element can be either a username element or a password element.
-  // If a PasswordInfo was found, returns |true| and also assigns the
-  // corresponding username WebInputElement and PasswordInfo into
-  // username_element and pasword_info, respectively. Note, that
-  // |username_element->isNull()| can be true for forms without a username
-  // field.
-  bool FindPasswordInfoForElement(
-      const blink::WebInputElement& element,
-      const blink::WebInputElement** username_element,
-      PasswordInfo** password_info);
+  // Finds the PasswordInfo, username and password fields that corresponds to
+  // the passed in |element|. |element| can refer either to a username element
+  // or a password element. If a PasswordInfo was found, returns |true| and also
+  // assigns the corresponding username, password elements and PasswordInfo into
+  // |username_element|, |password_element| and |pasword_info|, respectively.
+  // Note, that |username_element->isNull()| can be true if |element| is a
+  // password.
+  bool FindPasswordInfoForElement(const blink::WebInputElement& element,
+                                  blink::WebInputElement* username_element,
+                                  blink::WebInputElement* password_element,
+                                  PasswordInfo** password_info);
 
   // Invoked when the frame is closing.
   void FrameClosing();
 
-  // Finds login information for a |node| that was previously filled.
-  bool FindLoginInfo(const blink::WebNode& node,
-                     blink::WebInputElement* found_input,
-                     PasswordInfo** found_password);
-
   // Clears the preview for the username and password fields, restoring both to
   // their previous filled state.
   void ClearPreview(blink::WebInputElement* username,
                     blink::WebInputElement* password);
 
   // Saves |password_form| in |provisionally_saved_form_|, as long as it
   // satisfies |restriction|.
   void ProvisionallySavePassword(std::unique_ptr<PasswordForm> password_form,
                                  ProvisionallySaveRestriction restriction);
 
   // Returns true if |provisionally_saved_form_| has enough information that
   // it is likely filled out.
   bool ProvisionallySavedPasswordIsValid();
 
   // Helper function called when in-page navigation completed
   void OnSamePageNavigationCompleted();
 
   // The logins we have filled so far with their associated info.
   WebInputToPasswordInfoMap web_input_to_password_info_;
-  // And the keys under which PasswordAutofillManager can find the same info.
-  WebElementToPasswordInfoKeyMap web_element_to_password_info_key_;
   // A (sort-of) reverse map to |login_to_password_info_|.
   PasswordToLoginMap password_to_username_;
 
   // Set if the user might be submitting a password form on the current page,
   // but the submit may still fail (i.e. doesn't pass JavaScript validation).
   std::unique_ptr<PasswordForm> provisionally_saved_form_;
 
   // Contains the most recent text that user typed or PasswordManager autofilled
   // in input elements. Used for storing username/password before JavaScript
   // changes them.
@@ skipping 17 matching lines @@
   FormsPredictionsMap form_predictions_;
 
   base::WeakPtrFactory<PasswordAutofillAgent> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordAutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_