Merge 87553 - Fix issue with static ipconfig not creating dhcp ip configs properly.

chrome/browser/resources/options/chromeos/internet_options.js

 // Copyright (c) 2011 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', function() {
   var OptionsPage = options.OptionsPage;
   const ArrayDataModel = cr.ui.ArrayDataModel;
 
   /////////////////////////////////////////////////////////////////////////////
   // InternetOptions class:
@@ skipping 318 matching lines @@
       inetGateway = data.ipconfigStatic.gateway;
       inetDns = data.ipconfigStatic.dns;
       $('ipTypeStatic').checked = true;
     } else if (data.ipconfigDHCP) {
       inetAddress = data.ipconfigDHCP.address;
       inetSubnetAddress = data.ipconfigDHCP.subnetAddress;
       inetGateway = data.ipconfigDHCP.gateway;
       inetDns = data.ipconfigDHCP.dns;
     }
 
+    // Hide the dhcp/static radio if not ethernet or wifi
+    var ethernet_wifi = data.type == options.internet.Constants.TYPE_WIFI ||
+                        data.type == options.internet.Constants.TYPE_ETHERNET;
+    $('ipTypeDHCPDiv').hidden = !ethernet_wifi;
+    $('ipTypeStaticDiv').hidden = !ethernet_wifi;
+
     var ipConfigList = $('ipConfigList');
-    ipConfigList.disabled = $('ipTypeDHCP').checked;
+    ipConfigList.disabled = $('ipTypeDHCP').checked || !ethernet_wifi;
     options.internet.IPConfigList.decorate(ipConfigList);
     ipConfigList.autoExpands = true;
     var model = new ArrayDataModel([]);
     model.push({
       'property': 'inetAddress',
       'name': localStrings.getString('inetAddress'),
       'value': inetAddress,
     });
     model.push({
       'property': 'inetSubnetAddress',
@@ skipping 23 matching lines @@
       ipConfigList.dataModel.updateIndex(0);
       ipConfigList.dataModel.updateIndex(1);
       ipConfigList.dataModel.updateIndex(2);
       ipConfigList.dataModel.updateIndex(3);
       // Unselect all so we don't keep the currently selected field editable.
       ipConfigList.selectionModel.unselectAll();
       ipConfigList.disabled = true;
     });
 
     $('ipTypeStatic').addEventListener('click', function(event) {
-      // enable ipConfigList and switch back to static values (if any)
-      if (data.ipconfigStatic) {
-        ipConfigList.dataModel.item(0).value = data.ipconfigStatic.address;
-        ipConfigList.dataModel.item(1).value =
-          data.ipconfigStatic.subnetAddress;
-        ipConfigList.dataModel.item(2).value = data.ipconfigStatic.gateway;
-        ipConfigList.dataModel.item(3).value = data.ipconfigStatic.dns;
-      }
-      ipConfigList.dataModel.updateIndex(0);
-      ipConfigList.dataModel.updateIndex(1);
-      ipConfigList.dataModel.updateIndex(2);
-      ipConfigList.dataModel.updateIndex(3);
+      // enable ipConfigList
       ipConfigList.disabled = false;
       ipConfigList.focus();
       ipConfigList.selectionModel.selectedIndex = 0;
     });
 
     if (data.hardwareAddress) {
       $('hardwareAddress').textContent = data.hardwareAddress;
       $('hardwareAddressRow').style.display = 'table-row';
     } else {
       // This is most likely a device without a hardware address.
@@ skipping 98 matching lines @@
       detailsPage.gsm = false;
     }
     OptionsPage.navigateToPage('detailsInternetPage');
   };
 
   // Export
   return {
     InternetOptions: InternetOptions
   };
 });