| 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 #include "chrome/browser/net/proxy_service_factory.h" | 5 #include "chrome/browser/net/proxy_service_factory.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/io_thread.h" | 11 #include "chrome/browser/io_thread.h" |
| 12 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 12 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 16 #include "net/base/net_log.h" | 16 #include "net/base/net_log.h" |
| 17 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" | 17 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" |
| 18 #include "net/proxy/proxy_config_service.h" | 18 #include "net/proxy/proxy_config_service.h" |
| 19 #include "net/proxy/proxy_script_fetcher_impl.h" | 19 #include "net/proxy/proxy_script_fetcher_impl.h" |
| 20 #include "net/proxy/proxy_service.h" | 20 #include "net/proxy/proxy_service.h" |
| 21 #include "net/proxy/proxy_service_v8.h" | 21 #include "net/proxy/proxy_service_v8.h" |
| 22 #include "net/url_request/url_request_context.h" | 22 #include "net/url_request/url_request_context.h" |
| 23 | 23 |
| 24 #if defined(OS_CHROMEOS) | 24 #if defined(OS_CHROMEOS) |
| 25 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 25 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 26 #include "chromeos/network/dhcp_proxy_script_fetcher_chromeos.h" | 26 #include "chromeos/network/dhcp_proxy_script_fetcher_chromeos.h" |
| 27 #endif // defined(OS_CHROMEOS) | 27 #endif // defined(OS_CHROMEOS) |
| 28 | 28 |
| 29 #if defined(OS_WIN) | |
| 30 #include "win8/util/win8_util.h" | |
| 31 #endif | |
| 32 | |
| 33 #if !defined(OS_IOS) | 29 #if !defined(OS_IOS) |
| 34 #include "net/proxy/proxy_resolver_v8.h" | 30 #include "net/proxy/proxy_resolver_v8.h" |
| 35 #endif | 31 #endif |
| 36 | 32 |
| 37 using content::BrowserThread; | 33 using content::BrowserThread; |
| 38 | 34 |
| 39 // static | 35 // static |
| 40 net::ProxyConfigService* ProxyServiceFactory::CreateProxyConfigService( | 36 net::ProxyConfigService* ProxyServiceFactory::CreateProxyConfigService( |
| 41 PrefProxyConfigTracker* tracker) { | 37 PrefProxyConfigTracker* tracker) { |
| 42 // The linux gconf-based proxy settings getter relies on being initialized | 38 // The linux gconf-based proxy settings getter relies on being initialized |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( | 151 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( |
| 156 proxy_config_service, | 152 proxy_config_service, |
| 157 num_pac_threads, | 153 num_pac_threads, |
| 158 net_log); | 154 net_log); |
| 159 } | 155 } |
| 160 | 156 |
| 161 proxy_service->set_quick_check_enabled(quick_check_enabled); | 157 proxy_service->set_quick_check_enabled(quick_check_enabled); |
| 162 | 158 |
| 163 return proxy_service; | 159 return proxy_service; |
| 164 } | 160 } |
| OLD | NEW |