diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js')
-rw-r--r-- | chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js b/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js index 2e42c952c87..3351442766d 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js +++ b/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.js @@ -18,20 +18,14 @@ Polymer({ properties: { /** * The type of networks to list. - * @type {CrOnc.Type} + * @type {chromeos.networkConfig.mojom.NetworkType|undefined} */ networkType: { - type: String, + type: Number, observer: 'networkTypeChanged_', }, /** - * Interface for networkingPrivate calls, passed from internet_page. - * @type {NetworkingPrivate} - */ - networkingPrivate: Object, - - /** * List of all network state data for the network type. * @private {!Array<!OncMojo.NetworkStateProperties>} */ @@ -60,12 +54,7 @@ Polymer({ /** @private {string} */ selectedGuid_: '', - /** - * This UI will use both the networkingPrivate extension API and the - * networkConfig mojo API until we provide all of the required functionality - * in networkConfig. TODO(stevenjb): Remove use of networkingPrivate api. - * @private {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} - */ + /** @private {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */ networkConfig_: null, /** @override */ @@ -90,13 +79,13 @@ Polymer({ * @private */ refreshNetworks_: function() { - if (!this.networkType) { + if (this.networkType === undefined) { return; } const filter = { filter: chromeos.networkConfig.mojom.FilterType.kConfigured, - limit: chromeos.networkConfig.mojom.kNoLimit, - networkType: OncMojo.getNetworkTypeFromString(this.networkType), + limit: chromeos.networkConfig.mojom.NO_LIMIT, + networkType: this.networkType, }; this.networkConfig_.getNetworkStateList(filter).then(response => { this.networkStateList_ = response.result; @@ -201,19 +190,29 @@ Polymer({ /** @private */ onRemovePreferredTap_: function() { - this.setProperties_({priority: {value: 0}}); + assert(this.networkType !== undefined); + const config = OncMojo.getDefaultConfigProperties(this.networkType); + config.priority = {value: 0}; + this.setProperties_(config); /** @type {!CrActionMenuElement} */ (this.$.dotsMenu).close(); }, /** @private */ onAddPreferredTap_: function() { - this.setProperties_({priority: {value: 1}}); + assert(this.networkType !== undefined); + const config = OncMojo.getDefaultConfigProperties(this.networkType); + config.priority = {value: 1}; + this.setProperties_(config); /** @type {!CrActionMenuElement} */ (this.$.dotsMenu).close(); }, /** @private */ onForgetTap_: function() { - this.networkingPrivate.forgetNetwork(this.selectedGuid_); + this.networkConfig_.forgetNetwork(this.selectedGuid_).then(response => { + if (!response.success) { + console.error('Froget network failed for: ' + this.selectedGuid_); + } + }); /** @type {!CrActionMenuElement} */ (this.$.dotsMenu).close(); }, |