From 4244aaa63f14fbfbc4fb9df6a9d3703f00ecef77 Mon Sep 17 00:00:00 2001
From: "wtc@chromium.org"
 <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 18 Oct 2010 18:24:52 +0000
Subject: Fix typo SetUseSSL2CheckboxStatechecked => SetUseSSL2CheckboxState
 and similar typos for SSL3 and TLS1 checkboxes.

Disable the SSL settings checkboxes if
net::SSLConfigServiceWin::GetSSLConfigNow fails.

R=mattm
BUG=59125
TEST=On Windows, run chrome.exe --enable-tabbed-options. Open the
wrench menu > Settings > Under the Hood.  The "Use SSL 2.0",
"Use SSL 3.0", and "Use TLS 1.0" checkboxes should reflect the
actual settings rather than being all unchecked.
Review URL: http://codereview.chromium.org/3772014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62953 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/dom_ui/options/advanced_options_handler.cc | 15 +++++++++++----
 chrome/browser/resources/options/advanced_options.js      | 13 +++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'chrome')

diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index e43503b..4fc277d 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -421,6 +421,7 @@ void AdvancedOptionsHandler::SetupSSLConfigSettings() {
   bool useSSL2Setting = false;
   bool useSSL3Setting = false;
   bool useTLS1Setting = false;
+  bool disabled = false;
 
   net::SSLConfig config;
   if (net::SSLConfigServiceWin::GetSSLConfigNow(&config)) {
@@ -428,19 +429,25 @@ void AdvancedOptionsHandler::SetupSSLConfigSettings() {
     useSSL2Setting = config.ssl2_enabled;
     useSSL3Setting = config.ssl3_enabled;
     useTLS1Setting = config.tls1_enabled;
+  } else {
+    disabled = true;
   }
+  FundamentalValue disabledValue(disabled);
   FundamentalValue checkRevocationValue(checkRevocationSetting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetCheckRevocationCheckboxState",
-      checkRevocationValue);
+      checkRevocationValue, disabledValue);
   FundamentalValue useSSL2Value(useSSL2Setting);
   dom_ui_->CallJavascriptFunction(
-      L"options.AdvancedOptions.SetUseSSL2CheckboxStatechecked", useSSL2Value);
+      L"options.AdvancedOptions.SetUseSSL2CheckboxState",
+      useSSL2Value, disabledValue);
   FundamentalValue useSSL3Value(useSSL3Setting);
   dom_ui_->CallJavascriptFunction(
-      L"options.AdvancedOptions.SetUseSSL3CheckboxStatechecked", useSSL3Value);
+      L"options.AdvancedOptions.SetUseSSL3CheckboxState",
+      useSSL3Value, disabledValue);
   FundamentalValue useTLS1Value(useTLS1Setting);
   dom_ui_->CallJavascriptFunction(
-      L"options.AdvancedOptions.SetUseTLS1CheckboxStatechecked", useTLS1Value);
+      L"options.AdvancedOptions.SetUseTLS1CheckboxState",
+      useTLS1Value, disabledValue);
 }
 #endif
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index 4b6e914..79790a8 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -165,23 +165,28 @@ var OptionsPage = options.OptionsPage;
   };
 
   // Set the checked state for the sslCheckRevocation checkbox.
-  AdvancedOptions.SetCheckRevocationCheckboxState = function(checked) {
+  AdvancedOptions.SetCheckRevocationCheckboxState = function(checked,
+      disabled) {
     $('sslCheckRevocation').checked = checked;
+    $('sslCheckRevocation').disabled = disabled;
   };
 
   // Set the checked state for the sslUseSSL2 checkbox.
-  AdvancedOptions.SetUseSSL2CheckboxState = function(checked) {
+  AdvancedOptions.SetUseSSL2CheckboxState = function(checked, disabled) {
     $('sslUseSSL2').checked = checked;
+    $('sslUseSSL2').disabled = disabled;
   };
 
   // Set the checked state for the sslUseSSL3 checkbox.
-  AdvancedOptions.SetUseSSL3CheckboxState = function(checked) {
+  AdvancedOptions.SetUseSSL3CheckboxState = function(checked, disabled) {
     $('sslUseSSL3').checked = checked;
+    $('sslUseSSL3').disabled = disabled;
   };
 
   // Set the checked state for the sslUseTLS1 checkbox.
-  AdvancedOptions.SetUseTLS1CheckboxState = function(checked) {
+  AdvancedOptions.SetUseTLS1CheckboxState = function(checked, disabled) {
     $('sslUseTLS1').checked = checked;
+    $('sslUseTLS1').disabled = disabled;
   };
 
   // Export
-- 
cgit v1.1