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/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 9 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry | 24 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry |
25 CommandLinePrefStore::boolean_switch_map_[] = { | 25 CommandLinePrefStore::boolean_switch_map_[] = { |
26 { switches::kDisableAuthNegotiateCnameLookup, | 26 { switches::kDisableAuthNegotiateCnameLookup, |
27 prefs::kDisableAuthNegotiateCnameLookup, true }, | 27 prefs::kDisableAuthNegotiateCnameLookup, true }, |
28 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, | 28 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, |
29 true }, | 29 true }, |
30 { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true }, | 30 { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true }, |
31 { switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled, | 31 { switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled, |
32 true }, | 32 true }, |
33 { switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true }, | 33 { switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true }, |
| 34 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, |
| 35 { switches::kNoReferrers, prefs::kEnableReferrers, false }, |
34 }; | 36 }; |
35 | 37 |
36 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) | 38 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) |
37 : command_line_(command_line) { | 39 : command_line_(command_line) { |
38 ApplySimpleSwitches(); | 40 ApplySimpleSwitches(); |
39 ApplyProxyMode(); | 41 ApplyProxyMode(); |
40 ValidateProxySwitches(); | 42 ValidateProxySwitches(); |
41 } | 43 } |
42 | 44 |
43 CommandLinePrefStore::~CommandLinePrefStore() {} | 45 CommandLinePrefStore::~CommandLinePrefStore() {} |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } else if (command_line_->HasSwitch(switches::kProxyServer)) { | 91 } else if (command_line_->HasSwitch(switches::kProxyServer)) { |
90 std::string proxy_server = | 92 std::string proxy_server = |
91 command_line_->GetSwitchValueASCII(switches::kProxyServer); | 93 command_line_->GetSwitchValueASCII(switches::kProxyServer); |
92 std::string bypass_list = | 94 std::string bypass_list = |
93 command_line_->GetSwitchValueASCII(switches::kProxyBypassList); | 95 command_line_->GetSwitchValueASCII(switches::kProxyBypassList); |
94 SetValue(prefs::kProxy, | 96 SetValue(prefs::kProxy, |
95 ProxyConfigDictionary::CreateFixedServers(proxy_server, | 97 ProxyConfigDictionary::CreateFixedServers(proxy_server, |
96 bypass_list)); | 98 bypass_list)); |
97 } | 99 } |
98 } | 100 } |
OLD | NEW |