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

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

Issue 485083002: Fix network configurations that use the system CA certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/options/vpn_config_view.cc
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index e20d685fcd232de312e976f396fadcf7c4e8a443..099b00578e937e80063184d0f0107f7565910f8e 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -837,12 +837,11 @@ void VPNConfigView::SetConfigProperties(
}
case PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT: {
std::string ca_cert_pem = GetServerCACertPEM();
- if (!ca_cert_pem.empty()) {
- base::ListValue* pem_list = new base::ListValue;
+ base::ListValue* pem_list = new base::ListValue;
+ if (!ca_cert_pem.empty())
pem_list->AppendString(ca_cert_pem);
- properties->SetWithoutPathExpansion(
- shill::kL2tpIpsecCaCertPemProperty, pem_list);
- }
+ properties->SetWithoutPathExpansion(shill::kL2tpIpsecCaCertPemProperty,
+ pem_list);
SetUserCertProperties(client_cert::CONFIG_TYPE_IPSEC, properties);
if (!group_name.empty()) {
properties->SetStringWithoutPathExpansion(
@@ -860,12 +859,11 @@ void VPNConfigView::SetConfigProperties(
}
case PROVIDER_TYPE_INDEX_OPEN_VPN: {
std::string ca_cert_pem = GetServerCACertPEM();
- if (!ca_cert_pem.empty()) {
- base::ListValue* pem_list = new base::ListValue;
+ base::ListValue* pem_list = new base::ListValue;
+ if (!ca_cert_pem.empty())
pem_list->AppendString(ca_cert_pem);
- properties->SetWithoutPathExpansion(
- shill::kOpenVPNCaCertPemProperty, pem_list);
- }
+ properties->SetWithoutPathExpansion(shill::kOpenVPNCaCertPemProperty,
+ pem_list);
SetUserCertProperties(client_cert::CONFIG_TYPE_OPENVPN, properties);
properties->SetStringWithoutPathExpansion(
shill::kOpenVPNUserProperty, GetUsername());
« no previous file with comments | « no previous file | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698