| Index: ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
|
| diff --git a/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js b/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
|
| index 322a7dc27d7265c87707fb9e4c299db0811f2f62..95cfa948714dc56261577e1e0c218385800304c3 100644
|
| --- a/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
|
| +++ b/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
|
| @@ -25,19 +25,20 @@ var IconParams;
|
| /**
|
| * Gets the icon type from the network type. This allows multiple types
|
| * (i.e. Cellular, WiMAX) to map to the same icon type (i.e. mobile).
|
| - * @param {CrOnc.Type} networkType The ONC network type.
|
| + * @param {chrome.networkingPrivate.NetworkType} networkType The ONC network
|
| + * type.
|
| * @return {string} The icon type: ethernet, wifi, mobile, or vpn.
|
| */
|
| function getIconTypeFromNetworkType(networkType) {
|
| - if (networkType == CrOnc.Type.ETHERNET)
|
| + if (networkType == chrome.networkingPrivate.NetworkType.Ethernet)
|
| return 'ethernet';
|
| - else if (networkType == CrOnc.Type.WIFI)
|
| + else if (networkType == chrome.networkingPrivate.NetworkType.WiFi)
|
| return 'wifi';
|
| - else if (networkType == CrOnc.Type.CELLULAR)
|
| + else if (networkType == chrome.networkingPrivate.NetworkType.Cellular)
|
| return 'mobile';
|
| - else if (networkType == CrOnc.Type.WIMAX)
|
| + else if (networkType == chrome.networkingPrivate.NetworkType.WiMAX)
|
| return 'mobile';
|
| - else if (networkType == CrOnc.Type.VPN)
|
| + else if (networkType == chrome.networkingPrivate.NetworkType.VPN)
|
| return 'vpn';
|
|
|
| console.error('Unrecognized network type for icon: ' + networkType);
|
| @@ -87,7 +88,7 @@ Polymer('cr-network-icon', {
|
| * If set, the ONC network type will be used to display the icon.
|
| *
|
| * @attribute networkType
|
| - * @type CrOnc.Type
|
| + * @type chrome.networkingPrivate.NetworkType
|
| * @default null
|
| */
|
| networkType: null,
|
| @@ -218,46 +219,45 @@ Polymer('cr-network-icon', {
|
|
|
| var type =
|
| (params.showBadges && networkState) ? networkState.data.Type : '';
|
| - if (type == CrOnc.Type.WIFI) {
|
| + if (type == chrome.networkingPrivate.NetworkType.WiFi) {
|
| this.roaming = false;
|
| this.secure = networkState.getWiFiSecurity() != 'None';
|
| this.technology = '';
|
| - } else if (type == CrOnc.Type.WIMAX) {
|
| + } else if (type == chrome.networkingPrivate.NetworkType.WiMAX) {
|
| this.roaming = false;
|
| this.secure = false;
|
| this.technology = '4g';
|
| - } else if (type == CrOnc.Type.CELLULAR) {
|
| - this.roaming =
|
| - networkState.getCellularRoamingState() == CrOnc.RoamingState.ROAMING;
|
| + } else if (type == chrome.networkingPrivate.NetworkType.Cellular) {
|
| + this.roaming = networkState.getCellularRoamingState() == 'Roaming';
|
| this.secure = false;
|
| var oncTechnology = networkState.getCellularTechnology();
|
| switch (oncTechnology) {
|
| - case CrOnc.NetworkTechnology.CDMA1XRTT:
|
| + case 'CDMA1XRTT':
|
| this.technology = '1x';
|
| break;
|
| - case CrOnc.NetworkTechnology.EDGE:
|
| + case 'EDGE':
|
| this.technology = 'edge';
|
| break;
|
| - case CrOnc.NetworkTechnology.EVDO:
|
| + case 'EVDO':
|
| this.technology = 'evdo';
|
| break;
|
| - case CrOnc.NetworkTechnology.GPRS:
|
| - case CrOnc.NetworkTechnology.GSM:
|
| + case 'GPRS':
|
| + case 'GSM':
|
| this.technology = 'gsm';
|
| break;
|
| - case CrOnc.NetworkTechnology.HSPA:
|
| + case 'HSPA':
|
| this.technology = 'hspa';
|
| break;
|
| - case CrOnc.NetworkTechnology.HSPA_PLUS:
|
| + case 'HSPAPlus':
|
| this.technology = 'hspa_plus';
|
| break;
|
| - case CrOnc.NetworkTechnology.LTE:
|
| + case 'LTE':
|
| this.technology = 'lte';
|
| break;
|
| - case CrOnc.NetworkTechnology.LTE_ADVANCED:
|
| + case 'LTEAdvanced':
|
| this.technology = 'lte_advanced';
|
| break;
|
| - case CrOnc.NetworkTechnology.UMTS:
|
| + case 'UMTS':
|
| this.technology = '3g';
|
| break;
|
| }
|
|
|