Add network settings to Wifi tab.

chrome/browser/resources/options2/chromeos/internet_detail.js

 // Copyright (c) 2012 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.
 
 cr.define('options.internet', function() {
   var OptionsPage = options.OptionsPage;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /*
    * Helper function to set hidden attribute for elements matching a selector.
@@ skipping 268 matching lines @@
       // if you can't connect to any network.
       // TODO(chocobo): Once ipconfig is moved to flimflam service objects,
       //   we need to redo this logic to allow configuration of all networks.
       $('ipconfig-section').hidden = !this.connected && this.deviceConnected;
 
       // Network type related.
       updateHidden('#details-internet-page .cellular-details', !this.cellular);
       updateHidden('#details-internet-page .wifi-details', !this.wireless);
       updateHidden('#details-internet-page .vpn-details', !this.vpn);
       updateHidden('#details-internet-page .proxy-details', !this.showProxy);
+      /* Network information merged into the Wifi tab for wireless networks. */
+      updateHidden('#details-internet-page .network-details', this.wireless);
 
       // Cell plan related.
       $('plan-list').hidden = this.cellplanloading;
       updateHidden('#details-internet-page .no-plan-info',
                    !this.cellular || this.cellplanloading || this.hascellplan);
       updateHidden('#details-internet-page .plan-loading-info',
                    !this.cellular || this.nocellplan || this.hascellplan);
       updateHidden('#details-internet-page .plan-details-info',
                    !this.cellular || this.nocellplan || this.cellplanloading);
       updateHidden('#details-internet-page .gsm-only',
                    !this.cellular || !this.gsm);
       updateHidden('#details-internet-page .cdma-only',
                    !this.cellular || this.gsm);
       updateHidden('#details-internet-page .apn-list-view',
                    !this.cellular || !this.gsm);
       updateHidden('#details-internet-page .apn-details-view', true);
 
       // Password and shared.
-      updateHidden('#details-internet-page .password-details',
+      updateHidden('#details-internet-page #password-details',
                    !this.wireless || !this.password);
-      updateHidden('#details-internet-page .shared-network', !this.shared);
-      updateHidden('#details-internet-page .prefer-network',
+      updateHidden('#details-internet-page #shared-network', !this.shared);
+      updateHidden('#details-internet-page #prefer-network',
                    !this.showPreferred);
 
       // Proxy
       this.updateProxyBannerVisibility_();
       this.toggleSingleProxy_();
       if ($('manual-proxy').checked)
         this.enableManualProxy_();
       else
         this.disableManualProxy_();
       if (!this.proxyListInitialized_ && this.visible) {
@@ skipping 342 matching lines @@
       $('hardware-address-row').style.display = 'none';
     }
     if (data.type == options.internet.Constants.TYPE_WIFI) {
       OptionsPage.showTab($('wifi-network-nav-tab'));
       detailsPage.wireless = true;
       detailsPage.vpn = false;
       detailsPage.ethernet = false;
       detailsPage.cellular = false;
       detailsPage.gsm = false;
       detailsPage.shared = data.shared;
-      $('inet-ssid').textContent = data.ssid;
+      $('wifi-connection-state').textContent = data.connectionState;
+      $('wifi-ssid').textContent = data.ssid;
+      $('wifi-ip-address').textContent = inetAddress;
+      $('wifi-subnet-address').textContent = inetSubnetAddress;
+      $('wifi-gateway').textContent = inetGateway;
+      $('wifi-dns').textContent = inetDns;
+      if (data.encryption && data.encryption.length > 0) {
+        $('wifi-security').textContent = data.encryption;
+        $('wifi-security-entry').hidden = false;
+      } else {
+        $('wifi-security-entry').hidden = true;
+      }
+      if (data.hardwareAddress) {
+        $('wifi-hardware-address').textContent = data.hardwareAddress;
+        $('wifi-hardware-address-entry').hidden = false;
+      } else {
+        $('wifi-hardware-address-entry').hidden = true;
+      }
       detailsPage.showPreferred = data.showPreferred;
       $('prefer-network-wifi').checked = data.preferred.value;
       $('prefer-network-wifi').disabled = !data.remembered;
       $('auto-connect-network-wifi').checked = data.autoConnect.value;
       $('auto-connect-network-wifi').disabled = !data.remembered;
       detailsPage.password = data.encrypted;
     } else if (data.type == options.internet.Constants.TYPE_CELLULAR) {
       if (!data.gsm)
         OptionsPage.showTab($('cellular-plan-nav-tab'));
       else
@@ skipping 131 matching lines @@
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     OptionsPage.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });