Index: third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp |
diff --git a/third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp b/third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp |
index ff35965185a0314d8dca14c145930f627e48eadc..18c0c3814bde6eb77890a636331dea62ce3cde12 100644 |
--- a/third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp |
+++ b/third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp |
@@ -28,6 +28,7 @@ |
#include "public/platform/WebCredential.h" |
#include "public/platform/WebCredentialManagerClient.h" |
#include "public/platform/WebCredentialManagerError.h" |
+#include "public/platform/WebCredentialMediationRequirement.h" |
#include "public/platform/WebFederatedCredential.h" |
#include "public/platform/WebPasswordCredential.h" |
@@ -177,13 +178,33 @@ ScriptPromise CredentialsContainer::get( |
} |
} |
- UseCounter::Count(ExecutionContext::From(script_state), |
- options.unmediated() |
- ? UseCounter::kCredentialManagerGetWithoutUI |
- : UseCounter::kCredentialManagerGetWithUI); |
+ // Set the default mediation option if none is provided. |
+ if (!options.hasUnmediated() && !options.hasMediation()) { |
+ options.mediation() = "optional"; |
+ } else if (options.hasUnmediated() && !options.hasMediation()) { |
+ options.mediation() = options.unmediated() ? "silent" : "optional"; |
+ } else if (options.hasUnmediated() && options.hasMediation()) { |
+ // Show a warning that unmediated will be ignored? |
vasilii
2017/05/18 12:34:03
Should be an exception I think.
jdoerrie
2017/05/18 14:57:25
Done.
|
+ } |
+ |
+ UseCounter::Feature feature; |
+ WebCredentialMediationRequirement mediation; |
+ |
+ if (options.mediation() == "silent") { |
+ feature = UseCounter::kCredentialManagerGetMediationSilent; |
+ mediation = kWebCredentialManagerMediationRequirementSilent; |
+ } else if (options.mediation() == "optional") { |
+ feature = UseCounter::kCredentialManagerGetMediationOptional; |
+ mediation = kWebCredentialManagerMediationRequirementOptional; |
+ } else { |
vasilii
2017/05/18 12:34:03
What about an exception in case of random trash st
jdoerrie
2017/05/18 14:57:25
The generated code already includes a call to IsVa
|
+ feature = UseCounter::kCredentialManagerGetMediationRequired; |
+ mediation = kWebCredentialManagerMediationRequirementRequired; |
+ } |
+ |
+ UseCounter::Count(ExecutionContext::From(script_state), feature); |
CredentialManagerClient::From(ExecutionContext::From(script_state)) |
- ->DispatchGet(options.unmediated(), options.password(), providers, |
+ ->DispatchGet(mediation, options.password(), providers, |
new RequestCallbacks(resolver)); |
return promise; |
} |