Replace chrome://network implementation with networkConfig API

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

Index: chrome/browser/resources/chromeos/network_ui/network_ui.js
diff --git a/chrome/browser/resources/chromeos/network.js b/chrome/browser/resources/chromeos/network_ui/network_ui.js
similarity index 67%
rename from chrome/browser/resources/chromeos/network.js
rename to chrome/browser/resources/chromeos/network_ui/network_ui.js
index 4f952bc1d55c77d75aae979282600fd17d9bf715..62039eae24f39f72ec71d7903af74cfe431a7ef2 100644
--- a/chrome/browser/resources/chromeos/network.js
+++ b/chrome/browser/resources/chromeos/network_ui/network_ui.js
@@ -2,20 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-var NetworkUI = function() {
+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.
   var NETWORK_STATE_FIELDS = [
-    'Name', 'Type', 'State', 'Profile', 'Connectable',
-    'Error', 'Security',
-    ['Cellular.NetworkTechnology', 'EAP.EAP'],
-    'Cellular.ActivationState', 'Cellular.RoamingState',
-    'Cellular.OutOfCredits', 'Strength'
+    'GUID',
+    'Name',
+    'Type',
+    'ConnectionState',
+    'ErrorState',
+    'WiFi.Security',
+    ['Cellular.NetworkTechnology',
+     'EAP.EAP'],
+    'Cellular.ActivationState',
+    'Cellular.RoamingState',
+    'Cellular.OutOfCredits',
+    'WiFi.SignalStrength'
   ];
 
   var FAVORITE_STATE_FIELDS = [
-    'Name', 'Type', 'Profile', 'onc_source'
+    'GUID',
+    'Name',
+    'Type',
+    'Profile',
+    'OncSource'

[pneubeck (no reviews), 2014/05/22 16:24:20]

In network_util.cc you use 'onc_source' (I commented it there too).

[stevenjb, 2014/05/23 21:50:59]

I went back and fort with this. I'll stick with 'onc_source' since it's a
non-standard debugging property.

   ];
 
   var LOG_LEVEL_CLASSNAME = {
@@ -100,14 +113,15 @@ var NetworkUI = function() {
    * @param {dictionary} state Property values for the network or favorite.

[xiyuan, 2014/05/21 21:22:28]

Update the doc here.

[stevenjb, 2014/05/23 21:50:59]

Done.

    * @return {DOMElement} The created td element that displays the given value.
    */
-  var createStateTableExpandButton = function(state) {
+  var createStateTableExpandButton = function(guid) {
     var cell = document.createElement('td');
     cell.className = 'state-table-expand-button-cell';
     var button = document.createElement('button');
     button.addEventListener('click', function(event) {
-      toggleExpandRow(event.target, state);
+      toggleExpandRow(event.target, guid);
     });
     button.className = 'state-table-expand-button';
+    button.innerHTML = '+';

[xiyuan, 2014/05/21 21:22:28]

Use .textContent instead of .innerHTML
Here and other places.

[stevenjb, 2014/05/23 21:50:59]

Done.

     cell.appendChild(button);
     return cell;
   };
@@ -128,32 +142,29 @@ var NetworkUI = function() {
    * Create a row in the network state table.
    *
    * @param {string} stateFields The state fields to use for the row.

[pneubeck (no reviews), 2014/05/22 16:24:20]

string -> Array

[stevenjb, 2014/05/23 21:50:59]

Done.

-   * @param {string} path The network or favorite path.
    * @param {dictionary} state Property values for the network or favorite.
    * @return {DOMElement} The created tr element that contains the network
    *     state information.
    */
-  var createStateTableRow = function(stateFields, path, state) {
+  var createStateTableRow = function(stateFields, state) {
     var row = document.createElement('tr');
     row.className = 'state-table-row';
-    row.appendChild(createStateTableExpandButton(state));
-    row.appendChild(createStateTableCell(path));
-    var guid = state['GUID'];
-    if (guid)
-      guid = guid.slice(1, 9);
-    row.appendChild(createStateTableCell(guid));
+    var guid = networkConfig.getValueFromProperties(state, 'GUID');

[pneubeck (no reviews), 2014/05/22 16:24:20]

equivalent to 'networkConfig.GUID'
better use the simple form or add some error handling to getValueFromProperties
if the property is missing.

[stevenjb, 2014/05/23 21:50:59]

Done.

+    row.appendChild(createStateTableExpandButton(guid));
     for (var i = 0; i < stateFields.length; ++i) {
       var field = stateFields[i];
       var value = '';
       if (typeof field == 'string') {
-        value = state[field];
+        value = networkConfig.getValueFromProperties(state, field);
       } else {
         for (var j = 0; j < field.length; ++j) {
-          value = state[field[j]];
+          value = networkConfig.getValueFromProperties(state, field[j]);
           if (value)
             break;
         }
       }
+      if (field == 'GUID' && field[0] != '/')

[xiyuan, 2014/05/21 21:22:28]

Did you mean "||" rather than "&&"?

[pneubeck (no reviews), 2014/05/22 16:24:20]

what does the "field[0] != '/'" check mean?
if correct, then please document what it's for and where the '/' comes from.

[stevenjb, 2014/05/23 21:50:59]

This is leftover from when the GUID was sometimes a service path. Fixed.

+        value = value.slice(0, 12);
       row.appendChild(createStateTableCell(value));
     }
     return row;
@@ -171,22 +182,38 @@ var NetworkUI = function() {
     var oldRows = table.querySelectorAll('.state-table-row');
     for (var i = 0; i < oldRows.length; ++i)
       table.removeChild(oldRows[i]);
-    for (var path in states)
-      table.appendChild(createStateTableRow(stateFields, path, states[path]));
+    states.forEach(function(state) {
+      table.appendChild(createStateTableRow(stateFields, state));
+    });
   };
 
   /**
-   * This callback function is triggered when the data is received.
+   * This callback function is triggered when the network log is received.
    *
-   * @param {dictionary} data A dictionary that contains network state
-   *     information.
+   * @param {dictionary} data A JSON structure of event log entries.

[xiyuan, 2014/05/21 21:22:28]

nit: dictionary -> Object

[pneubeck (no reviews), 2014/05/22 16:24:20]

and every other such occurrence

[stevenjb, 2014/05/23 21:50:59]

Done.

    */
-  var onNetworkInfoReceived = function(data) {
-    createEventLog(JSON.parse(data.networkEventLog));
-    createStateTable(
-        'network-state-table', NETWORK_STATE_FIELDS, data.networkStates);
-    createStateTable(
-        'favorite-state-table', FAVORITE_STATE_FIELDS, data.favoriteStates);
+  var getNetworkLogCallback = function(data) {
+    createEventLog(JSON.parse(data));
+  };
+
+  /**
+   * This callback function is triggered when visible networks are received.
+   *
+   * @param {dictionary} data A list of network state information for each

[pneubeck (no reviews), 2014/05/22 16:24:20]

dictionary -> Array.<Object>

[stevenjb, 2014/05/23 21:50:59]

Done.

+   *     visible network.
+   */
+  var onVisibleNetworksReceived = function(states) {
+    createStateTable('network-state-table', NETWORK_STATE_FIELDS, states);
+  };
+
+  /**
+   * This callback function is triggered when favorite networks are received.
+   *
+   * @param {dictionary} data A list of network state information for each

[pneubeck (no reviews), 2014/05/22 16:24:20]

dictionary -> Array.<Object>

[stevenjb, 2014/05/23 21:50:59]

Done.

+   *     favorite network.
+   */
+  var onFavoriteNetworksReceived = function(states) {
+    createStateTable('favorite-state-table', FAVORITE_STATE_FIELDS, states);
   };
 
   /**
@@ -196,15 +223,15 @@ var NetworkUI = function() {
    * @param {DOMElement} btn The button that was clicked.
    * @param {dictionary} state Property values for the network or favorite.
    */
-  var toggleExpandRow = function(btn, state) {
+  var toggleExpandRow = function(btn, guid) {

[xiyuan, 2014/05/21 21:22:28]

Add doc for |guid|

[stevenjb, 2014/05/23 21:50:59]

Done.

     var cell = btn.parentNode;
     var row = cell.parentNode;
-    if (btn.classList.contains('state-table-expand-button-expanded')) {
-      btn.classList.remove('state-table-expand-button-expanded');
+    if (btn.innerHTML == '-') {
+      btn.innerHTML = '+';
       row.parentNode.removeChild(row.nextSibling);
     } else {
-      btn.classList.add('state-table-expand-button-expanded');
-      var expandedRow = createExpandedRow(state, row);
+      btn.innerHTML = '-';
+      var expandedRow = createExpandedRow(guid, row);
       row.parentNode.insertBefore(expandedRow, row.nextSibling);
     }
   };
@@ -216,7 +243,7 @@ var NetworkUI = function() {
    * @param {DOMElement} baseRow The unexpanded row associated with the new row.
    * @return {DOMElement} The created tr element for the expanded row.
    */
-  var createExpandedRow = function(state, baseRow) {
+  var createExpandedRow = function(guid, baseRow) {
     var expandedRow = document.createElement('tr');
     expandedRow.className = 'state-table-row';
     var emptyCell = document.createElement('td');
@@ -225,16 +252,33 @@ var NetworkUI = function() {
     var detailCell = document.createElement('td');
     detailCell.className = 'state-table-expanded-cell';
     detailCell.colSpan = baseRow.childNodes.length - 1;
-    detailCell.innerHTML = JSON.stringify(state, null, '\t');
     expandedRow.appendChild(detailCell);
+    networkConfig.getProperties(guid, function(state) {
+      if (networkConfig.lastError)
+        detailCell.innerHTML = networkConfig.lastError;
+      else
+        detailCell.innerHTML = JSON.stringify(state, null, '\t');
+    });
     return expandedRow;
   };
 
   /**
-   * Sends a refresh request.
+   * Requests a network log update.
+   */
+  var requestLog = function() {
+    chrome.send('NetworkUI.getNetworkLog');
+  };
+
+  /**
+   * Requests an update of all network info.
    */
-  var sendRefresh = function() {
-    chrome.send('requestNetworkInfo');
+  var requestNetworks = function() {
+    networkConfig.getNetworks(
+        { 'type': 'All', 'visible': true },
+        onVisibleNetworksReceived);
+    networkConfig.getNetworks(
+        { 'type': 'All', 'configured': true },
+        onFavoriteNetworksReceived);
   };
 
   /**
@@ -243,31 +287,32 @@ var NetworkUI = function() {
   var setRefresh = function() {
     var interval = parseQueryParams(window.location)['refresh'];
     if (interval && interval != '')
-      setInterval(sendRefresh, parseInt(interval) * 1000);
+      setInterval(requestNetworks, parseInt(interval) * 1000);
   };
 
   /**
    * Get network information from WebUI.
    */
   document.addEventListener('DOMContentLoaded', function() {
-    $('log-refresh').onclick = sendRefresh;
+    $('log-refresh').onclick = requestLog;
     $('log-error').checked = true;
-    $('log-error').onclick = sendRefresh;
+    $('log-error').onclick = requestLog;
     $('log-user').checked = true;
-    $('log-user').onclick = sendRefresh;
+    $('log-user').onclick = requestLog;
     $('log-event').checked = true;
-    $('log-event').onclick = sendRefresh;
+    $('log-event').onclick = requestLog;
     $('log-debug').checked = false;
-    $('log-debug').onclick = sendRefresh;
+    $('log-debug').onclick = requestLog;
     $('log-fileinfo').checked = false;
-    $('log-fileinfo').onclick = sendRefresh;
+    $('log-fileinfo').onclick = requestLog;
     $('log-timedetail').checked = false;
-    $('log-timedetail').onclick = sendRefresh;
+    $('log-timedetail').onclick = requestLog;
     setRefresh();
-    sendRefresh();
+    requestLog();
+    requestNetworks();
   });
 
   return {
-    onNetworkInfoReceived: onNetworkInfoReceived
+    getNetworkLogCallback: getNetworkLogCallback
   };
-}();
+})();