Add Source property to networkingPrivate.getState

chrome/browser/resources/chromeos/network_ui/network_ui.js

 // Copyright 2013 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.
 
 var NetworkUI = (function() {
   'use strict';
 
   // Properties to display in the network state table. Each entry can be either
   // a single state field or an array of state fields. If more than one is
   // specified then the first non empty value is used.
@@ skipping 14 matching lines @@
     'WiFi.SignalStrength'
   ];
 
   var FAVORITE_STATE_FIELDS = [
     'GUID',
     'service_path',
     'Name',
     'Type',
     'profile_path',
     'visible',
-    'onc_source'
+    'Source'
   ];
 
   /**
    * Returns the property associated with a key (which may reference a
    * sub-object).
    *
    * @param {Object} properties The object containing the network properties.
    * @param {string} key The ONC key for the property. May refer to a nested
    *     propety, e.g. 'WiFi.Security'.
    * @return {*} The value associated with the property.
@@ skipping 90 matching lines @@
     var table = $(tablename);
     var oldRows = table.querySelectorAll('.state-table-row');
     for (var i = 0; i < oldRows.length; ++i)
       table.removeChild(oldRows[i]);
     states.forEach(function(state) {
       table.appendChild(createStateTableRow(stateFields, state));
     });
   };
 
   /**
+   * Returns a valid HTMLElement id from |guid|.
+   *
+   * @param {string} guid A GUID which may start with a digit
+   * @return {string} A valid HTMLElement id.
+   */
+  var idFromGuid = function(guid) {
+    if (guid.substring(0, 1) == '{')

[pneubeck (no reviews), 2015/02/17 18:00:49]

can't you just remove all '{' and '}' or replace them by a valid character?
seems weird to handle such a specific case.

[stevenjb, 2015/02/17 18:23:30]

Sure, that works also.

+      guid = guid.substring(1, guid.length - 2);
+    return '_' + guid;
+  };
+
+  /**
    * This callback function is triggered when visible networks are received.
    *
    * @param {Array} states A list of network state information for each
    *     visible network.
    */
   var onVisibleNetworksReceived = function(states) {
     createStateTable('network-state-table', NETWORK_STATE_FIELDS, states);
   };
 
   /**
@@ skipping 35 matching lines @@
    * @return {!HTMLElement} The created tr element for the expanded row.
    */
   var createExpandedRow = function(guid, baseRow) {
     var expandedRow = /** @type {!HTMLElement} */ (
       document.createElement('tr'));
     expandedRow.className = 'state-table-row';
     var emptyCell = document.createElement('td');
     emptyCell.style.border = 'none';
     expandedRow.appendChild(emptyCell);
     var detailCell = document.createElement('td');
-    detailCell.id = guid;
+    detailCell.id = idFromGuid(guid);
     detailCell.className = 'state-table-expanded-cell';
     detailCell.colSpan = baseRow.childNodes.length - 1;
     expandedRow.appendChild(detailCell);
     var showDetail = function(state, error) {
       if (error && error.message)
         detailCell.textContent = error.message;
       else
         detailCell.textContent = JSON.stringify(state, null, '\t');
     };
     var selected = $('get-property-format').selectedIndex;
@@ skipping 17 matching lines @@
    *     just the 'GUID' and 'ShillError' properties if the call failed.
    */
   var getShillPropertiesResult = function(args) {
     var properties = args.shift();
     var guid = properties['GUID'];
     if (!guid) {
       console.error('No GUID in getShillPropertiesResult');
       return;
     }
 
-    var detailCell = document.querySelector('td#' + guid);
+    var detailCell = document.querySelector('td#' + idFromGuid(guid));
     if (!detailCell) {
       console.error('No cell for GUID: ' + guid);
       return;
     }
 
     if (properties['ShillError'])
       detailCell.textContent = properties['ShillError'];
     else
       detailCell.textContent = JSON.stringify(properties, null, '\t');
 
@@ skipping 24 matching lines @@
   document.addEventListener('DOMContentLoaded', function() {
     $('refresh').onclick = requestNetworks;
     setRefresh();
     requestNetworks();
   });
 
   return {
     getShillPropertiesResult: getShillPropertiesResult
   };
 })();