OLD | NEW |
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_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/string_split.h" | 9 #include "base/string_split.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, | 39 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, |
40 { switches::kNoReferrers, prefs::kEnableReferrers, false }, | 40 { switches::kNoReferrers, prefs::kEnableReferrers, false }, |
41 { switches::kAllowRunningInsecureContent, | 41 { switches::kAllowRunningInsecureContent, |
42 prefs::kWebKitAllowRunningInsecureContent, true }, | 42 prefs::kWebKitAllowRunningInsecureContent, true }, |
43 { switches::kNoDisplayingInsecureContent, | 43 { switches::kNoDisplayingInsecureContent, |
44 prefs::kWebKitAllowDisplayingInsecureContent, false }, | 44 prefs::kWebKitAllowDisplayingInsecureContent, false }, |
45 { switches::kAllowCrossOriginAuthPrompt, | 45 { switches::kAllowCrossOriginAuthPrompt, |
46 prefs::kAllowCrossOriginAuthPrompt, true }, | 46 prefs::kAllowCrossOriginAuthPrompt, true }, |
47 { switches::kDisableSSL3, prefs::kSSL3Enabled, false }, | 47 { switches::kDisableSSL3, prefs::kSSL3Enabled, false }, |
48 { switches::kDisableTLS1, prefs::kTLS1Enabled, false }, | 48 { switches::kDisableTLS1, prefs::kTLS1Enabled, false }, |
| 49 { switches::kEnableOriginBoundCerts, prefs::kEnableOriginBoundCerts, |
| 50 true }, |
49 }; | 51 }; |
50 | 52 |
51 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry | 53 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry |
52 CommandLinePrefStore::integer_switch_map_[] = { | 54 CommandLinePrefStore::integer_switch_map_[] = { |
53 { switches::kDiskCacheSize, prefs::kDiskCacheSize }, | 55 { switches::kDiskCacheSize, prefs::kDiskCacheSize }, |
54 { switches::kMediaCacheSize, prefs::kMediaCacheSize }, | 56 { switches::kMediaCacheSize, prefs::kMediaCacheSize }, |
55 }; | 57 }; |
56 | 58 |
57 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) | 59 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) |
58 : command_line_(command_line) { | 60 : command_line_(command_line) { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 std::vector<std::string> cipher_strings; | 144 std::vector<std::string> cipher_strings; |
143 base::SplitString(cipher_suites, ',', &cipher_strings); | 145 base::SplitString(cipher_suites, ',', &cipher_strings); |
144 base::ListValue* list_value = new base::ListValue(); | 146 base::ListValue* list_value = new base::ListValue(); |
145 for (std::vector<std::string>::const_iterator it = cipher_strings.begin(); | 147 for (std::vector<std::string>::const_iterator it = cipher_strings.begin(); |
146 it != cipher_strings.end(); ++it) { | 148 it != cipher_strings.end(); ++it) { |
147 list_value->Append(base::Value::CreateStringValue(*it)); | 149 list_value->Append(base::Value::CreateStringValue(*it)); |
148 } | 150 } |
149 SetValue(prefs::kCipherSuiteBlacklist, list_value); | 151 SetValue(prefs::kCipherSuiteBlacklist, list_value); |
150 } | 152 } |
151 } | 153 } |
OLD | NEW |