Credential Manager API: Showing both local and federated logins.

components/password_manager/content/common/credential_manager_types.cc

Index: components/password_manager/content/common/credential_manager_types.cc
diff --git a/components/password_manager/content/common/credential_manager_types.cc b/components/password_manager/content/common/credential_manager_types.cc
index 8cac746b12615ba93306ebb456722ca42357bb3e..63e9fa30f8ee541e87d299017fc8020bbdaacf11 100644
--- a/components/password_manager/content/common/credential_manager_types.cc
+++ b/components/password_manager/content/common/credential_manager_types.cc
@@ -33,15 +33,15 @@ CredentialInfo::CredentialInfo(const blink::WebCredential& credential)
   }
 }
 
-CredentialInfo::CredentialInfo(const autofill::PasswordForm& form)
-    : id(form.username_value),
+CredentialInfo::CredentialInfo(const autofill::PasswordForm& form,
+                               CredentialType form_type)
+    : type(form_type),
+      id(form.username_value),
       name(form.display_name),
       avatar(form.avatar_url),
       password(form.password_value),
       federation(form.federation_url) {
   DCHECK(!password.empty() || !federation.is_empty());

[Mike West, 2015/01/22 11:39:54]

Let's be a bit cautious here: if the type is federated, I'd like us to clear the
password value. If the type is local, I'd like us to clear the federation value.

[vasilii, 2015/01/22 11:46:23]

The same applicable to CREDENTIAL_TYPE_EMPTY.

[melandory, 2015/01/23 15:07:43]

Done.

-  type = password.empty() ? CredentialType::CREDENTIAL_TYPE_FEDERATED
-                          : CredentialType::CREDENTIAL_TYPE_LOCAL;
 }
 
 CredentialInfo::~CredentialInfo() {