Move proxy handling into network details.

chrome/browser/resources/options2/chromeos/internet_options.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', function() {
   var OptionsPage = options.OptionsPage;
   const ArrayDataModel = cr.ui.ArrayDataModel;
 
   /////////////////////////////////////////////////////////////////////////////
   // InternetOptions class:
@@ skipping 64 matching lines @@
       this.showNetworkDetails_();
     },
 
     showNetworkDetails_: function() {
       var params = parseQueryParams(window.location);
       var servicePath = params.servicePath;
       var networkType = params.networkType;
       if (!servicePath || !servicePath.length ||
           !networkType || !networkType.length)
         return;
-      var networkName = params.networkName;
-      if (networkName)
-        options.ProxyOptions.getInstance().setNetworkName(networkName);
       chrome.send('buttonClickCallback',
           [networkType, servicePath, 'options']);
     },
 
     updateHidden_: function(elements, hidden) {
       for (var i = 0, el; el = elements[i]; i++) {
         el.hidden = hidden;
       }
     },
 
@@ skipping 210 matching lines @@
       typeLabel.textContent = localStrings.getString(typeKey);
       typeLabel.hidden = false;
       typeSeparator.hidden = false;
     } else {
       typeLabel.hidden = true;
       typeSeparator.hidden = true;
     }
 
     // TODO(chocobo): Is this hack to cache the data here reasonable?
     $('connectionState').data = data;
+
     $('buyplanDetails').hidden = true;
     $('activateDetails').hidden = true;
     $('viewAccountDetails').hidden = true;
     $('detailsInternetLogin').hidden = data.connected;
     if (data.type == options.internet.Constants.TYPE_ETHERNET)
       $('detailsInternetDisconnect').hidden = true;
     else
       $('detailsInternetDisconnect').hidden = !data.connected;
 
     detailsPage.deviceConnected = data.deviceConnected;
     detailsPage.connecting = data.connecting;
     detailsPage.connected = data.connected;
+    detailsPage.showProxy = data.showProxy;
     $('connectionState').textContent = data.connectionState;
 
     var inetAddress = '';
     var inetSubnetAddress = '';
     var inetGateway = '';
     var inetDns = '';
     $('ipTypeDHCP').checked = true;
     if (data.ipconfigStatic.value) {
       inetAddress = data.ipconfigStatic.value.address;
       inetSubnetAddress = data.ipconfigStatic.value.subnetAddress;
       inetGateway = data.ipconfigStatic.value.gateway;
       inetDns = data.ipconfigStatic.value.dns;
       $('ipTypeStatic').checked = true;
     } else if (data.ipconfigDHCP.value) {
       inetAddress = data.ipconfigDHCP.value.address;
       inetSubnetAddress = data.ipconfigDHCP.value.subnetAddress;
       inetGateway = data.ipconfigDHCP.value.gateway;
       inetDns = data.ipconfigDHCP.value.dns;
     }
 
     // Hide the dhcp/static radio if needed.
     $('ipTypeDHCPDiv').hidden = !data.showStaticIPConfig;
     $('ipTypeStaticDiv').hidden = !data.showStaticIPConfig;
 
-    // Hide change-proxy-button and change-proxy-section if not showing proxy.
-    $('change-proxy-button').hidden = !data.showProxy;
-    $('change-proxy-section').hidden = !data.showProxy;
-
     var ipConfigList = $('ipConfigList');
     options.internet.IPConfigList.decorate(ipConfigList);
     ipConfigList.disabled =
         $('ipTypeDHCP').checked || data.ipconfigStatic.controlledBy ||
         !data.showStaticIPConfig;
     ipConfigList.autoExpands = true;
     var model = new ArrayDataModel([]);
     model.push({
       'property': 'inetAddress',
       'name': localStrings.getString('inetAddress'),
@@ skipping 207 matching lines @@
           if (forElement)
             forElement.disabled = true;
           if (forElement.type == 'radio' && !forElement.checked)
             indicators[i].hidden = true;
         } else {
           indicators[i].controlledBy = null;
         }
       }
     }
 
+    detailsPage.updateControls();
+
     // 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);
   };
 
   InternetOptions.invalidNetworkSettings = function() {
     alert(localStrings.getString('invalidNetworkSettings'));
   };
 
   // Export
   return {
     InternetOptions: InternetOptions
   };
 });