| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CHROME_BROWSER_NET_FIREFOX_PROXY_SETTINGS_H_ | 5 #ifndef CHROME_BROWSER_NET_FIREFOX_PROXY_SETTINGS_H_ |
| 6 #define CHROME_BROWSER_NET_FIREFOX_PROXY_SETTINGS_H_ | 6 #define CHROME_BROWSER_NET_FIREFOX_PROXY_SETTINGS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/macros.h" |
| 12 | 12 |
| 13 namespace base { | 13 namespace base { |
| 14 class FilePath; | 14 class FilePath; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace net { | 17 namespace net { |
| 18 class ProxyConfig; | 18 class ProxyConfig; |
| 19 } | 19 } |
| 20 | 20 |
| 21 class FirefoxProxySettings { | 21 class FirefoxProxySettings { |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 SOCKSVersion socks_version_; | 101 SOCKSVersion socks_version_; |
| 102 | 102 |
| 103 std::vector<std::string> proxy_bypass_list_; | 103 std::vector<std::string> proxy_bypass_list_; |
| 104 | 104 |
| 105 std::string autoconfig_url_; | 105 std::string autoconfig_url_; |
| 106 | 106 |
| 107 DISALLOW_COPY_AND_ASSIGN(FirefoxProxySettings); | 107 DISALLOW_COPY_AND_ASSIGN(FirefoxProxySettings); |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 #endif // CHROME_BROWSER_NET_FIREFOX_PROXY_SETTINGS_H_ | 110 #endif // CHROME_BROWSER_NET_FIREFOX_PROXY_SETTINGS_H_ |
| OLD | NEW |