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

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

Issue 7766004: Direct copy of http://codereview.chromium.org/7685019/ (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') | chrome/common/chrome_switches.h » ('j') | 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
===================================================================
--- chrome/browser/ui/webui/options/advanced_options_handler.cc (revision 98434)
+++ chrome/browser/ui/webui/options/advanced_options_handler.cc (working copy)
@@ -99,10 +99,6 @@
IDS_OPTIONS_SSL_GROUP_DESCRIPTION },
{ "sslCheckRevocation",
IDS_OPTIONS_SSL_CHECKREVOCATION },
- { "sslUseSSL3",
- IDS_OPTIONS_SSL_USESSL3 },
- { "sslUseTLS1",
- IDS_OPTIONS_SSL_USETLS1 },
{ "networkPredictionEnabledDescription",
IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
{ "privacyContentSettingsButton",
@@ -241,10 +237,6 @@
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,
@@ -309,12 +301,6 @@
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,
@@ -428,26 +414,6 @@
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) {
@@ -654,16 +620,4 @@
"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') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698