| Index: chrome/browser/gtk/options/advanced_contents_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/gtk/options/advanced_contents_gtk.cc (revision 67717)
|
| +++ chrome/browser/gtk/options/advanced_contents_gtk.cc (working copy)
|
| @@ -976,8 +976,6 @@
|
| SecuritySection* section);
|
| static void OnRevCheckingEnabledToggled(GtkToggleButton* togglebutton,
|
| SecuritySection* section);
|
| - static void OnSSL2EnabledToggled(GtkToggleButton* togglebutton,
|
| - SecuritySection* section);
|
| static void OnSSL3EnabledToggled(GtkToggleButton* togglebutton,
|
| SecuritySection* section);
|
| static void OnTLS1EnabledToggled(GtkToggleButton* togglebutton,
|
| @@ -986,13 +984,11 @@
|
| // The widget containing the options for this section.
|
| GtkWidget* page_;
|
| GtkWidget* rev_checking_enabled_checkbox_;
|
| - GtkWidget* ssl2_enabled_checkbox_;
|
| GtkWidget* ssl3_enabled_checkbox_;
|
| GtkWidget* tls1_enabled_checkbox_;
|
|
|
| // SSLConfigService prefs.
|
| BooleanPrefMember rev_checking_enabled_;
|
| - BooleanPrefMember ssl2_enabled_;
|
| BooleanPrefMember ssl3_enabled_;
|
| BooleanPrefMember tls1_enabled_;
|
|
|
| @@ -1041,10 +1037,6 @@
|
| G_CALLBACK(OnRevCheckingEnabledToggled), this);
|
| accessible_widget_helper_->SetWidgetName(
|
| rev_checking_enabled_checkbox_, IDS_OPTIONS_SSL_CHECKREVOCATION);
|
| - ssl2_enabled_checkbox_ = AddCheckButtonWithWrappedLabel(
|
| - IDS_OPTIONS_SSL_USESSL2, page_, G_CALLBACK(OnSSL2EnabledToggled), this);
|
| - accessible_widget_helper_->SetWidgetName(
|
| - ssl2_enabled_checkbox_, IDS_OPTIONS_SSL_USESSL2);
|
| ssl3_enabled_checkbox_ = AddCheckButtonWithWrappedLabel(
|
| IDS_OPTIONS_SSL_USESSL3, page_, G_CALLBACK(OnSSL3EnabledToggled), this);
|
| accessible_widget_helper_->SetWidgetName(
|
| @@ -1056,7 +1048,6 @@
|
|
|
| rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
|
| profile->GetPrefs(), this);
|
| - ssl2_enabled_.Init(prefs::kSSL2Enabled, profile->GetPrefs(), this);
|
| ssl3_enabled_.Init(prefs::kSSL3Enabled, profile->GetPrefs(), this);
|
| tls1_enabled_.Init(prefs::kTLS1Enabled, profile->GetPrefs(), this);
|
|
|
| @@ -1070,10 +1061,6 @@
|
| GTK_TOGGLE_BUTTON(rev_checking_enabled_checkbox_),
|
| rev_checking_enabled_.GetValue());
|
| }
|
| - if (!pref_name || *pref_name == prefs::kSSL2Enabled) {
|
| - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ssl2_enabled_checkbox_),
|
| - ssl2_enabled_.GetValue());
|
| - }
|
| if (!pref_name || *pref_name == prefs::kSSL3Enabled) {
|
| gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ssl3_enabled_checkbox_),
|
| ssl3_enabled_.GetValue());
|
| @@ -1113,23 +1100,6 @@
|
| }
|
|
|
| // static
|
| -void SecuritySection::OnSSL2EnabledToggled(GtkToggleButton* togglebutton,
|
| - SecuritySection* section) {
|
| - if (section->pref_changing_)
|
| - return;
|
| -
|
| - bool enabled = gtk_toggle_button_get_active(togglebutton);
|
| - if (enabled) {
|
| - section->UserMetricsRecordAction(UserMetricsAction("Options_SSL2_Enable"),
|
| - NULL);
|
| - } else {
|
| - section->UserMetricsRecordAction(UserMetricsAction("Options_SSL2_Disable"),
|
| - NULL);
|
| - }
|
| - section->ssl2_enabled_.SetValue(enabled);
|
| -}
|
| -
|
| -// static
|
| void SecuritySection::OnSSL3EnabledToggled(GtkToggleButton* togglebutton,
|
| SecuritySection* section) {
|
| if (section->pref_changing_)
|
|
|