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

Side by Side Diff: chrome/browser/prefs/command_line_pref_store.cc

Issue 8402019: Add back prefs::kSSL3Enabled and prefs::kTLS1Enabled, but control (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wtc feedback Created 9 years, 1 month 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/prefs/command_line_pref_store.h" 5 #include "chrome/browser/prefs/command_line_pref_store.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_split.h" 8 #include "base/string_split.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/prefs/proxy_config_dictionary.h" 10 #include "chrome/browser/prefs/proxy_config_dictionary.h"
(...skipping 24 matching lines...) Expand all
35 { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize, 35 { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
36 true }, 36 true },
37 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, 37 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
38 { switches::kNoReferrers, prefs::kEnableReferrers, false }, 38 { switches::kNoReferrers, prefs::kEnableReferrers, false },
39 { switches::kAllowRunningInsecureContent, 39 { switches::kAllowRunningInsecureContent,
40 prefs::kWebKitAllowRunningInsecureContent, true }, 40 prefs::kWebKitAllowRunningInsecureContent, true },
41 { switches::kNoDisplayingInsecureContent, 41 { switches::kNoDisplayingInsecureContent,
42 prefs::kWebKitAllowDisplayingInsecureContent, false }, 42 prefs::kWebKitAllowDisplayingInsecureContent, false },
43 { switches::kAllowCrossOriginAuthPrompt, 43 { switches::kAllowCrossOriginAuthPrompt,
44 prefs::kAllowCrossOriginAuthPrompt, true }, 44 prefs::kAllowCrossOriginAuthPrompt, true },
45 { switches::kDisableSSL3, prefs::kSSL3Enabled, false },
46 { switches::kDisableTLS1, prefs::kTLS1Enabled, false },
45 }; 47 };
46 48
47 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) 49 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)
48 : command_line_(command_line) { 50 : command_line_(command_line) {
49 ApplySimpleSwitches(); 51 ApplySimpleSwitches();
50 ApplyProxyMode(); 52 ApplyProxyMode();
51 ValidateProxySwitches(); 53 ValidateProxySwitches();
52 ApplySSLSwitches(); 54 ApplySSLSwitches();
53 } 55 }
54 56
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 std::vector<std::string> cipher_strings; 118 std::vector<std::string> cipher_strings;
117 base::SplitString(cipher_suites, ',', &cipher_strings); 119 base::SplitString(cipher_suites, ',', &cipher_strings);
118 base::ListValue* list_value = new base::ListValue(); 120 base::ListValue* list_value = new base::ListValue();
119 for (std::vector<std::string>::const_iterator it = cipher_strings.begin(); 121 for (std::vector<std::string>::const_iterator it = cipher_strings.begin();
120 it != cipher_strings.end(); ++it) { 122 it != cipher_strings.end(); ++it) {
121 list_value->Append(base::Value::CreateStringValue(*it)); 123 list_value->Append(base::Value::CreateStringValue(*it));
122 } 124 }
123 SetValue(prefs::kCipherSuiteBlacklist, list_value); 125 SetValue(prefs::kCipherSuiteBlacklist, list_value);
124 } 126 }
125 } 127 }
OLDNEW
« no previous file with comments | « chrome/browser/net/ssl_config_service_manager_pref_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698