| Index: chrome/browser/resources/options/chromeos/network_list.js
|
| diff --git a/chrome/browser/resources/options/chromeos/network_list.js b/chrome/browser/resources/options/chromeos/network_list.js
|
| index 2d629667ce7bb7200350854cf41630735dc729fe..052d1bac40a27cd45f198e0eff5cae593c9b54d7 100644
|
| --- a/chrome/browser/resources/options/chromeos/network_list.js
|
| +++ b/chrome/browser/resources/options/chromeos/network_list.js
|
| @@ -29,7 +29,7 @@ cr.define('options.network', function() {
|
| */
|
| Constants.NETWORK_ORDER = ['Ethernet',
|
| 'WiFi',
|
| - 'Wimax',
|
| + 'WiMAX',
|
| 'Cellular',
|
| 'VPN',
|
| 'addConnection'];
|
| @@ -539,7 +539,7 @@ cr.define('options.network', function() {
|
| }
|
| }
|
| }
|
| - if (this.data_.key == 'WiFi' || this.data_.key == 'Wimax' ||
|
| + if (this.data_.key == 'WiFi' || this.data_.key == 'WiMAX' ||
|
| this.data_.key == 'Cellular') {
|
| addendum.push({});
|
| if (this.data_.key == 'WiFi') {
|
| @@ -551,12 +551,12 @@ cr.define('options.network', function() {
|
| chrome.send('disableNetworkType', ['WiFi']);
|
| },
|
| data: {}});
|
| - } else if (this.data_.key == 'Wimax') {
|
| + } else if (this.data_.key == 'WiMAX') {
|
| addendum.push({
|
| label: loadTimeData.getString('turnOffWimax'),
|
| command: function() {
|
| // TODO(stevenjb): chrome.networkingPrivate.disableNetworkType
|
| - chrome.send('disableNetworkType', ['Wimax']);
|
| + chrome.send('disableNetworkType', ['WiMAX']);
|
| },
|
| data: {}});
|
| } else if (this.data_.key == 'Cellular') {
|
| @@ -1026,11 +1026,11 @@ cr.define('options.network', function() {
|
| // Only show wimax control if available. Uses cellular icons.
|
| if (data.wimaxAvailable) {
|
| if (data.wimaxEnabled)
|
| - loadData_('Wimax', data.wirelessList, data.rememberedList);
|
| + loadData_('WiMAX', data.wirelessList, data.rememberedList);
|
| else
|
| - addEnableNetworkButton_('Wimax');
|
| + addEnableNetworkButton_('WiMAX');
|
| } else {
|
| - networkList.deleteItem('Wimax');
|
| + networkList.deleteItem('WiMAX');
|
| }
|
|
|
| // Only show VPN control if there is at least one VPN configured.
|
| @@ -1048,7 +1048,7 @@ cr.define('options.network', function() {
|
| */
|
| function addEnableNetworkButton_(type) {
|
| var subtitle = loadTimeData.getString('networkDisabled');
|
| - var icon = (type == 'Wimax') ? 'Cellular' : type;
|
| + var icon = (type == 'WiMAX') ? 'Cellular' : type;
|
| var enableNetwork = function() {
|
| if (type == 'WiFi')
|
| sendChromeMetricsAction('Options_NetworkWifiToggle');
|
|
|