Chromium Code Reviews| Index: chrome/browser/chrome_content_browser_client.cc |
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
| index 25f4aa462679cd10704c7256488f194bcad52df4..ed3e08e4db6f33f83e939507b1f0bbe58ab9965a 100644 |
| --- a/chrome/browser/chrome_content_browser_client.cc |
| +++ b/chrome/browser/chrome_content_browser_client.cc |
| @@ -140,6 +140,7 @@ |
| #include "net/cookies/canonical_cookie.h" |
| #include "net/cookies/cookie_options.h" |
| #include "net/ssl/ssl_cert_request_info.h" |
| +#include "net/ssl/ssl_platform_key.h" |
| #include "ppapi/host/ppapi_host.h" |
| #include "storage/browser/fileapi/external_mount_points.h" |
| #include "ui/base/l10n/l10n_util.h" |
| @@ -1979,7 +1980,13 @@ void ChromeContentBrowserClient::SelectClientCertificate( |
| for (size_t i = 0; i < all_client_certs.size(); ++i) { |
| if (CertMatchesFilter(*all_client_certs[i].get(), *filter_dict)) { |
| // Use the first certificate that is matched by the filter. |
| - delegate->ContinueWithCertificate(all_client_certs[i].get()); |
| +// The following is not supported on Android since the client_certs list |
| +// won't be populated. |
| +#if !defined(OS_ANDROID) |
|
davidben
2015/09/25 20:10:11
I'd probably just wrap the whole thing.
svaldez
2015/09/28 16:54:52
Done.
|
| + delegate->ContinueWithCertificate( |
| + all_client_certs[i].get(), |
| + FetchClientCertPrivateKey(all_client_certs[i].get()).get()); |
| +#endif |
| return; |
| } |
| } |