Commit 3d634f7e authored by Jon Mann's avatar Jon Mann Committed by Commit Bot

Fix closure errors in network_config.js.

Bug: 1047815
Change-Id: I15889b977329b3d4ed1e042b76f2076360c288aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040744
Commit-Queue: Jon Mann <jonmann@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739263}
parent 4dc689b4
...@@ -554,7 +554,7 @@ Polymer({ ...@@ -554,7 +554,7 @@ Polymer({
}, },
/** /**
* @param {!mojom.ManagedBoolean|undefined} property * @param {?mojom.ManagedBoolean|undefined} property
* @return {boolean} * @return {boolean}
* @private * @private
*/ */
...@@ -566,7 +566,7 @@ Polymer({ ...@@ -566,7 +566,7 @@ Polymer({
}, },
/** /**
* @param {!mojom.ManagedStringList|undefined} property * @param {?mojom.ManagedStringList|undefined} property
* @return {!Array<string>|undefined} * @return {!Array<string>|undefined}
* @private * @private
*/ */
...@@ -728,7 +728,7 @@ Polymer({ ...@@ -728,7 +728,7 @@ Polymer({
clientCertPkcs11Id: OncMojo.getActiveString(openVpn.clientCertPkcs11Id), clientCertPkcs11Id: OncMojo.getActiveString(openVpn.clientCertPkcs11Id),
clientCertType: OncMojo.getActiveString(openVpn.clientCertType), clientCertType: OncMojo.getActiveString(openVpn.clientCertType),
extraHosts: this.getActiveStringList_(openVpn.extraHosts), extraHosts: this.getActiveStringList_(openVpn.extraHosts),
otp: OncMojo.getActiveString(openVpn.otp), otp: '',
password: OncMojo.getActiveString(openVpn.password), password: OncMojo.getActiveString(openVpn.password),
saveCredentials: this.getActiveBoolean_(openVpn.saveCredentials), saveCredentials: this.getActiveBoolean_(openVpn.saveCredentials),
serverCaPems: this.getActiveStringList_(openVpn.serverCaPems), serverCaPems: this.getActiveStringList_(openVpn.serverCaPems),
...@@ -775,8 +775,6 @@ Polymer({ ...@@ -775,8 +775,6 @@ Polymer({
configWifi.security = security; configWifi.security = security;
break; break;
case mojom.NetworkType.kEthernet: case mojom.NetworkType.kEthernet:
autoConnect = this.getActiveBoolean_(
managedProperties.typeProperties.ethernet.autoConnect);
const eap = managedProperties.typeProperties.ethernet.eap ? const eap = managedProperties.typeProperties.ethernet.eap ?
this.getEAPConfigProperties_( this.getEAPConfigProperties_(
managedProperties.typeProperties.ethernet.eap) : managedProperties.typeProperties.ethernet.eap) :
...@@ -1447,11 +1445,11 @@ Polymer({ ...@@ -1447,11 +1445,11 @@ Polymer({
} }
if (vpnConfig.type === mojom.VpnType.kOpenVPN) { if (vpnConfig.type === mojom.VpnType.kOpenVPN) {
this.setOpenVPNProperties_(propertiesToSet); this.setOpenVPNProperties_(propertiesToSet);
delete propertiesToSet.ipSec; delete propertiesToSet.typeConfig.vpn.ipSec;
delete propertiesToSet.l2tp; delete propertiesToSet.typeConfig.vpn.l2tp;
} else if (vpnConfig.type === mojom.VpnType.kL2TPIPsec) { } else if (vpnConfig.type === mojom.VpnType.kL2TPIPsec) {
this.setVpnIPsecProperties_(propertiesToSet); this.setVpnIPsecProperties_(propertiesToSet);
delete propertiesToSet.openVpn; delete propertiesToSet.typeConfig.vpn.openVpn;
} }
} }
return propertiesToSet; return propertiesToSet;
...@@ -1702,9 +1700,10 @@ Polymer({ ...@@ -1702,9 +1700,10 @@ Polymer({
const vpn = managedProperties.typeProperties.vpn; const vpn = managedProperties.typeProperties.vpn;
switch (vpn.type) { switch (vpn.type) {
case mojom.VpnType.kOpenVPN: case mojom.VpnType.kOpenVPN:
return vpn.openVpn.saveCredentials; return vpn.openVpn.saveCredentials || OncMojo.createManagedBool(false);
case mojom.VpnType.kL2TPIPsec: case mojom.VpnType.kL2TPIPsec:
return vpn.ipSec.saveCredentials || vpn.l2tp.saveCredentials; return vpn.ipSec.saveCredentials || vpn.l2tp.saveCredentials ||
OncMojo.createManagedBool(false);
} }
assertNotReached(); assertNotReached();
return undefined; return undefined;
...@@ -1712,7 +1711,7 @@ Polymer({ ...@@ -1712,7 +1711,7 @@ Polymer({
/** /**
* @param {!mojom.ManagedProperties} managedProperties * @param {!mojom.ManagedProperties} managedProperties
* @return {!mojom.ManagedStringList|undefined} * @return {?mojom.ManagedStringList|undefined}
* @private * @private
*/ */
getManagedVpnServerCaRefs_(managedProperties) { getManagedVpnServerCaRefs_(managedProperties) {
...@@ -1736,9 +1735,9 @@ Polymer({ ...@@ -1736,9 +1735,9 @@ Polymer({
const vpn = managedProperties.typeProperties.vpn; const vpn = managedProperties.typeProperties.vpn;
switch (vpn.type) { switch (vpn.type) {
case mojom.VpnType.kOpenVPN: case mojom.VpnType.kOpenVPN:
return vpn.openVpn.clientCertType; return vpn.openVpn.clientCertType || OncMojo.createManagedString('');
case mojom.VpnType.kL2TPIPsec: case mojom.VpnType.kL2TPIPsec:
return vpn.ipSec.clientCertType; return vpn.ipSec.clientCertType || OncMojo.createManagedString('');
} }
assertNotReached(); assertNotReached();
return undefined; return undefined;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment