Merge 65401 - A bunch of proxy DOMUI changes....

chrome/browser/resources/options/chromeos_proxy_options.js

 // Copyright (c) 2010 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;
 
   /////////////////////////////////////////////////////////////////////////////
   // ProxyOptions class:
@@ skipping 73 matching lines @@
       }
     },
 
     /**
      * Handler for selecting a radio button that will disable the manual
      * controls.
      * @private
      * @param {Event} e Click event.
      */
     disableManual_: function(e) {
+      $('proxyAllProtocols').disabled = true;
       $('proxyHostName').disabled = true;
       $('proxyHostPort').disabled = true;
       $('proxyHostSingleName').disabled = true;
       $('proxyHostSinglePort').disabled = true;
       $('secureProxyHostName').disabled = true;
       $('secureProxyPort').disabled = true;
       $('ftpProxy').disabled = true;
       $('ftpProxyPort').disabled = true;
       $('socksHost').disabled = true;
       $('socksPort').disabled = true;
       $('newHost').disabled = true;
       $('removeHost').disabled = true;
       $('addHost').disabled = true;
       $('advancedConfig').style.display = 'none';
     },
 
     /**
      * Handler for selecting a radio button that will enable the manual
      * controls.
      * @private
      * @param {Event} e Click event.
      */
     enableManual_: function(e) {
+      $('proxyAllProtocols').disabled = false;
       $('proxyHostName').disabled = false;
       $('proxyHostPort').disabled = false;
       $('proxyHostSingleName').disabled = false;
       $('proxyHostSinglePort').disabled = false;
       $('secureProxyHostName').disabled = false;
       $('secureProxyPort').disabled = false;
       $('ftpProxy').disabled = false;
       $('ftpProxyPort').disabled = false;
       $('socksHost').disabled = false;
       $('socksPort').disabled = false;
@@ skipping 25 matching lines @@
       }
     }
   };
 
   // Export
   return {
     ProxyOptions: ProxyOptions
   };
 
 });