Use GUID instead of servicePath in network settings

chrome/browser/resources/options/chromeos/network_list.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * 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
  */
 var NetworkInfo;
 
 cr.define('options.network', function() {
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var List = cr.ui.List;
   var ListItem = cr.ui.ListItem;
   var ListSingleSelectionModel = cr.ui.ListSingleSelectionModel;
@@ skipping 128 matching lines @@
   }
 
   /**
    * @param {string} action An action to send to coreOptionsUserMetricsAction.
    */
   function sendChromeMetricsAction(action) {
     chrome.send('coreOptionsUserMetricsAction', [action]);
   }
 
   /**
-   * @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);
+      });
   }
 
   /**
    * Decorate an element as a NetworkListItem.
    * @param {!Element} el The element to decorate.
    */
   NetworkListItem.decorate = function(el) {
     el.__proto__ = NetworkListItem.prototype;
     el.decorate();
   };
@@ skipping 529 matching lines @@
       return networkButtons;
     },
 
     /**
      * Adds a menu item for showing network details.
      * @param {!Element} parent The parent element.
      * @param {Object} data Description of the network.
      * @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' ||
           data.ConnectionState == 'Connecting') {
         var label = menuItem.getElementsByClassName(
             'network-menu-item-label')[0];
         label.classList.add('active-network');
       }
     }
   };
@@ skipping 291 matching lines @@
     cellularSupportsScan_ = data.cellularSupportsScan;
     cellularSimAbsent_ = data.cellularSimAbsent;
     cellularSimLockType_ = data.cellularSimLockType;
     wimaxAvailable_ = data.wimaxAvailable;
     wimaxEnabled_ = data.wimaxEnabled;
 
     // Only show Ethernet control if connected.
     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, ethernetConnection.GUID);

[stevenjb, 2015/03/13 01:20:14]

Done.

-        showDetails(path);
+        showDetails(guid);
       };
       networkList.update(
           { key: 'Ethernet',
             subtitle: loadTimeData.getString('OncConnectionStateConnected'),
             iconData: ethernetConnection,
             command: ethernetOptions,
             policyManaged: ethernetConnection.policyManaged }
           );
     } else {
       networkList.deleteItem('Ethernet');
@@ skipping 192 matching lines @@
   /**
    * Whether the Network list is disabled. Only used for display purpose.
    */
   cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     NetworkList: NetworkList
   };
 });