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

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

Issue 6824069: Allow revocation checking to be disabled on Mac, overriding/ignoring system settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: With suppressions Created 9 years, 8 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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 label_str = l10n_util::GetStringFUTF16(IDS_OPTIONS_SYSTEM_PROXIES_LABEL, 605 label_str = l10n_util::GetStringFUTF16(IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
606 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 606 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
607 } 607 }
608 StringValue label(label_str); 608 StringValue label(label_str);
609 609
610 web_ui_->CallJavascriptFunction( 610 web_ui_->CallJavascriptFunction(
611 "options.AdvancedOptions.SetupProxySettingsSection", disabled, label); 611 "options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
612 } 612 }
613 613
614 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 614 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
615 #if !defined(OS_MACOSX)
616 // Don't display "Check for server certificate revocation" on Mac until
617 // http://crbug.com/78523 is fixed.
618 { 615 {
619 FundamentalValue checked(rev_checking_enabled_.GetValue()); 616 FundamentalValue checked(rev_checking_enabled_.GetValue());
620 FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 617 FundamentalValue disabled(rev_checking_enabled_.IsManaged());
621 web_ui_->CallJavascriptFunction( 618 web_ui_->CallJavascriptFunction(
622 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, 619 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
623 disabled); 620 disabled);
624 } 621 }
625 #endif
626 { 622 {
627 FundamentalValue checked(ssl3_enabled_.GetValue()); 623 FundamentalValue checked(ssl3_enabled_.GetValue());
628 FundamentalValue disabled(ssl3_enabled_.IsManaged()); 624 FundamentalValue disabled(ssl3_enabled_.IsManaged());
629 web_ui_->CallJavascriptFunction( 625 web_ui_->CallJavascriptFunction(
630 "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled); 626 "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled);
631 } 627 }
632 { 628 {
633 FundamentalValue checked(tls1_enabled_.GetValue()); 629 FundamentalValue checked(tls1_enabled_.GetValue());
634 FundamentalValue disabled(tls1_enabled_.IsManaged()); 630 FundamentalValue disabled(tls1_enabled_.IsManaged());
635 web_ui_->CallJavascriptFunction( 631 web_ui_->CallJavascriptFunction(
636 "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled); 632 "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled);
637 } 633 }
638 } 634 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698