1 files changed, 19 insertions, 6 deletions
diff --git a/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js b/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js
index 09cbcd3965e..7b26f618a41 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js
+++ b/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js
@@ -132,7 +132,12 @@ Polymer({
     const connectionState = networkState.connectionState;
     const name = OncMojo.getNetworkStateDisplayName(networkState);
     if (OncMojo.connectionStateIsConnected(connectionState)) {
-      return name;
+      // Ethernet networks always have the display name 'Ethernet' so we use the
+      // state text 'Connected' to avoid repeating the label in the sublabel.
+      // See http://crbug.com/989907 for details.
+      return networkState.type == mojom.NetworkType.kEthernet ?
+          CrOncStrings.networkListItemConnected :
+          name;
     }
     if (connectionState == mojom.ConnectionStateType.kConnecting) {
       return name ?
@@ -282,14 +287,22 @@ Polymer({
     const type = deviceState.type;
     if (type == mojom.NetworkType.kTether ||
         (type == mojom.NetworkType.kCellular && this.tetherDeviceState)) {
-      // The "Mobile data" subpage should always be shown if Tether networks are
+      // The "Mobile data" subpage should always be shown if Tether is
       // available, even if there are currently no associated networks.
       return true;
     }
-    const minlen =
-        (type == mojom.NetworkType.kWiFi || type == mojom.NetworkType.kVPN) ?
-        1 :
-        2;
+    let minlen;
+    if (type == mojom.NetworkType.kVPN) {
+      // VPN subpage provides provider info so show if there are any networks.
+      minlen = 1;
+    } else if (type == mojom.NetworkType.kWiFi) {
+      // WiFi subpage includes 'Known Networks' so always show, even if the
+      // technology is still enabling / scanning, or none are visible.
+      minlen = 0;
+    } else {
+      // By default, only show the subpage if there are 2+ networks
+      minlen = 2;
+    }
     return networkStateList.length >= minlen;
   },