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

Side by Side Diff: chrome/browser/net/ssl_config_service_manager_pref.cc

Issue 250583004: Remove the confusing certificate revocation checkbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Set rev_checking_enabled = false unless set by enterprise policy. Created 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/net/ssl_config_service_manager.h" 4 #include "chrome/browser/net/ssl_config_service_manager.h"
5 5
6 #include <algorithm> 6 #include <algorithm>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 BrowserThread::IO, 258 BrowserThread::IO,
259 FROM_HERE, 259 FROM_HERE,
260 base::Bind( 260 base::Bind(
261 &SSLConfigServicePref::SetNewSSLConfig, 261 &SSLConfigServicePref::SetNewSSLConfig,
262 ssl_config_service_.get(), 262 ssl_config_service_.get(),
263 new_config)); 263 new_config));
264 } 264 }
265 265
266 void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs( 266 void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
267 net::SSLConfig* config) { 267 net::SSLConfig* config) {
268 config->rev_checking_enabled = rev_checking_enabled_.GetValue(); 268 // rev_checking_enabled was formerly a user-settable preference, but now
269 // it is managed-only.
270 if (rev_checking_enabled_.IsManaged())
271 config->rev_checking_enabled = rev_checking_enabled_.GetValue();
272 else
273 config->rev_checking_enabled = false;
269 config->rev_checking_required_local_anchors = 274 config->rev_checking_required_local_anchors =
270 rev_checking_required_local_anchors_.GetValue(); 275 rev_checking_required_local_anchors_.GetValue();
271 std::string version_min_str = ssl_version_min_.GetValue(); 276 std::string version_min_str = ssl_version_min_.GetValue();
272 std::string version_max_str = ssl_version_max_.GetValue(); 277 std::string version_max_str = ssl_version_max_.GetValue();
273 config->version_min = net::kDefaultSSLVersionMin; 278 config->version_min = net::kDefaultSSLVersionMin;
274 config->version_max = net::kDefaultSSLVersionMax; 279 config->version_max = net::kDefaultSSLVersionMax;
275 uint16 version_min = SSLProtocolVersionFromString(version_min_str); 280 uint16 version_min = SSLProtocolVersionFromString(version_min_str);
276 uint16 version_max = SSLProtocolVersionFromString(version_max_str); 281 uint16 version_max = SSLProtocolVersionFromString(version_max_str);
277 if (version_min) { 282 if (version_min) {
278 // TODO(wtc): get the minimum SSL protocol version supported by the 283 // TODO(wtc): get the minimum SSL protocol version supported by the
(...skipping 27 matching lines...) Expand all
306 // static 311 // static
307 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( 312 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
308 PrefService* local_state) { 313 PrefService* local_state) {
309 return new SSLConfigServiceManagerPref(local_state); 314 return new SSLConfigServiceManagerPref(local_state);
310 } 315 }
311 316
312 // static 317 // static
313 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { 318 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
314 SSLConfigServiceManagerPref::RegisterPrefs(registry); 319 SSLConfigServiceManagerPref::RegisterPrefs(registry);
315 } 320 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698