MD Settings: Internet: Cleanup JS

chrome/browser/resources/settings/internet_page/network_summary.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview Polymer element for displaying a summary of network states
  * by type: Ethernet, WiFi, Cellular, WiMAX, and VPN.
  */
 
 /** @typedef {chrome.networkingPrivate.DeviceStateProperties} */
@@ skipping 29 matching lines @@
      * Highest priority connected network or null.
      * @type {?CrOnc.NetworkStateProperties}
      */
     defaultNetwork: {
       type: Object,
       value: null,
       notify: true,
     },
 
     /**
-     * The device state for each network device type.
-     * @type {DeviceStateObject}
-     */
-    deviceStates: {
-      type: Object,
-      value: function() { return {}; },
-    },
-
-    /**
-     * Array of active network states, one per device type.
-     * @type {!Array<!CrOnc.NetworkStateProperties>}
-     */
-    activeNetworkStates: {
-      type: Array,
-      value: function() { return []; },
-    },
-
-    /**
-     * List of network state data for each network type.
-     * @type {NetworkStateListObject}
-     */
-    networkStateLists: {
-      type: Object,
-      value: function() { return {}; },
-    },
-
-    /**
      * Interface for networkingPrivate calls, passed from internet_page.
      * @type {NetworkingPrivate}
      */
-    networkingPrivate: {
+    networkingPrivate: Object,
+
+    /**
+     * The device state for each network device type.
+     * @private {DeviceStateObject}
+     */
+    deviceStates_: {
       type: Object,
+      value: function() {
+        return {};
+      },
+    },
+
+    /**
+     * Array of active network states, one per device type.
+     * @private {!Array<!CrOnc.NetworkStateProperties>}
+     */
+    activeNetworkStates_: {
+      type: Array,
+      value: function() {
+        return [];
+      },
+    },
+
+    /**
+     * List of network state data for each network type.
+     * @private {NetworkStateListObject}
+     */
+    networkStateLists_: {
+      type: Object,
+      value: function() {
+        return {};
+      },
     },
   },
 
   /**
    * Listener function for chrome.networkingPrivate.onNetworkListChanged event.
    * @type {function(!Array<string>)}
    * @private
    */
   networkListChangedListener_: function() {},
 
@@ skipping 89 matching lines @@
     if (event.detail.enabled)
       this.networkingPrivate.enableNetworkType(event.detail.type);
     else
       this.networkingPrivate.disableNetworkType(event.detail.type);
   },
 
   /**
    * networkingPrivate.onNetworkListChanged event callback.
    * @private
    */
-  onNetworkListChangedEvent_: function() { this.getNetworkLists_(); },
+  onNetworkListChangedEvent_: function() {
+    this.getNetworkLists_();
+  },
 
   /**
    * networkingPrivate.onDeviceStateListChanged event callback.
    * @private
    */
-  onDeviceStateListChangedEvent_: function() { this.getNetworkLists_(); },
+  onDeviceStateListChangedEvent_: function() {
+    this.getNetworkLists_();
+  },
 
   /**
    * networkingPrivate.onNetworksChanged event callback.
    * @param {!Array<string>} networkIds The list of changed network GUIDs.
    * @private
    */
   onNetworksChangedEvent_: function(networkIds) {
     if (!this.activeNetworkIds_)
       return;  // Initial list of networks not received yet.
     networkIds.forEach(function(id) {
@@ skipping 34 matching lines @@
       return;
     }
     // Async call, ensure id still exists.
     if (!this.activeNetworkIds_.has(id))
       return;
     if (!state) {
       this.activeNetworkIds_.delete(id);
       return;
     }
     // Find the active state for the type and update it.
-    for (let i = 0; i < this.activeNetworkStates.length; ++i) {
-      if (this.activeNetworkStates[i].type == state.type) {
-        this.activeNetworkStates[i] = state;
+    for (let i = 0; i < this.activeNetworkStates_.length; ++i) {
+      if (this.activeNetworkStates_[i].type == state.type) {
+        this.activeNetworkStates_[i] = state;
         return;
       }
     }
     // Not found
     console.error('Active state not found: ' + state.Name);
   },
 
   /**
    * Handles UI requests to connect to a network.
    * TODO(stevenjb): Handle Cellular activation, etc.
@@ skipping 55 matching lines @@
    *     defined the existing list of device states will be used.
    * @private
    */
   updateNetworkStates_: function(networkStates, opt_deviceStates) {
     var newDeviceStates;
     if (opt_deviceStates) {
       newDeviceStates = /** @type {!DeviceStateObject} */ ({});
       for (let state of opt_deviceStates)
         newDeviceStates[state.Type] = state;
     } else {
-      newDeviceStates = this.deviceStates;
+      newDeviceStates = this.deviceStates_;
     }
 
     // Clear any current networks.
     var activeNetworkStatesByType =
         /** @type {!Map<string, !CrOnc.NetworkStateProperties>} */ (new Map);
 
     // Complete list of states by type.
     /** @type {!NetworkStateListObject} */ var newNetworkStateLists = {
       Ethernet: [],
       WiFi: [],
@@ skipping 28 matching lines @@
     // Push the active networks onto newActiveNetworkStates in device order,
     // creating an empty state for devices with no networks.
     var newActiveNetworkStates = [];
     this.activeNetworkIds_ = new Set;
     for (let type in newDeviceStates) {
       var state = activeNetworkStatesByType.get(type) || {GUID: '', Type: type};
       newActiveNetworkStates.push(state);
       this.activeNetworkIds_.add(state.GUID);
     }
 
-    this.deviceStates = newDeviceStates;
-    this.networkStateLists = newNetworkStateLists;
+    this.deviceStates_ = newDeviceStates;
+    this.networkStateLists_ = newNetworkStateLists;
     // Set activeNetworkStates last to rebuild the dom-repeat.
-    this.activeNetworkStates = newActiveNetworkStates;
+    this.activeNetworkStates_ = newActiveNetworkStates;
   },
 });