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

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

Issue 983823002: Use GUID instead of servicePath in network settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_enable_extension_apis
Patch Set: . Created 5 years, 10 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 eabb44ef379d4e6ca6be5a0878b91e7271c1c572..af274b2bfb2f5c1d6482467e3c75e820689fc0c1 100644
--- a/chrome/browser/resources/options/chromeos/network_list.js
+++ b/chrome/browser/resources/options/chromeos/network_list.js
@@ -5,14 +5,13 @@
/**
* This partially describes the network list entries passed to
* refreshNetworkData. The contents of those lists actually match
- * CrOnc.NetworkConfigType with the addition of the policyManaged and
- * servicePath properties. TODO(stevenjb): Use networkingPrivate.getNetworks.
+ * CrOnc.NetworkConfigType with the addition of the policyManaged property.
+ * TODO(stevenjb): Use networkingPrivate.getNetworks.
* @typedef {{
* ConnectionState: string,
* GUID: string
* Type: string,
* policyManaged: boolean,
- * servicePath: string
* }}
* @see chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
*/
@@ -161,13 +160,13 @@ cr.define('options.network', function() {
}
/**
- * @param {string} servicePath The network service path.
+ * @param {string} guid The network GUID.
*/
- function showDetails(servicePath) {
- // TODO(stevenjb): chrome.networkingPrivate.getManagedProperties
- // (Note: we will need to provide DetailsInternetPage.initializeDetailsPage
- // as the callback).
- chrome.send('getManagedProperties', [servicePath]);
+ function showDetails(guid) {
+ chrome.networkingPrivate.getManagedProperties(
+ guid, function(oncProperties) {
pneubeck (no reviews) 2015/03/12 20:53:58 nit: as before, anonymous function not required
stevenjb 2015/03/13 01:20:14 Done.
+ DetailsInternetPage.initializeDetailsPage(oncProperties);
+ });
}
/**
@@ -717,11 +716,10 @@ cr.define('options.network', function() {
* @private
*/
createNetworkOptionsCallback_: function(parent, data) {
- var servicePath = data.servicePath;
var menuItem = createCallback_(parent,
data,
getNetworkName(data),
- showDetails.bind(null, servicePath));
+ showDetails.bind(null, data.GUID));
if (data.policyManaged)
menuItem.appendChild(new ManagedNetworkIndicator());
if (data.ConnectionState == 'Connected' ||
@@ -1033,9 +1031,9 @@ cr.define('options.network', function() {
var ethernetConnection = getConnection_(data.wiredList);
if (ethernetConnection) {
var type = String('Ethernet');
- var path = ethernetConnection.servicePath;
+ var guid = ethernetConnection.GUID;
var ethernetOptions = function() {
pneubeck (no reviews) 2015/03/12 20:53:58 nit: ... = showDetails.bind(null, ethernetConnecti
stevenjb 2015/03/13 01:20:14 Done.
- showDetails(path);
+ showDetails(guid);
};
networkList.update(
{ key: 'Ethernet',

Powered by Google App Engine
This is Rietveld 408576698