Fixed handling of preferred login info in password manager....

chrome/browser/password_manager/password_form_manager.h

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "base/stl_util-inl.h"
@@ skipping 74 matching lines @@
   // Called by destructor to ensure if this object is deleted, no potential
   // outstanding callbacks can call OnWebDataServiceRequestDone.
   void CancelLoginsQuery();
 
   // Helper for OnWebDataServiceRequestDone to determine whether or not
   // the given result form is worth scoring.
   bool IgnoreResult(const webkit_glue::PasswordForm& form) const;
 
   // Helper for Save in the case that best_matches.size() == 0, meaning
   // we have no prior record of this form/username/password and the user
-  // has opted to 'Save Password'.
-  void SaveAsNewLogin();
+  // has opted to 'Save Password'. If |reset_preferred_login| is set,
+  // the previously preferred login from |best_matches_| will be reset.
+  void SaveAsNewLogin(bool reset_preferred_login);
 
   // Helper for OnWebDataServiceRequestDone to score an individual result
   // against the observed_form_.
   int ScoreResult(const webkit_glue::PasswordForm& form) const;
 
   // Helper for Save in the case that best_matches.size() > 0, meaning
   // we have at least one match for this form/username/password. This
   // Updates the form managed by this object, as well as any matching forms
   // that now need to have preferred bit changed, since updated_credentials
   // is now implicitly 'preferred'.
   void UpdateLogin();
 
+  // Update all login matches to reflect new preferred state - preferred flag
+  // will be reset on all matched logins that different than the current
+  // |pending_credentials_|.
+  void UpdatePreferredLoginState(PasswordStore* password_store);
+
   // Set of PasswordForms from the DB that best match the form
   // being managed by this. Use a map instead of vector, because we most
   // frequently require lookups by username value in IsNewLogin.
   webkit_glue::PasswordFormMap best_matches_;
 
   // Cleans up when best_matches_ goes out of scope.
   STLValueDeleter<webkit_glue::PasswordFormMap> best_matches_deleter_;
 
   // The PasswordForm from the page or dialog managed by this.
   webkit_glue::PasswordForm observed_form_;
@@ skipping 35 matching lines @@
   // assuming we've already processed the web data request for matching logins,
   // when we actually haven't.
   PasswordFormManagerState state_;
 
   // The profile from which we get the WebDataService.
   Profile* profile_;
 
   DISALLOW_EVIL_CONSTRUCTORS(PasswordFormManager);
 };
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_