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/proxy_config_dictionary.h" | 5 #include "components/proxy_config/proxy_config_dictionary.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 | 10 |
11 namespace { | 11 namespace { |
12 | 12 |
13 // Integer to specify the type of proxy settings. | 13 // Integer to specify the type of proxy settings. |
14 // See ProxyPrefs for possible values and interactions with the other proxy | 14 // See ProxyPrefs for possible values and interactions with the other proxy |
15 // preferences. | 15 // preferences. |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 if (!pac_url.empty()) { | 134 if (!pac_url.empty()) { |
135 dict->SetString(kProxyPacUrl, pac_url); | 135 dict->SetString(kProxyPacUrl, pac_url); |
136 dict->SetBoolean(kProxyPacMandatory, pac_mandatory); | 136 dict->SetBoolean(kProxyPacMandatory, pac_mandatory); |
137 } | 137 } |
138 if (!proxy_server.empty()) | 138 if (!proxy_server.empty()) |
139 dict->SetString(kProxyServer, proxy_server); | 139 dict->SetString(kProxyServer, proxy_server); |
140 if (!bypass_list.empty()) | 140 if (!bypass_list.empty()) |
141 dict->SetString(kProxyBypassList, bypass_list); | 141 dict->SetString(kProxyBypassList, bypass_list); |
142 return dict; | 142 return dict; |
143 } | 143 } |
OLD | NEW |