Use networkingPrivate types in JS

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 40 matching lines @@
   var createTableRowElement = function() {
     return /** @type {!HTMLTableRowElement} */(document.createElement('tr'));
   };
 
   /**
    * Returns the ONC data property for networkState associated with a key. Used
    * to access properties in the networkState by |key| which may may refer to a
    * nested property, e.g. 'WiFi.Security'. If any part of a nested key is
    * missing, this will return undefined.
    *
-   * @param {!CrOnc.NetworkConfigType} networkState The network state
-   *     property dictionary.
+   * @param {!chrome.networkingPrivate.NetworkStateProperties} networkState The

[michaelpg, 2015/03/31 19:18:46]

lol @ being able to fit 1 word of description. I guess it's unavoidable though.

+   *     network state property dictionary.
    * @param {string} key The ONC key for the property.
    * @return {*} The value associated with the property or undefined if the
    *     key (any part of it) is not defined.
    */
   var getOncProperty = function(networkState, key) {
     var dict = /** @type {!Object} */(networkState);
     var keys = key.split('.');
     while (keys.length > 1) {
       var k = keys.shift();
       dict = dict[k];
@@ skipping 19 matching lines @@
     });
     button.className = 'state-table-expand-button';
     button.textContent = '+';
     cell.appendChild(button);
     return cell;
   };
 
   /**
    * Creates a cell with an icon representing the network state.
    *
-   * @param {CrOnc.NetworkConfigType} networkState The network state properties.
+   * @param {!chrome.networkingPrivate.NetworkStateProperties} networkState The
+   *     network state properties.
    * @return {!HTMLTableCellElement} The created td element that displays the
    *     icon.
    */
   var createStateTableIcon = function(networkState) {
     var cell = createTableCellElement();
     cell.className = 'state-table-icon-cell';
     var icon = /** @type {!CrNetworkIconElement} */(
         document.createElement('cr-network-icon'));
     icon.isListItem = true;
     icon.networkState = CrOncDataElement.create(networkState);
@@ skipping 11 matching lines @@
   var createStateTableCell = function(value) {
     var cell = createTableCellElement();
     cell.textContent = value || '';
     return cell;
   };
 
   /**
    * Creates a row in the network state table.
    *
    * @param {Array} stateFields The state fields to use for the row.
-   * @param {CrOnc.NetworkConfigType} networkState The network state properties.
+   * @param {!chrome.networkingPrivate.NetworkStateProperties} networkState The
+   *     network state properties.
    * @return {!HTMLTableRowElement} The created tr element that contains the
    *     network state information.
    */
   var createStateTableRow = function(stateFields, networkState) {
     var row = createTableRowElement();
     row.className = 'state-table-row';
     var guid = networkState.GUID;
     row.appendChild(createStateTableExpandButton(guid));
     row.appendChild(createStateTableIcon(networkState));
     for (var i = 0; i < stateFields.length; ++i) {
@@ skipping 12 matching lines @@
         value = value.slice(0, 8);
       row.appendChild(createStateTableCell(value));
     }
     return row;
   };
 
   /**
    * Creates a table for networks or favorites.
    *
    * @param {string} tablename The name of the table to be created.
-   * @param {Array} stateFields The list of fields for the table.
-   * @param {Array} states An array of network or favorite states.
+   * @param {!Array<string>} stateFields The list of fields for the table.
+   * @param {!Array<!chrome.networkingPrivate.NetworkStateProperties>} states
+   *     An array of network or favorite states.
    */
   var createStateTable = function(tablename, stateFields, states) {
     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, /** @type {!CrOnc.NetworkConfigType} */(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) {
     return '_' + guid.replace(/[{}]/g, '');
   };
 
   /**
    * This callback function is triggered when visible networks are received.
    *
-   * @param {!Array<!Object>} states A list of network state information for
-   *     each visible network.
+   * @param {!Array<!chrome.networkingPrivate.NetworkStateProperties>} states
+   *     A list of network state information for each visible network.
    */
   var onVisibleNetworksReceived = function(states) {
-    /** @type {CrOnc.NetworkConfigType} */ var defaultState;
+    /** @type {chrome.networkingPrivate.NetworkStateProperties} */ var
+        defaultState;
     if (states.length > 0)
-      defaultState = /** @type {!CrOnc.NetworkConfigType} */(states[0]);
+      defaultState = states[0];
     var icon = /** @type {CrNetworkIconElement} */($('default-network-icon'));
-    if (defaultState && defaultState.Type != 'VPN') {
+    if (defaultState &&
+        defaultState.Type != chrome.networkingPrivate.NetworkType.VPN) {
       $('default-network-text').textContent =
           loadTimeData.getStringF('defaultNetworkText',
                                   defaultState.Name,
                                   defaultState.ConnectionState);
       icon.networkState = CrOncDataElement.create(defaultState);
     } else {
       $('default-network-text').textContent =
           loadTimeData.getString('noNetworkText');
       // Show the disconnected wifi icon if there are no networks.
-      icon.networkType = CrOnc.Type.WIFI;
+      icon.networkType = chrome.networkingPrivate.NetworkType.WiFi;
     }
 
     createStateTable('network-state-table', NETWORK_STATE_FIELDS, states);
   };
 
   /**
    * This callback function is triggered when favorite networks are received.
    *
-   * @param {!Array<!Object>} states A list of network state information for
-   *     each favorite network.
+   * @param {!Array<!chrome.networkingPrivate.NetworkStateProperties>} states
+   *     A list of network state information for each favorite network.
    */
   var onFavoriteNetworksReceived = function(states) {
     createStateTable('favorite-state-table', FAVORITE_STATE_FIELDS, states);
   };
 
   /**
    * Toggles the button state and add or remove a row displaying the complete
    * state information for a row.
    *
    * @param {!HTMLElement} btn The button that was clicked.
@@ skipping 106 matching lines @@
   document.addEventListener('DOMContentLoaded', function() {
     $('refresh').onclick = requestNetworks;
     setRefresh();
     requestNetworks();
   });
 
   return {
     getShillPropertiesResult: getShillPropertiesResult
   };
 })();