Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.h
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
index 5a1838e20073936b25a9ff88a0fc35e7f22e60a7..e795a3cccc1aa266b02e8a24bf2fd950988ae2a6 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
@@ -18,6 +18,7 @@ class WebContents;
 }
 
 namespace password_manager {
+enum class CredentialType : unsigned int;

[vasilii, 2015/01/12 18:36:45]

doesn't match the definition

[melandory, 2015/01/13 09:07:54]

Yes, because I've submit another CL, which changes definition and will allow
forward declaration of CredentialType.

 struct CredentialInfo;
 class PasswordFormManager;
 }
@@ -80,8 +81,10 @@ class ManagePasswordsUIController
 
   // Called from the model when the user chooses a credential.
   // The controller MUST be in a pending credentials state.
-  virtual void ChooseCredential(bool was_chosen,
-                                const autofill::PasswordForm& form);
+  virtual void ChooseCredential(
+      bool was_chosen,

[vasilii, 2015/01/12 18:36:45]

no need for this parameter anymore

[melandory, 2015/01/13 10:16:02]

Done.

+      const autofill::PasswordForm& form,
+      password_manager::CredentialType credential_type);
 
   // Called from the model when the user chooses to never save passwords; passes
   // the action off to the FormManager. The controller MUST be in a pending
@@ -111,6 +114,14 @@ class ManagePasswordsUIController
     return new_password_forms_;
   }
 
+  ScopedVector<autofill::PasswordForm>& federated_credentials_forms() {
+    return federated_credentials_forms_;
+  }
+
+  ScopedVector<autofill::PasswordForm>& local_credentials_forms() {
+    return local_credentials_forms_;
+  }
+
   // True if a password is sitting around, waiting for a user to decide whether
   // or not to save it.
   bool PasswordPendingUserDecision() const;
@@ -154,6 +165,12 @@ class ManagePasswordsUIController
   // |password_form_map_| is to be cleared too.
   ScopedVector<autofill::PasswordForm> new_password_forms_;

[Mike West, 2015/01/13 19:41:46]

I think you can kill this as well.

[vasilii, 2015/01/14 09:57:48]

It is for the traditional bubble. In case user adds a new form while the bubble
is open. However, the code for handling this is broken anyway.

 
+  // Federated credentials.
+  ScopedVector<autofill::PasswordForm> federated_credentials_forms_;
+
+  // Local credentials.
+  ScopedVector<autofill::PasswordForm> local_credentials_forms_;
+
   // All previously stored credentials for a specific site.
   // Protected, not private, so we can mess with the value in
   // ManagePasswordsUIControllerMock.