Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 410113002: Fix WiFi config view for previously configured client cert. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/network/client_cert_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index a0119a772bce6b1e6b6248e65001fead38c534ef..71b25b808d78b12580a2b5f2f73117cc3ff15c2b 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -1295,9 +1295,10 @@ void WifiConfigView::InitFromProperties(
std::string eap_cert_id;
properties.GetStringWithoutPathExpansion(
shill::kEapCertIdProperty, &eap_cert_id);
- if (!eap_cert_id.empty()) {
+ std::string pkcs11_id = client_cert::GetPkcs11IdFromEapCertId(eap_cert_id);
+ if (!pkcs11_id.empty()) {
int cert_index =
- CertLibrary::Get()->GetUserCertIndexByPkcs11Id(eap_cert_id);
+ CertLibrary::Get()->GetUserCertIndexByPkcs11Id(pkcs11_id);
if (cert_index >= 0)
user_cert_combobox_->SetSelectedIndex(cert_index);
}
« no previous file with comments | « no previous file | chromeos/network/client_cert_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698