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

Unified Diff: chrome/browser/ui/options/options_util.cc

Issue 6693077: Read and Write SSL3, TLS1 and Cert revocation SSL preferences (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
Index: chrome/browser/ui/options/options_util.cc
===================================================================
--- chrome/browser/ui/options/options_util.cc (revision 80525)
+++ chrome/browser/ui/options/options_util.cc (working copy)
@@ -38,11 +38,12 @@
prefs::kDeleteFormData,
prefs::kDeletePasswords,
prefs::kDnsPrefetchingEnabled,
-#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
+ // TODO(rtenneti): Remove ssl preferences from user_prefs when we stop
+ // migrating user_prefs to local_state after 6 months (after we delete
+ // migration code).
prefs::kCertRevocationCheckingEnabled,
prefs::kSSL3Enabled,
prefs::kTLS1Enabled,
-#endif
#if defined(OS_CHROMEOS)
prefs::kTapToClickEnabled,
prefs::kTouchpadSensitivity,
@@ -96,11 +97,9 @@
// don't reset it.
const char* kLocalStatePrefs[] = {
prefs::kApplicationLocale,
-#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
prefs::kCertRevocationCheckingEnabled,
prefs::kSSL3Enabled,
prefs::kTLS1Enabled,
-#endif
};
for (size_t i = 0; i < arraysize(kLocalStatePrefs); ++i)
local_state->ClearPref(kLocalStatePrefs[i]);
« no previous file with comments | « chrome/browser/net/ssl_config_service_manager.h ('k') | chrome/browser/ui/webui/options/advanced_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698