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

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_subpage.js

Issue 2963453002: Settings: Network: Fix logic building VPN list from Tether merge. (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview Polymer element for displaying information about WiFi, 6 * @fileoverview Polymer element for displaying information about WiFi,
7 * WiMAX, or virtual networks. 7 * WiMAX, or virtual networks.
8 */ 8 */
9 9
10 Polymer({ 10 Polymer({
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 for (var i = 0; i < networkStates.length; ++i) { 212 for (var i = 0; i < networkStates.length; ++i) {
213 var state = networkStates[i]; 213 var state = networkStates[i];
214 var providerType = state.VPN && state.VPN.ThirdPartyVPN && 214 var providerType = state.VPN && state.VPN.ThirdPartyVPN &&
215 state.VPN.ThirdPartyVPN.ProviderName; 215 state.VPN.ThirdPartyVPN.ProviderName;
216 if (providerType) { 216 if (providerType) {
217 thirdPartyVpns[providerType] = thirdPartyVpns[providerType] || []; 217 thirdPartyVpns[providerType] = thirdPartyVpns[providerType] || [];
218 thirdPartyVpns[providerType].push(state); 218 thirdPartyVpns[providerType].push(state);
219 } else { 219 } else {
220 builtinNetworkStates.push(state); 220 builtinNetworkStates.push(state);
221 } 221 }
222 networkStates = builtinNetworkStates;
223 this.thirdPartyVpns_ = thirdPartyVpns;
224 } 222 }
223 networkStates = builtinNetworkStates;
224 this.thirdPartyVpns_ = thirdPartyVpns;
225 } 225 }
226 226
227 this.networkStateList_ = networkStates; 227 this.networkStateList_ = networkStates;
228 }, 228 },
229 229
230 /** 230 /**
231 * @param {!CrOnc.DeviceStateProperties|undefined} deviceState 231 * @param {!CrOnc.DeviceStateProperties|undefined} deviceState
232 * @return {boolean} Whether or not the device state is enabled. 232 * @return {boolean} Whether or not the device state is enabled.
233 * @private 233 * @private
234 */ 234 */
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 470
471 /** 471 /**
472 * @param {*} lhs 472 * @param {*} lhs
473 * @param {*} rhs 473 * @param {*} rhs
474 * @return {boolean} 474 * @return {boolean}
475 */ 475 */
476 isEqual_: function(lhs, rhs) { 476 isEqual_: function(lhs, rhs) {
477 return lhs === rhs; 477 return lhs === rhs;
478 }, 478 },
479 }); 479 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698