Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3942)

Unified Diff: chrome/browser/ui/webui/options/advanced_options_handler.cc

Issue 7633012: Unbreak SSL/TLS preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/advanced_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index 04f18879bcc28e3f8e785b016923cf334f035d5c..dce0eadbf31ba4d20e81ab2f4d1fd9a6de269cc5 100644
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc
@@ -204,6 +204,7 @@ void AdvancedOptionsHandler::Initialize() {
SetupPromptForDownload();
SetupAutoOpenFileTypesDisabledAttribute();
SetupProxySettingsSection();
+ SetupSSLConfigSettings();
#if !defined(OS_CHROMEOS)
if (cloud_print_proxy_ui_enabled_) {
SetupCloudPrintProxySection();
@@ -233,6 +234,13 @@ WebUIMessageHandler* AdvancedOptionsHandler::Attach(WebUI* web_ui) {
cloud_print_proxy_enabled_.Init(prefs::kCloudPrintProxyEnabled, prefs, this);
#endif
+ rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
+ g_browser_process->local_state(), this);
+ ssl3_enabled_.Init(prefs::kSSL3Enabled, g_browser_process->local_state(),
+ this);
+ tls1_enabled_.Init(prefs::kTLS1Enabled, g_browser_process->local_state(),
+ this);
+
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
background_mode_enabled_.Init(prefs::kBackgroundModeEnabled,
g_browser_process->local_state(),
@@ -293,6 +301,15 @@ void AdvancedOptionsHandler::RegisterMessages() {
NewCallback(this,
&AdvancedOptionsHandler::ShowNetworkProxySettings));
#endif
+ web_ui_->RegisterMessageCallback("checkRevocationCheckboxAction",
+ NewCallback(this,
+ &AdvancedOptionsHandler::HandleCheckRevocationCheckbox));
+ web_ui_->RegisterMessageCallback("useSSL3CheckboxAction",
+ NewCallback(this,
+ &AdvancedOptionsHandler::HandleUseSSL3Checkbox));
+ web_ui_->RegisterMessageCallback("useTLS1CheckboxAction",
+ NewCallback(this,
+ &AdvancedOptionsHandler::HandleUseTLS1Checkbox));
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
web_ui_->RegisterMessageCallback("backgroundModeAction",
NewCallback(this,
@@ -395,6 +412,37 @@ void AdvancedOptionsHandler::HandleDefaultFontSize(const ListValue* args) {
}
}
+void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(
+ const ListValue* args) {
+ std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
+ bool enabled = checked_str == "true";
+ UserMetrics::RecordAction(
+ enabled ?
+ UserMetricsAction("Options_CheckCertRevocation_Enable") :
+ UserMetricsAction("Options_CheckCertRevocation_Disable"));
+ rev_checking_enabled_.SetValue(enabled);
+}
+
+void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) {
+ std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
+ bool enabled = checked_str == "true";
+ UserMetrics::RecordAction(
+ enabled ?
+ UserMetricsAction("Options_SSL3_Enable") :
+ UserMetricsAction("Options_SSL3_Disable"));
+ ssl3_enabled_.SetValue(enabled);
+}
+
+void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) {
+ std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
+ bool enabled = checked_str == "true";
+ UserMetrics::RecordAction(
+ enabled ?
+ UserMetricsAction("Options_TLS1_Enable") :
+ UserMetricsAction("Options_TLS1_Disable"));
+ tls1_enabled_.SetValue(enabled);
+}
+
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
void AdvancedOptionsHandler::HandleBackgroundModeCheckbox(
const ListValue* args) {
@@ -591,3 +639,25 @@ void AdvancedOptionsHandler::SetupProxySettingsSection() {
web_ui_->CallJavascriptFunction(
"options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
}
+
+void AdvancedOptionsHandler::SetupSSLConfigSettings() {
+ {
+ base::FundamentalValue checked(rev_checking_enabled_.GetValue());
+ base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
+ web_ui_->CallJavascriptFunction(
+ "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
+ disabled);
+ }
+ {
+ base::FundamentalValue checked(ssl3_enabled_.GetValue());
+ base::FundamentalValue disabled(ssl3_enabled_.IsManaged());
+ web_ui_->CallJavascriptFunction(
+ "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled);
+ }
+ {
+ base::FundamentalValue checked(tls1_enabled_.GetValue());
+ base::FundamentalValue disabled(tls1_enabled_.IsManaged());
+ web_ui_->CallJavascriptFunction(
+ "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled);
+ }
+}
« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698