MD Settings: Use network name for detail page title

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 34 matching lines @@
       value: null,
       notify: true,
     },
 
     /**
      * The device state for each network device type.
      * @type {DeviceStateObject}
      */
     deviceStates: {
       type: Object,
-      value: function() { return {}; },
+      value: function() {
+        return {};
+      },
     },
 
     /**
      * Array of active network states, one per device type.
      * @type {!Array<!CrOnc.NetworkStateProperties>}
      */
     activeNetworkStates: {
       type: Array,
-      value: function() { return []; },
+      value: function() {
+        return [];
+      },
     },
 
     /**
      * List of network state data for each network type.
      * @type {NetworkStateListObject}
      */
     networkStateLists: {
       type: Object,
-      value: function() { return {}; },
+      value: function() {
+        return {};
+      },
     },
 
     /**
      * Interface for networkingPrivate calls, passed from internet_page.
      * @type {NetworkingPrivate}
      */
     networkingPrivate: {
       type: Object,
     },
   },
@@ skipping 97 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 151 matching lines @@
     this.defaultNetwork = firstConnectedNetwork;
 
     // Create a VPN entry in deviceStates if there are any VPN networks.
     if (newNetworkStateLists.VPN && newNetworkStateLists.VPN.length > 0) {
       newDeviceStates.VPN = /** @type {DeviceStateProperties} */ ({
         Type: CrOnc.Type.VPN,
         State: chrome.networkingPrivate.DeviceStateType.ENABLED
       });
     }
 
-    // Push the active networks onto newActiveNetworkStates in device order,
-    // creating an empty state for devices with no networks.
-    var newActiveNetworkStates = [];
+    // Push the active networks onto newActiveNetworkStates in order based on
+    // device priority, creating an empty state for devices with no networks.
+    let newActiveNetworkStates = [];
     this.activeNetworkIds_ = new Set;
-    for (let type in newDeviceStates) {
-      var state = activeNetworkStatesByType.get(type) || {GUID: '', Type: type};
+    let orderedDeviceTypes = [
+      CrOnc.Type.ETHERNET, CrOnc.Type.WI_FI, CrOnc.Type.CELLULAR,
+      CrOnc.Type.WI_MAX, CrOnc.Type.VPN
+    ];
+    for (let type of orderedDeviceTypes) {
+      let device = newDeviceStates[type];
+      if (!device)
+        continue;
+      let state = activeNetworkStatesByType.get(type) || {GUID: '', Type: type};
       newActiveNetworkStates.push(state);
       this.activeNetworkIds_.add(state.GUID);
     }
 
     this.deviceStates = newDeviceStates;
     this.networkStateLists = newNetworkStateLists;
     // Set activeNetworkStates last to rebuild the dom-repeat.
     this.activeNetworkStates = newActiveNetworkStates;
   },
 });