Index: chrome/browser/resources/settings/internet_page/internet_detail_page.js |
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
index 90f58da001864f6f6577883b921e4f8f9bb38fe8..0f7fe07f2f043ed72d9c9444efac141f1defa151 100644 |
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
@@ -164,7 +164,7 @@ Polymer({ |
// Update the detail page title. |
this.parentNode.pageTitle = |
- CrOnc.getNetworkName(this.networkProperties, this.i18n); |
+ CrOnc.getNetworkName(this.networkProperties, this, this.i18n); |
}, |
/** @private */ |
@@ -621,13 +621,16 @@ Polymer({ |
'RestrictedConnectivity', 'Cellular.ServingOperator.Name'); |
} |
if (this.networkProperties.Type == CrOnc.Type.VPN) { |
- fields.push('VPN.Host', 'VPN.Type'); |
- if (this.networkProperties.VPN.Type == 'OpenVPN') |
- fields.push('VPN.OpenVPN.Username'); |
- else if (this.networkProperties.VPN.Type == 'L2TP-IPsec') |
- fields.push('VPN.L2TP.Username'); |
- else if (this.networkProperties.VPN.Type == 'ThirdPartyVPN') |
+ let vpnType = CrOnc.getActiveValue(this.networkProperties.VPN.Type); |
+ if (vpnType == 'ThirdPartyVPN') { |
fields.push('VPN.ThirdPartyVPN.ProviderName'); |
+ } else { |
+ fields.push('VPN.Host', 'VPN.Type'); |
+ if (vpnType == 'OpenVPN') |
+ fields.push('VPN.OpenVPN.Username'); |
+ else if (vpnType == 'L2TP-IPsec') |
+ fields.push('VPN.L2TP.Username'); |
+ } |
} |
if (this.networkProperties.Type == CrOnc.Type.WI_FI) |
fields.push('RestrictedConnectivity'); |
@@ -703,6 +706,14 @@ Polymer({ |
}, |
/** |
+ * @return {boolean} |
+ * @private |
+ */ |
+ hasAdvancedOrDeviceFields_: function() { |
+ return this.hasAdvancedFields_() || this.hasDeviceFields_(); |
+ }, |
+ |
+ /** |
* @return {boolean} True if the network section should be shown. |
* @private |
*/ |