| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "net/proxy/proxy_service.h" | 5 #include "net/proxy/proxy_service.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "googleurl/src/gurl.h" | 13 #include "googleurl/src/gurl.h" |
| 14 #include "net/base/load_log.h" | 14 #include "net/base/load_log.h" |
| 15 #include "net/base/net_errors.h" | 15 #include "net/base/net_errors.h" |
| 16 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
| 17 #include "net/proxy/init_proxy_resolver.h" | 17 #include "net/proxy/init_proxy_resolver.h" |
| 18 #include "net/proxy/proxy_config_service_fixed.h" | 18 #include "net/proxy/proxy_config_service_fixed.h" |
| 19 #include "net/proxy/proxy_script_fetcher.h" | 19 #include "net/proxy/proxy_script_fetcher.h" |
| 20 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
| 21 #include "net/proxy/proxy_config_service_win.h" | 21 #include "net/proxy/proxy_config_service_win.h" |
| 22 #include "net/proxy/proxy_resolver_winhttp.h" | 22 #include "net/proxy/proxy_resolver_winhttp.h" |
| 23 #elif defined(OS_MACOSX) | 23 #elif defined(OS_MACOSX) |
| 24 #include "net/proxy/proxy_config_service_mac.h" |
| 24 #include "net/proxy/proxy_resolver_mac.h" | 25 #include "net/proxy/proxy_resolver_mac.h" |
| 25 #elif defined(OS_LINUX) | 26 #elif defined(OS_LINUX) |
| 26 #include "net/proxy/proxy_config_service_linux.h" | 27 #include "net/proxy/proxy_config_service_linux.h" |
| 27 #endif | 28 #endif |
| 28 #include "net/proxy/proxy_resolver.h" | 29 #include "net/proxy/proxy_resolver.h" |
| 29 #include "net/proxy/proxy_resolver_js_bindings.h" | 30 #include "net/proxy/proxy_resolver_js_bindings.h" |
| 30 #include "net/proxy/proxy_resolver_v8.h" | 31 #include "net/proxy/proxy_resolver_v8.h" |
| 31 #include "net/proxy/single_threaded_proxy_resolver.h" | 32 #include "net/proxy/single_threaded_proxy_resolver.h" |
| 32 #include "net/url_request/url_request_context.h" | 33 #include "net/url_request/url_request_context.h" |
| 33 | 34 |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 826 OnCompletion(result_); | 827 OnCompletion(result_); |
| 827 } | 828 } |
| 828 } | 829 } |
| 829 | 830 |
| 830 void SyncProxyServiceHelper::OnCompletion(int rv) { | 831 void SyncProxyServiceHelper::OnCompletion(int rv) { |
| 831 result_ = rv; | 832 result_ = rv; |
| 832 event_.Signal(); | 833 event_.Signal(); |
| 833 } | 834 } |
| 834 | 835 |
| 835 } // namespace net | 836 } // namespace net |
| OLD | NEW |