| 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" |
| 11 #include "chrome/common/pref_names.h" | 11 #include "chrome/common/pref_names.h" |
| 12 | 12 |
| 13 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry | 13 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry |
| 14 CommandLinePrefStore::string_switch_map_[] = { | 14 CommandLinePrefStore::string_switch_map_[] = { |
| 15 { switches::kLang, prefs::kApplicationLocale }, | 15 { switches::kLang, prefs::kApplicationLocale }, |
| 16 { switches::kProxyServer, prefs::kProxyServer }, | 16 { switches::kProxyServer, prefs::kProxyServer }, |
| 17 { switches::kProxyPacUrl, prefs::kProxyPacUrl }, | 17 { switches::kProxyPacUrl, prefs::kProxyPacUrl }, |
| 18 { switches::kProxyBypassList, prefs::kProxyBypassList }, | 18 { switches::kProxyBypassList, prefs::kProxyBypassList }, |
| 19 { switches::kAuthSchemes, prefs::kAuthSchemes }, | 19 { switches::kAuthSchemes, prefs::kAuthSchemes }, |
| 20 { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist }, | 20 { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist }, |
| 21 { switches::kAuthNegotiateDelegateWhitelist, | 21 { switches::kAuthNegotiateDelegateWhitelist, |
| 22 prefs::kAuthNegotiateDelegateWhitelist }, | 22 prefs::kAuthNegotiateDelegateWhitelist }, |
| 23 { switches::kGSSAPILibraryName, prefs::kGSSAPILibraryName }, |
| 23 }; | 24 }; |
| 24 | 25 |
| 25 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry | 26 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry |
| 26 CommandLinePrefStore::boolean_switch_map_[] = { | 27 CommandLinePrefStore::boolean_switch_map_[] = { |
| 27 { switches::kNoProxyServer, prefs::kNoProxyServer, true }, | 28 { switches::kNoProxyServer, prefs::kNoProxyServer, true }, |
| 28 { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true }, | 29 { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true }, |
| 29 { switches::kDisableAuthNegotiateCnameLookup, | 30 { switches::kDisableAuthNegotiateCnameLookup, |
| 30 prefs::kDisableAuthNegotiateCnameLookup, true }, | 31 prefs::kDisableAuthNegotiateCnameLookup, true }, |
| 31 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, | 32 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, |
| 32 true }, | 33 true }, |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 (command_line_->HasSwitch(switches::kProxyAutoDetect) || | 69 (command_line_->HasSwitch(switches::kProxyAutoDetect) || |
| 69 command_line_->HasSwitch(switches::kProxyServer) || | 70 command_line_->HasSwitch(switches::kProxyServer) || |
| 70 command_line_->HasSwitch(switches::kProxyPacUrl) || | 71 command_line_->HasSwitch(switches::kProxyPacUrl) || |
| 71 command_line_->HasSwitch(switches::kProxyBypassList))) { | 72 command_line_->HasSwitch(switches::kProxyBypassList))) { |
| 72 LOG(WARNING) << "Additional command-line proxy switches specified when --" | 73 LOG(WARNING) << "Additional command-line proxy switches specified when --" |
| 73 << switches::kNoProxyServer << " was also specified."; | 74 << switches::kNoProxyServer << " was also specified."; |
| 74 return false; | 75 return false; |
| 75 } | 76 } |
| 76 return true; | 77 return true; |
| 77 } | 78 } |
| OLD | NEW |