Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/passwords/manage_passwords_bubble_model.h

Index: chrome/browser/ui/passwords/manage_passwords_bubble_model.h
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model.h b/chrome/browser/ui/passwords/manage_passwords_bubble_model.h
index eae9867f0b339a4d04ba13ac7fee4dcab76d6ad2..1c3693e3f91119edf20d85118710e2da7cff0807 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_model.h
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model.h
@@ -21,6 +21,10 @@ namespace content {
 class WebContents;
 }
 
+namespace password_manager {
+enum class CredentialType : unsigned int;
+}
+
 // This model provides data for the ManagePasswordsBubble and controls the
 // password management actions.
 class ManagePasswordsBubbleModel : public content::WebContentsObserver {
@@ -82,7 +86,8 @@ class ManagePasswordsBubbleModel : public content::WebContentsObserver {
                         PasswordAction action);
 
   // Called by the view code to notify about chosen credential.
-  void OnChooseCredentials(const autofill::PasswordForm& password_form);
+  void OnChooseCredentials(const autofill::PasswordForm& password_form,
+                           password_manager::CredentialType credential_type_);
 
   GURL origin() const { return origin_; }
 
@@ -95,8 +100,13 @@ class ManagePasswordsBubbleModel : public content::WebContentsObserver {
   const autofill::ConstPasswordFormMap& best_matches() const {
     return best_matches_;
   }
-  const ScopedVector<autofill::PasswordForm>& pending_credentials() const {
-    return pending_credentials_;
+  const ScopedVector<autofill::PasswordForm>& local_pending_credentials()
+      const {
+    return local_pending_credentials_;
+  }
+  const ScopedVector<autofill::PasswordForm>& federated_pending_credentials()
+      const {
+    return federated_pending_credentials_;
   }
   const base::string16& manage_link() const { return manage_link_; }
   bool never_save_passwords() const { return never_save_passwords_; }
@@ -136,7 +146,8 @@ class ManagePasswordsBubbleModel : public content::WebContentsObserver {
   base::string16 title_;
   autofill::PasswordForm pending_password_;
   autofill::ConstPasswordFormMap best_matches_;
-  ScopedVector<autofill::PasswordForm> pending_credentials_;
+  ScopedVector<autofill::PasswordForm> local_pending_credentials_;
+  ScopedVector<autofill::PasswordForm> federated_pending_credentials_;
   base::string16 manage_link_;
   base::string16 save_confirmation_text_;
   gfx::Range save_confirmation_link_range_;