Save password functionality added to the save password bubble

chrome/browser/password_manager/password_form_manager.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_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
   enum ActionMatch {
     ACTION_MATCH_REQUIRED,
     ACTION_MATCH_NOT_REQUIRED
   };
 
   enum OtherPossibleUsernamesAction {
     ALLOW_OTHER_POSSIBLE_USERNAMES,
     IGNORE_OTHER_POSSIBLE_USERNAMES
   };
 
+  enum PasswordAction {
+    DO_NOTHING,
+    SAVE,
+    BLACKLIST
+  };
+
   // Compare basic data of observed_form_ with argument. Only check the action
   // URL when action match is required.
   bool DoesManage(const autofill::PasswordForm& form,
                   ActionMatch action_match) const;
 
   // Retrieves potential matching logins from the database.
   void FetchMatchingLoginsFromPasswordStore();
 
   // Simple state-check to verify whether this object as received a callback
   // from the PasswordStore and completed its matching phase. Note that the
   // callback in question occurs on the same (and only) main thread from which
   // instances of this class are ever used, but it is required since it is
   // conceivable that a user (or ui test) could attempt to submit a login
   // prompt before the callback has occured, which would InvokeLater a call to
   // PasswordManager::ProvisionallySave, which would interact with this object
   // before the db has had time to answer with matching password entries.
   // This is intended to be a one-time check; if the return value is false the
   // expectation is caller will give up. This clearly won't work if you put it
   // in a loop and wait for matching to complete; you're (supposed to be) on
   // the same thread!
   bool HasCompletedMatching();
 
-  // Sets current password to be saved when ApplyEdits() is called. Will
-  // override a previous call to BlacklistPassword().
-  void SavePassword();
+  // Persist changes according to the state of |password_action_| when the next
+  // navigation occurs or when the tab is closed.

[Peter Kasting, 2013/09/11 21:49:39]

Nit: How about:

Called when the page is navigated or the tab is closed.  Takes the necessary
action with the form's login/password based on the desired |password_action_|.

[npentrel, 2013/09/12 10:08:44]

Done.

+  void ApplyChange();
 
-  // Sets current password to be blacklisted when ApplyEdits() is called. Will
-  // override a previous call to SavePassword().
-  void BlacklistPassword();
-
-  // Persist changes from the latest call to either SavePassword() or
-  // BlacklistPassword().
-  void ApplyChange();
+  // Record state of |password_action_|.

[Peter Kasting, 2013/09/11 21:49:39]

This comment is misleading.  Just remove it entirely.

[npentrel, 2013/09/12 10:08:44]

Done.

+  void set_password_action(PasswordAction password_action) {
+    password_action_ = password_action;
+  }
 
   // Determines if the user opted to 'never remember' passwords for this form.
   bool IsBlacklisted();
 
   // Used by PasswordManager to determine whether or not to display
   // a SavePasswordBar when given the green light to save the PasswordForm
   // managed by this.
   bool IsNewLogin();
 
   // Returns true if the current pending credentials were found using
@@ skipping 15 matching lines @@
 
   // PasswordStoreConsumer implementation.
   virtual void OnPasswordStoreRequestDone(
       CancelableRequestProvider::Handle handle,
       const std::vector<autofill::PasswordForm*>& result) OVERRIDE;
   virtual void OnGetPasswordStoreResults(
       const std::vector<autofill::PasswordForm*>& results) OVERRIDE;
 
   // A user opted to 'never remember' passwords for this form.
   // Blacklist it so that from now on when it is seen we ignore it.
-
   // TODO: Make this private once we switch to the new UI.
   void PermanentlyBlacklist();
 
   // If the user has submitted observed_form_, provisionally hold on to
   // the submitted credentials until we are told by PasswordManager whether
   // or not the login was successful. |action| describes how we deal with
   // possible usernames. If |action| is ALLOW_OTHER_POSSIBLE_USERNAMES we will
   // treat a possible usernames match as a sign that our original heuristics
   // were wrong and that the user selected the correct username from the
   // Autofill UI.
   void ProvisionallySave(const autofill::PasswordForm& credentials,
                          OtherPossibleUsernamesAction action);
 
   // Handles save-as-new or update of the form managed by this manager.
   // Note the basic data of updated_credentials must match that of
   // observed_form_ (e.g DoesManage(pending_credentials_) == true).
-
   // TODO: Make this private once we switch to the new UI.
   void Save();
 
   // Call these if/when we know the form submission worked or failed.
   // These routines are used to update internal statistics ("ActionsTaken").
   void SubmitPassed();
   void SubmitFailed();
 
   // Return the username associated with the credentials.
   const string16& associated_username() const {
@@ skipping 152 matching lines @@
   // Web contents from which we get the RenderViewHost for sending messages to
   // the corresponding renderer.
   content::WebContents* web_contents_;
 
   // These three fields record the "ActionsTaken" by the browser and
   // the user with this form, and the result. They are combined and
   // recorded in UMA when the manager is destroyed.
   ManagerAction manager_action_;
   UserAction user_action_;
   SubmitResult submit_result_;
-  bool should_save_password_;
-  bool should_blacklist_password_;
+
+  // This field records what the user wants us to do with the used login
+  // credentials. The action gets applied with ApplyChange().

[Peter Kasting, 2013/09/11 21:49:39]

Nit: How about:

Whether we should save, blacklist, or do nothing with this form's login/password
on the next navigation or when the tab is closed.

[npentrel, 2013/09/12 10:08:44]

Done.

+  PasswordAction password_action_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordFormManager);
 };
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_