| 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_CHROMEOS_UI_PROXY_CONFIG_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_H_ | 6 #define CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "chrome/browser/prefs/proxy_prefs.h" | 10 #include "components/proxy_config/proxy_prefs.h" |
| 11 #include "net/proxy/proxy_bypass_rules.h" | 11 #include "net/proxy/proxy_bypass_rules.h" |
| 12 #include "net/proxy/proxy_server.h" | 12 #include "net/proxy/proxy_server.h" |
| 13 #include "url/gurl.h" | 13 #include "url/gurl.h" |
| 14 | 14 |
| 15 namespace base { | 15 namespace base { |
| 16 class DictionaryValue; | 16 class DictionaryValue; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace net { | 19 namespace net { |
| 20 class ProxyConfig; | 20 class ProxyConfig; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 // Set if mode is MODE_PROXY_PER_SCHEME and has socks proxy. | 107 // Set if mode is MODE_PROXY_PER_SCHEME and has socks proxy. |
| 108 ManualProxy socks_proxy; | 108 ManualProxy socks_proxy; |
| 109 | 109 |
| 110 // Exceptions for when not to use a proxy. | 110 // Exceptions for when not to use a proxy. |
| 111 net::ProxyBypassRules bypass_rules; | 111 net::ProxyBypassRules bypass_rules; |
| 112 }; | 112 }; |
| 113 | 113 |
| 114 } // namespace chromeos | 114 } // namespace chromeos |
| 115 | 115 |
| 116 #endif // CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_H_ | 116 #endif // CHROME_BROWSER_CHROMEOS_UI_PROXY_CONFIG_H_ |
| OLD | NEW |