OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/app_switches.h" | 7 #include "app/app_switches.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 }; | 24 }; |
25 | 25 |
26 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry | 26 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry |
27 CommandLinePrefStore::boolean_switch_map_[] = { | 27 CommandLinePrefStore::boolean_switch_map_[] = { |
28 { switches::kNoProxyServer, prefs::kNoProxyServer, true }, | 28 { switches::kNoProxyServer, prefs::kNoProxyServer, true }, |
29 { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true }, | 29 { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true }, |
30 { switches::kDisableAuthNegotiateCnameLookup, | 30 { switches::kDisableAuthNegotiateCnameLookup, |
31 prefs::kDisableAuthNegotiateCnameLookup, true }, | 31 prefs::kDisableAuthNegotiateCnameLookup, true }, |
32 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, | 32 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, |
33 true }, | 33 true }, |
| 34 { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true }, |
34 }; | 35 }; |
35 | 36 |
36 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) | 37 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) |
37 : command_line_(command_line) { | 38 : command_line_(command_line) { |
38 ApplySimpleSwitches(); | 39 ApplySimpleSwitches(); |
39 ValidateProxySwitches(); | 40 ValidateProxySwitches(); |
40 } | 41 } |
41 | 42 |
42 CommandLinePrefStore::~CommandLinePrefStore() {} | 43 CommandLinePrefStore::~CommandLinePrefStore() {} |
43 | 44 |
(...skipping 21 matching lines...) Expand all Loading... |
65 (command_line_->HasSwitch(switches::kProxyAutoDetect) || | 66 (command_line_->HasSwitch(switches::kProxyAutoDetect) || |
66 command_line_->HasSwitch(switches::kProxyServer) || | 67 command_line_->HasSwitch(switches::kProxyServer) || |
67 command_line_->HasSwitch(switches::kProxyPacUrl) || | 68 command_line_->HasSwitch(switches::kProxyPacUrl) || |
68 command_line_->HasSwitch(switches::kProxyBypassList))) { | 69 command_line_->HasSwitch(switches::kProxyBypassList))) { |
69 LOG(WARNING) << "Additional command-line proxy switches specified when --" | 70 LOG(WARNING) << "Additional command-line proxy switches specified when --" |
70 << switches::kNoProxyServer << " was also specified."; | 71 << switches::kNoProxyServer << " was also specified."; |
71 return false; | 72 return false; |
72 } | 73 } |
73 return true; | 74 return true; |
74 } | 75 } |
OLD | NEW |