Small: Cloud print UI options fix.

chrome/browser/resources/options/advanced_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;
 
   //
   // AdvancedOptions class
@@ skipping 110 matching lines @@
           chrome.send('useTLS1CheckboxAction',
               [String($('sslUseTLS1').checked)]);
         };
         $('gearSettingsConfigureGearsButton').onclick = function(event) {
           chrome.send('showGearsSettings');
         };
       }
 
       // 'cloudPrintProxyEnabled' is true for Chrome branded builds on
       // certain platforms, or could be enabled by a lab.
-      if (!cr.isChromeOS &&
-          localStrings.getString('enable-cloud-print-proxy') == 'true') {
+      if (!cr.isChromeOS) {
         $('cloudPrintProxySetupButton').onclick = function(event) {
-          if ($('cloudPrintProxyManageButton').style.display == 'none') {
-            // Disable the button, set it's text to the intermediate state.
-            $('cloudPrintProxySetupButton').textContent =
-              localStrings.getString('cloudPrintProxyEnablingButton');
-            $('cloudPrintProxySetupButton').disabled = true;
-            chrome.send('showCloudPrintSetupDialog');
-          } else {
-            chrome.send('disableCloudPrintProxy');
+          if ($('cloud-print-proxy-section').style.display != 'none') {

[csilv, 2011/02/18 19:54:28]

This added check is unnecessary.  The entire section will be removed if cloud
printing is disabled, so any onclick handler could never possibly be called.

[Scott Byer, 2011/02/18 20:44:05]

Done.

+            if ($('cloudPrintProxyManageButton').style.display == 'none') {
+              // Disable the button, set it's text to the intermediate state.
+              $('cloudPrintProxySetupButton').textContent =
+                localStrings.getString('cloudPrintProxyEnablingButton');
+              $('cloudPrintProxySetupButton').disabled = true;
+              chrome.send('showCloudPrintSetupDialog');
+            } else {
+              chrome.send('disableCloudPrintProxy');
+            }
           }
         };
         $('cloudPrintProxyManageButton').onclick = function(event) {
-          chrome.send('showCloudPrintManagePage');
+          if ($('cloud-print-proxy-section').style.display != 'none') {

[csilv, 2011/02/18 19:54:28]

Same with this check.

[Scott Byer, 2011/02/18 20:44:05]

Done.

+            chrome.send('showCloudPrintManagePage');
+          }
         };
       }
 
       if ($('remotingSetupButton')) {
           $('remotingSetupButton').onclick = function(event) {
               chrome.send('showRemotingSetupDialog');
           }
           $('remotingStopButton').onclick = function(event) {
               chrome.send('disableRemoting');
           }
@@ skipping 143 matching lines @@
     if (proxySectionElm)
       proxySectionElm.parentNode.removeChild(proxySectionElm);
   };
 
   // Export
   return {
     AdvancedOptions: AdvancedOptions
   };
 
 });