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

Unified Diff: chrome/browser/resources/options/chromeos/network_list.js

Issue 2939273002: DO NOT SUBMIT: what chrome/browser/resources/ could eventually look like with clang-format (Closed)
Patch Set: Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
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 7b75858cbb8a14f206f269aa38b50279d8e8d483..1a0842fc39bdd2f197a10724e21ebe4db572c715 100644
--- a/chrome/browser/resources/options/chromeos/network_list.js
+++ b/chrome/browser/resources/options/chromeos/network_list.js
@@ -61,12 +61,8 @@ cr.define('options.network', function() {
/**
* Order in which controls are to appear in the network list sorted by key.
*/
- Constants.NETWORK_ORDER = ['Ethernet',
- 'WiFi',
- 'WiMAX',
- 'Cellular',
- 'VPN',
- 'addConnection'];
+ Constants.NETWORK_ORDER =
+ ['Ethernet', 'WiFi', 'WiMAX', 'Cellular', 'VPN', 'addConnection'];
/**
* ID of the menu that is currently visible.
@@ -169,7 +165,7 @@ cr.define('options.network', function() {
*/
function showDetails(guid) {
chrome.networkingPrivate.getManagedProperties(
- guid, DetailsInternetPage.initializeDetailsPage);
+ guid, DetailsInternetPage.initializeDetailsPage);
}
/**
@@ -350,8 +346,8 @@ cr.define('options.network', function() {
if (this.data.iconType)
this.iconType = this.data.iconType;
this.addEventListener('click', (function() {
- this.showMenu();
- }).bind(this));
+ this.showMenu();
+ }).bind(this));
},
/**
@@ -543,7 +539,9 @@ cr.define('options.network', function() {
// is deferred in order to ensure that position of this element has
// beem properly updated.
var self = this;
- setTimeout(function() {self.showMenu();}, 0);
+ setTimeout(function() {
+ self.showMenu();
+ }, 0);
}
},
@@ -573,8 +571,8 @@ cr.define('options.network', function() {
}
addendum.push(item);
} else if (this.data_.key == 'Cellular') {
- if (cellularDevice.State == 'Enabled' &&
- cellularNetwork && cellularNetwork.Cellular &&
+ if (cellularDevice.State == 'Enabled' && cellularNetwork &&
+ cellularNetwork.Cellular &&
cellularNetwork.Cellular.SupportNetworkScan) {
addendum.push({
label: loadTimeData.getString('otherCellularNetworks'),
@@ -584,11 +582,10 @@ cr.define('options.network', function() {
});
}
- var label = enableDataRoaming ? 'disableDataRoaming' :
- 'enableDataRoaming';
+ var label =
+ enableDataRoaming ? 'disableDataRoaming' : 'enableDataRoaming';
var disabled = !loadTimeData.getValue('loggedInAsOwner');
- var entry = {label: loadTimeData.getString(label),
- data: {}};
+ var entry = {label: loadTimeData.getString(label), data: {}};
if (disabled) {
entry.command = null;
entry.tooltip =
@@ -597,8 +594,7 @@ cr.define('options.network', function() {
var self = this;
entry.command = function() {
options.Preferences.setBooleanPref(
- 'cros.signed.data_roaming_enabled',
- !enableDataRoaming, true);
+ 'cros.signed.data_roaming_enabled', !enableDataRoaming, true);
// Force revalidation of the menu the next time it is displayed.
self.menu_ = null;
};
@@ -617,9 +613,11 @@ cr.define('options.network', function() {
dialog.update(list);
sendChromeMetricsAction('Options_NetworkShowPreferred');
};
- addendum.push({label: loadTimeData.getString('preferredNetworks'),
- command: callback,
- data: list});
+ addendum.push({
+ label: loadTimeData.getString('preferredNetworks'),
+ command: callback,
+ data: list
+ });
}
var networkGroup = this.ownerDocument.createElement('div');
@@ -645,9 +643,11 @@ cr.define('options.network', function() {
};
// Add separator
addendum.push({});
- addendum.push({label: loadTimeData.getString('disconnectNetwork'),
- command: disconnectCallback,
- data: data});
+ addendum.push({
+ label: loadTimeData.getString('disconnectNetwork'),
+ command: disconnectCallback,
+ data: data
+ });
}
}
if (this.data_.key == 'WiFi' || this.data_.key == 'WiMAX' ||
@@ -661,7 +661,8 @@ cr.define('options.network', function() {
chrome.networkingPrivate.disableNetworkType(
chrome.networkingPrivate.NetworkType.WI_FI);
},
- data: {}});
+ data: {}
+ });
} else if (this.data_.key == 'WiMAX') {
addendum.push({
label: loadTimeData.getString('turnOffWimax'),
@@ -669,7 +670,8 @@ cr.define('options.network', function() {
chrome.networkingPrivate.disableNetworkType(
chrome.networkingPrivate.NetworkType.WI_MAX);
},
- data: {}});
+ data: {}
+ });
} else if (this.data_.key == 'Cellular') {
addendum.push({
label: loadTimeData.getString('turnOffCellular'),
@@ -677,7 +679,8 @@ cr.define('options.network', function() {
chrome.networkingPrivate.disableNetworkType(
chrome.networkingPrivate.NetworkType.CELLULAR);
},
- data: {}});
+ data: {}
+ });
}
}
if (!empty)
@@ -691,8 +694,8 @@ cr.define('options.network', function() {
for (var i = 0; i < addendum.length; i++) {
var value = addendum[i];
if (value.data) {
- var item = createCallback_(menu, value.data, value.label,
- value.command);
+ var item =
+ createCallback_(menu, value.data, value.label, value.command);
if (value.tooltip)
item.title = value.tooltip;
if (value.addClass)
@@ -733,8 +736,8 @@ cr.define('options.network', function() {
var newNetworkButtons = this.extractNetworkConnectButtons_(newMenu);
for (var key in oldNetworkButtons) {
if (newNetworkButtons[key]) {
- group.replaceChild(newNetworkButtons[key].button,
- oldNetworkButtons[key].button);
+ group.replaceChild(
+ newNetworkButtons[key].button, oldNetworkButtons[key].button);
if (newNetworkButtons[key].index != oldNetworkButtons[key].index)
discardOnClose = true;
newNetworkButtons[key] = null;
@@ -786,23 +789,19 @@ cr.define('options.network', function() {
var menuItem = null;
if (data.Type == 'WiFi' && !allowUnmanagedNetworks_() &&
!isManaged(data.Source)) {
- menuItem = createCallback_(parent,
- data,
- getNetworkName(data),
- null);
+ menuItem = createCallback_(parent, data, getNetworkName(data), null);
menuItem.title = loadTimeData.getString('prohibitedNetwork');
} else {
- menuItem = createCallback_(parent,
- data,
- getNetworkName(data),
- showDetails.bind(null, data.GUID));
+ menuItem = createCallback_(
+ parent, data, getNetworkName(data),
+ showDetails.bind(null, data.GUID));
}
if (isManaged(data.Source))
menuItem.appendChild(new ManagedNetworkIndicator());
if (data.ConnectionState == 'Connected' ||
data.ConnectionState == 'Connecting') {
- var label = menuItem.getElementsByClassName(
- 'network-menu-item-label')[0];
+ var label =
+ menuItem.getElementsByClassName('network-menu-item-label')[0];
label.classList.add('active-network');
}
}
@@ -830,7 +829,7 @@ cr.define('options.network', function() {
if (this.data.subtitle)
this.subtitle = this.data.subtitle;
else
- this.subtitle = null;
+ this.subtitle = null;
if (this.data.command)
this.addEventListener('click', this.data.command);
if (this.data.iconData)
@@ -875,12 +874,12 @@ cr.define('options.network', function() {
if (command != null) {
if (data) {
callback = function() {
- (/** @type {Function} */(command))(data);
+ (/** @type {Function} */ (command))(data);
closeMenu_();
};
} else {
callback = function() {
- (/** @type {Function} */(command))();
+ (/** @type {Function} */ (command))();
closeMenu_();
};
}
@@ -914,8 +913,8 @@ cr.define('options.network', function() {
this.dataModel = new ArrayDataModel([]);
this.selectionModel = new ListSingleSelectionModel();
this.addEventListener('blur', this.onBlur_.bind(this));
- this.selectionModel.addEventListener('change',
- this.onSelectionChange_.bind(this));
+ this.selectionModel.addEventListener(
+ 'change', this.onSelectionChange_.bind(this));
// Wi-Fi control is always visible.
this.update({key: 'WiFi', networkList: []});
@@ -923,8 +922,8 @@ cr.define('options.network', function() {
this.updateAddConnectionMenuEntries_();
var prefs = options.Preferences.getInstance();
- prefs.addEventListener('cros.signed.data_roaming_enabled',
- function(event) {
+ prefs.addEventListener(
+ 'cros.signed.data_roaming_enabled', function(event) {
enableDataRoaming = event.value.value;
});
this.endBatchUpdates();
@@ -956,9 +955,7 @@ cr.define('options.network', function() {
onNetworkListChanged_: function() {
var networkList = this;
chrome.networkingPrivate.getDeviceStates(function(deviceStates) {
- var filter = {
- networkType: chrome.networkingPrivate.NetworkType.ALL
- };
+ var filter = {networkType: chrome.networkingPrivate.NetworkType.ALL};
chrome.networkingPrivate.getNetworks(filter, function(networkStates) {
networkList.updateNetworkStates(deviceStates, networkStates);
});
@@ -1054,10 +1051,8 @@ cr.define('options.network', function() {
command: createAddNonVPNConnectionCallback_('WiFi')
}];
entries = entries.concat(createAddVPNConnectionEntries_());
- this.update({key: 'addConnection',
- iconType: 'add-connection',
- menu: entries
- });
+ this.update(
+ {key: 'addConnection', iconType: 'add-connection', menu: entries});
},
/**
@@ -1086,10 +1081,9 @@ cr.define('options.network', function() {
return;
}
- if (e.key == 'Enter' ||
- e.key == ' ' /* Space */) {
- var selectedListItem = this.getListItemByIndex(
- this.selectionModel.selectedIndex);
+ if (e.key == 'Enter' || e.key == ' ' /* Space */) {
+ var selectedListItem =
+ this.getListItemByIndex(this.selectionModel.selectedIndex);
if (selectedListItem) {
selectedListItem.click();
return;
@@ -1193,7 +1187,7 @@ cr.define('options.network', function() {
(entry));
if (entry.command)
return new NetworkButtonItem(
- /** @type {{key: string, subtitle: string, command: Function}} */(
+ /** @type {{key: string, subtitle: string, command: Function}} */ (
entry));
if (entry.menu)
return new NetworkMenuItem(entry);
@@ -1289,20 +1283,21 @@ cr.define('options.network', function() {
subtitle = loadTimeData.getString('OncConnectionStateConnecting');
else
subtitle = loadTimeData.getString('OncConnectionStateNotConnected');
- this.update(
- { key: 'Ethernet',
- subtitle: subtitle,
- iconData: ethernetNetwork,
- command: ethernetOptions,
- Source: ethernetNetwork.Source }
- );
+ this.update({
+ key: 'Ethernet',
+ subtitle: subtitle,
+ iconData: ethernetNetwork,
+ command: ethernetOptions,
+ Source: ethernetNetwork.Source
+ });
} else {
this.deleteItem('Ethernet');
}
if (wifiDeviceState == 'Enabled')
loadData_('WiFi', networkStates);
- else if (wifiDeviceState ==
+ else if (
+ wifiDeviceState ==
chrome.networkingPrivate.DeviceStateType.PROHIBITED)
setTechnologiesProhibited_(chrome.networkingPrivate.NetworkType.WI_FI);
else
@@ -1314,7 +1309,8 @@ cr.define('options.network', function() {
!isCellularSimAbsent(cellularDevice) &&
!isCellularSimLocked(cellularDevice)) {
loadData_('Cellular', networkStates);
- } else if (cellularDevice.State ==
+ } else if (
+ cellularDevice.State ==
chrome.networkingPrivate.DeviceStateType.PROHIBITED) {
setTechnologiesProhibited_(
chrome.networkingPrivate.NetworkType.CELLULAR);
@@ -1330,7 +1326,8 @@ cr.define('options.network', function() {
if (wimaxDeviceState) {
if (wimaxDeviceState == 'Enabled') {
loadData_('WiMAX', networkStates);
- } else if (wimaxDeviceState ==
+ } else if (
+ wimaxDeviceState ==
chrome.networkingPrivate.DeviceStateType.PROHIBITED) {
setTechnologiesProhibited_(
chrome.networkingPrivate.NetworkType.WI_MAX);
@@ -1370,10 +1367,12 @@ cr.define('options.network', function() {
}
chrome.networkingPrivate.enableNetworkType(type);
};
- $('network-list').update({key: type,
- subtitle: subtitle,
- iconType: type,
- command: enableNetwork});
+ $('network-list').update({
+ key: type,
+ subtitle: subtitle,
+ iconType: type,
+ command: enableNetwork
+ });
}
/**
@@ -1388,10 +1387,12 @@ cr.define('options.network', function() {
this.removeAttribute('selected');
this.parentNode.removeAttribute('has-element-focus');
};
- $('network-list').update({key: type,
- subtitle: subtitle,
- iconType: type,
- command: doNothingButRemoveClickShadow});
+ $('network-list').update({
+ key: type,
+ subtitle: subtitle,
+ iconType: type,
+ command: doNothingButRemoveClickShadow
+ });
}
/**
@@ -1525,11 +1526,11 @@ cr.define('options.network', function() {
*/
function createVPNConnectionCallback_(opt_extensionID) {
return function() {
- sendChromeMetricsAction(opt_extensionID ?
- 'Options_NetworkAddVPNThirdParty' :
- 'Options_NetworkAddVPNBuiltIn');
- chrome.send('addVPNConnection',
- opt_extensionID ? [opt_extensionID] : undefined);
+ sendChromeMetricsAction(
+ opt_extensionID ? 'Options_NetworkAddVPNThirdParty' :
+ 'Options_NetworkAddVPNBuiltIn');
+ chrome.send(
+ 'addVPNConnection', opt_extensionID ? [opt_extensionID] : undefined);
};
}
@@ -1545,8 +1546,8 @@ cr.define('options.network', function() {
for (var i = 0; i < vpnProviders.length; ++i) {
var provider = vpnProviders[i];
entries.push({
- label: loadTimeData.getStringF('addConnectionVPNTemplate',
- provider.ProviderName),
+ label: loadTimeData.getStringF(
+ 'addConnectionVPNTemplate', provider.ProviderName),
command: createVPNConnectionCallback_(provider.ExtensionID),
data: {}
});
@@ -1578,7 +1579,5 @@ cr.define('options.network', function() {
cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
// Export
- return {
- NetworkList: NetworkList
- };
+ return {NetworkList: NetworkList};
});

Powered by Google App Engine
This is Rietveld 408576698