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

Side by Side Diff: chrome/browser/ui/webui/options/advanced_options_handler.cc

Issue 7685019: Demote the Use SSL 3.0 and Use TLS 1.0 options from Under The Hood to (Closed) Base URL: http://src.chromium.org/svn/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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/advanced_options_handler.h" 5 #include "chrome/browser/ui/webui/options/advanced_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #if !defined(OS_CHROMEOS) 92 #if !defined(OS_CHROMEOS)
93 { "proxiesConfigureButton", 93 { "proxiesConfigureButton",
94 IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 94 IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
95 #endif 95 #endif
96 { "safeBrowsingEnableProtection", 96 { "safeBrowsingEnableProtection",
97 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, 97 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
98 { "sslGroupDescription", 98 { "sslGroupDescription",
99 IDS_OPTIONS_SSL_GROUP_DESCRIPTION }, 99 IDS_OPTIONS_SSL_GROUP_DESCRIPTION },
100 { "sslCheckRevocation", 100 { "sslCheckRevocation",
101 IDS_OPTIONS_SSL_CHECKREVOCATION }, 101 IDS_OPTIONS_SSL_CHECKREVOCATION },
102 { "sslUseSSL3",
103 IDS_OPTIONS_SSL_USESSL3 },
104 { "sslUseTLS1",
105 IDS_OPTIONS_SSL_USETLS1 },
106 { "networkPredictionEnabledDescription", 102 { "networkPredictionEnabledDescription",
107 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 103 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
108 { "privacyContentSettingsButton", 104 { "privacyContentSettingsButton",
109 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 105 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
110 { "privacyClearDataButton", 106 { "privacyClearDataButton",
111 IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 107 IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
112 { "linkDoctorPref", 108 { "linkDoctorPref",
113 IDS_OPTIONS_LINKDOCTOR_PREF }, 109 IDS_OPTIONS_LINKDOCTOR_PREF },
114 { "suggestPref", 110 { "suggestPref",
115 IDS_OPTIONS_SUGGEST_PREF }, 111 IDS_OPTIONS_SUGGEST_PREF },
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 PrefService* prefs = Profile::FromWebUI(web_ui_)->GetPrefs(); 230 PrefService* prefs = Profile::FromWebUI(web_ui_)->GetPrefs();
235 #if !defined(OS_CHROMEOS) 231 #if !defined(OS_CHROMEOS)
236 enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled, 232 enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled,
237 g_browser_process->local_state(), this); 233 g_browser_process->local_state(), this);
238 cloud_print_proxy_email_.Init(prefs::kCloudPrintEmail, prefs, this); 234 cloud_print_proxy_email_.Init(prefs::kCloudPrintEmail, prefs, this);
239 cloud_print_proxy_enabled_.Init(prefs::kCloudPrintProxyEnabled, prefs, this); 235 cloud_print_proxy_enabled_.Init(prefs::kCloudPrintProxyEnabled, prefs, this);
240 #endif 236 #endif
241 237
242 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled, 238 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
243 g_browser_process->local_state(), this); 239 g_browser_process->local_state(), this);
244 ssl3_enabled_.Init(prefs::kSSL3Enabled, g_browser_process->local_state(),
245 this);
246 tls1_enabled_.Init(prefs::kTLS1Enabled, g_browser_process->local_state(),
247 this);
248 240
249 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 241 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
250 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled, 242 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled,
251 g_browser_process->local_state(), 243 g_browser_process->local_state(),
252 this); 244 this);
253 #endif 245 #endif
254 246
255 default_download_location_.Init(prefs::kDownloadDefaultDirectory, 247 default_download_location_.Init(prefs::kDownloadDefaultDirectory,
256 prefs, this); 248 prefs, this);
257 ask_for_save_location_.Init(prefs::kPromptForDownload, prefs, this); 249 ask_for_save_location_.Init(prefs::kPromptForDownload, prefs, this);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 NewCallback(this, 294 NewCallback(this,
303 &AdvancedOptionsHandler::HandleDisableCloudPrintProxy)); 295 &AdvancedOptionsHandler::HandleDisableCloudPrintProxy));
304 } 296 }
305 web_ui_->RegisterMessageCallback("showNetworkProxySettings", 297 web_ui_->RegisterMessageCallback("showNetworkProxySettings",
306 NewCallback(this, 298 NewCallback(this,
307 &AdvancedOptionsHandler::ShowNetworkProxySettings)); 299 &AdvancedOptionsHandler::ShowNetworkProxySettings));
308 #endif 300 #endif
309 web_ui_->RegisterMessageCallback("checkRevocationCheckboxAction", 301 web_ui_->RegisterMessageCallback("checkRevocationCheckboxAction",
310 NewCallback(this, 302 NewCallback(this,
311 &AdvancedOptionsHandler::HandleCheckRevocationCheckbox)); 303 &AdvancedOptionsHandler::HandleCheckRevocationCheckbox));
312 web_ui_->RegisterMessageCallback("useSSL3CheckboxAction",
313 NewCallback(this,
314 &AdvancedOptionsHandler::HandleUseSSL3Checkbox));
315 web_ui_->RegisterMessageCallback("useTLS1CheckboxAction",
316 NewCallback(this,
317 &AdvancedOptionsHandler::HandleUseTLS1Checkbox));
318 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 304 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
319 web_ui_->RegisterMessageCallback("backgroundModeAction", 305 web_ui_->RegisterMessageCallback("backgroundModeAction",
320 NewCallback(this, 306 NewCallback(this,
321 &AdvancedOptionsHandler::HandleBackgroundModeCheckbox)); 307 &AdvancedOptionsHandler::HandleBackgroundModeCheckbox));
322 #endif 308 #endif
323 } 309 }
324 310
325 void AdvancedOptionsHandler::Observe(int type, 311 void AdvancedOptionsHandler::Observe(int type,
326 const NotificationSource& source, 312 const NotificationSource& source,
327 const NotificationDetails& details) { 313 const NotificationDetails& details) {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 const ListValue* args) { 407 const ListValue* args) {
422 std::string checked_str = UTF16ToUTF8(ExtractStringValue(args)); 408 std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
423 bool enabled = checked_str == "true"; 409 bool enabled = checked_str == "true";
424 UserMetrics::RecordAction( 410 UserMetrics::RecordAction(
425 enabled ? 411 enabled ?
426 UserMetricsAction("Options_CheckCertRevocation_Enable") : 412 UserMetricsAction("Options_CheckCertRevocation_Enable") :
427 UserMetricsAction("Options_CheckCertRevocation_Disable")); 413 UserMetricsAction("Options_CheckCertRevocation_Disable"));
428 rev_checking_enabled_.SetValue(enabled); 414 rev_checking_enabled_.SetValue(enabled);
429 } 415 }
430 416
431 void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) {
432 std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
433 bool enabled = checked_str == "true";
434 UserMetrics::RecordAction(
435 enabled ?
436 UserMetricsAction("Options_SSL3_Enable") :
437 UserMetricsAction("Options_SSL3_Disable"));
438 ssl3_enabled_.SetValue(enabled);
439 }
440
441 void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) {
442 std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
443 bool enabled = checked_str == "true";
444 UserMetrics::RecordAction(
445 enabled ?
446 UserMetricsAction("Options_TLS1_Enable") :
447 UserMetricsAction("Options_TLS1_Disable"));
448 tls1_enabled_.SetValue(enabled);
449 }
450
451 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 417 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
452 void AdvancedOptionsHandler::HandleBackgroundModeCheckbox( 418 void AdvancedOptionsHandler::HandleBackgroundModeCheckbox(
453 const ListValue* args) { 419 const ListValue* args) {
454 std::string checked_str = UTF16ToUTF8(ExtractStringValue(args)); 420 std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
455 bool enabled = checked_str == "true"; 421 bool enabled = checked_str == "true";
456 UserMetrics::RecordAction(enabled ? 422 UserMetrics::RecordAction(enabled ?
457 UserMetricsAction("Options_BackgroundMode_Enable") : 423 UserMetricsAction("Options_BackgroundMode_Enable") :
458 UserMetricsAction("Options_BackgroundMode_Disable")); 424 UserMetricsAction("Options_BackgroundMode_Disable"));
459 background_mode_enabled_.SetValue(enabled); 425 background_mode_enabled_.SetValue(enabled);
460 } 426 }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 } 613 }
648 614
649 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 615 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
650 { 616 {
651 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 617 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
652 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 618 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
653 web_ui_->CallJavascriptFunction( 619 web_ui_->CallJavascriptFunction(
654 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, 620 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
655 disabled); 621 disabled);
656 } 622 }
657 {
658 base::FundamentalValue checked(ssl3_enabled_.GetValue());
659 base::FundamentalValue disabled(ssl3_enabled_.IsManaged());
660 web_ui_->CallJavascriptFunction(
661 "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled);
662 }
663 {
664 base::FundamentalValue checked(tls1_enabled_.GetValue());
665 base::FundamentalValue disabled(tls1_enabled_.IsManaged());
666 web_ui_->CallJavascriptFunction(
667 "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled);
668 }
669 } 623 }
OLDNEW
« 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