| 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 "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/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1316 ApplyProxyConfigIfAvailable(); | 1316 ApplyProxyConfigIfAvailable(); |
| 1317 } | 1317 } |
| 1318 | 1318 |
| 1319 // static | 1319 // static |
| 1320 ProxyConfigService* ProxyService::CreateSystemProxyConfigService( | 1320 ProxyConfigService* ProxyService::CreateSystemProxyConfigService( |
| 1321 base::SingleThreadTaskRunner* io_thread_task_runner, | 1321 base::SingleThreadTaskRunner* io_thread_task_runner, |
| 1322 MessageLoop* file_loop) { | 1322 MessageLoop* file_loop) { |
| 1323 #if defined(OS_WIN) | 1323 #if defined(OS_WIN) |
| 1324 return new ProxyConfigServiceWin(); | 1324 return new ProxyConfigServiceWin(); |
| 1325 #elif defined(OS_IOS) | 1325 #elif defined(OS_IOS) |
| 1326 return new ProxyConfigServiceIOS(io_thread_task_runner); | 1326 return new ProxyConfigServiceIOS(); |
| 1327 #elif defined(OS_MACOSX) | 1327 #elif defined(OS_MACOSX) |
| 1328 return new ProxyConfigServiceMac(io_thread_task_runner); | 1328 return new ProxyConfigServiceMac(io_thread_task_runner); |
| 1329 #elif defined(OS_CHROMEOS) | 1329 #elif defined(OS_CHROMEOS) |
| 1330 LOG(ERROR) << "ProxyConfigService for ChromeOS should be created in " | 1330 LOG(ERROR) << "ProxyConfigService for ChromeOS should be created in " |
| 1331 << "profile_io_data.cc::CreateProxyConfigService and this should " | 1331 << "profile_io_data.cc::CreateProxyConfigService and this should " |
| 1332 << "be used only for examples."; | 1332 << "be used only for examples."; |
| 1333 return new UnsetProxyConfigService; | 1333 return new UnsetProxyConfigService; |
| 1334 #elif defined(OS_LINUX) | 1334 #elif defined(OS_LINUX) |
| 1335 ProxyConfigServiceLinux* linux_config_service = | 1335 ProxyConfigServiceLinux* linux_config_service = |
| 1336 new ProxyConfigServiceLinux(); | 1336 new ProxyConfigServiceLinux(); |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1546 OnCompletion(result_); | 1546 OnCompletion(result_); |
| 1547 } | 1547 } |
| 1548 } | 1548 } |
| 1549 | 1549 |
| 1550 void SyncProxyServiceHelper::OnCompletion(int rv) { | 1550 void SyncProxyServiceHelper::OnCompletion(int rv) { |
| 1551 result_ = rv; | 1551 result_ = rv; |
| 1552 event_.Signal(); | 1552 event_.Signal(); |
| 1553 } | 1553 } |
| 1554 | 1554 |
| 1555 } // namespace net | 1555 } // namespace net |
| OLD | NEW |