| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef NET_PROXY_PROXY_CONFIG_H_ | 5 #ifndef NET_PROXY_PROXY_CONFIG_H_ |
| 6 #define NET_PROXY_PROXY_CONFIG_H_ | 6 #define NET_PROXY_PROXY_CONFIG_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "net/base/net_export.h" | 10 #include "net/base/net_export.h" |
| 11 #include "net/proxy/proxy_bypass_rules.h" | 11 #include "net/proxy/proxy_bypass_rules.h" |
| 12 #include "net/proxy/proxy_config_source.h" | 12 #include "net/proxy/proxy_config_source.h" |
| 13 #include "net/proxy/proxy_list.h" | 13 #include "net/proxy/proxy_list.h" |
| 14 #include "net/proxy/proxy_server.h" | 14 #include "net/proxy/proxy_server.h" |
| 15 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 16 | 16 |
| 17 namespace base { | 17 namespace base { |
| 18 class Value; | 18 class Value; |
| 19 class DictionaryValue; |
| 19 } | 20 } |
| 20 | 21 |
| 21 namespace net { | 22 namespace net { |
| 22 | 23 |
| 23 class ProxyInfo; | 24 class ProxyInfo; |
| 24 | 25 |
| 25 // ProxyConfig describes a user's proxy settings. | 26 // ProxyConfig describes a user's proxy settings. |
| 26 // | 27 // |
| 27 // There are two categories of proxy settings: | 28 // There are two categories of proxy settings: |
| 28 // (1) Automatic (indicates the methods to obtain a PAC script) | 29 // (1) Automatic (indicates the methods to obtain a PAC script) |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 ProxyConfigSource source_; | 261 ProxyConfigSource source_; |
| 261 | 262 |
| 262 ID id_; | 263 ID id_; |
| 263 }; | 264 }; |
| 264 | 265 |
| 265 } // namespace net | 266 } // namespace net |
| 266 | 267 |
| 267 | 268 |
| 268 | 269 |
| 269 #endif // NET_PROXY_PROXY_CONFIG_H_ | 270 #endif // NET_PROXY_PROXY_CONFIG_H_ |
| OLD | NEW |