diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-03-26 10:23:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-26 17:23:54 +0000 |
| commit | 634eb9966e649e0bdf79901078befac59a4b937e (patch) | |
| tree | f389fbb427a7167d57fed3d86cf08bb4de1e351f /ui | |
| parent | 751416e1cab41302b8fecf1512764e266314cf8d (diff) | |
| download | chromium_src-634eb9966e649e0bdf79901078befac59a4b937e.zip chromium_src-634eb9966e649e0bdf79901078befac59a4b937e.tar.gz chromium_src-634eb9966e649e0bdf79901078befac59a4b937e.tar.bz2 | |
Add NetworkTechnology types to ONC
This also adds the network technology 1x badge to cr_network_icon
BUG=470282
Review URL: https://codereview.chromium.org/1033843003
Cr-Commit-Position: refs/heads/master@{#322409}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png | bin | 0 -> 498 bytes | |||
| -rw-r--r-- | ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js | 5 | ||||
| -rw-r--r-- | ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js | 5 | ||||
| -rw-r--r-- | ui/webui/resources/cr_elements_images.grdp | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png b/ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png Binary files differnew file mode 100644 index 0000000..2d11aee --- /dev/null +++ b/ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png 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 c70079e..322a7dc 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 @@ -40,7 +40,7 @@ function getIconTypeFromNetworkType(networkType) { else if (networkType == CrOnc.Type.VPN) return 'vpn'; - console.error('Unrecognized network type: ' + networkType); + console.error('Unrecognized network type for icon: ' + networkType); return 'ethernet'; } @@ -232,6 +232,9 @@ Polymer('cr-network-icon', { this.secure = false; var oncTechnology = networkState.getCellularTechnology(); switch (oncTechnology) { + case CrOnc.NetworkTechnology.CDMA1XRTT: + this.technology = '1x'; + break; case CrOnc.NetworkTechnology.EDGE: this.technology = 'edge'; break; diff --git a/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js b/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js index 3497315..87bc6d3 100644 --- a/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js +++ b/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js @@ -29,14 +29,15 @@ CrOnc.ConnectionState = { /** @enum {string} */ CrOnc.NetworkTechnology = { + CDMA1XRTT: 'CDMA1XRTT', EDGE: 'EDGE', EVDO: 'EVDO', GPRS: 'GPRS', GSM: 'GSM', HSPA: 'HSPA', - HSPA_PLUS: 'HSPA+', + HSPA_PLUS: 'HSPAPlus', LTE: 'LTE', - LTE_ADVANCED: 'LTE Advanced', + LTE_ADVANCED: 'LTEAdvanced', UMTS: 'UMTS', UNKNOWN: 'Unknown', }; diff --git a/ui/webui/resources/cr_elements_images.grdp b/ui/webui/resources/cr_elements_images.grdp index 46a3689..571301a 100644 --- a/ui/webui/resources/cr_elements_images.grdp +++ b/ui/webui/resources/cr_elements_images.grdp @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <grit-part> + <include name="IDR_WEBUI_CR_ELEMENTS_NETWORK_BADGE_CDMA1XRTT" + file="cr_elements/cr_network_icon/badge_1x.png" + type="BINDATA" /> <include name="IDR_WEBUI_CR_ELEMENTS_NETWORK_BADGE_3G" file="cr_elements/cr_network_icon/badge_3g.png" type="BINDATA" /> |
