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 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <winhttp.h> | 9 #include <winhttp.h> |
10 #endif | 10 #endif |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 // (because the configuration will never require PAC). | 347 // (because the configuration will never require PAC). |
348 return new ProxyService(new ProxyConfigServiceFixed(*pi), NULL); | 348 return new ProxyService(new ProxyConfigServiceFixed(*pi), NULL); |
349 } | 349 } |
350 #if defined(OS_WIN) | 350 #if defined(OS_WIN) |
351 return new ProxyService(new ProxyConfigServiceWin(), | 351 return new ProxyService(new ProxyConfigServiceWin(), |
352 new ProxyResolverWinHttp()); | 352 new ProxyResolverWinHttp()); |
353 #elif defined(OS_MACOSX) | 353 #elif defined(OS_MACOSX) |
354 return new ProxyService(new ProxyConfigServiceMac(), | 354 return new ProxyService(new ProxyConfigServiceMac(), |
355 new ProxyResolverMac()); | 355 new ProxyResolverMac()); |
356 #else | 356 #else |
357 // This used to be a NOTIMPLEMENTED(), but that logs as an error, | 357 // TODO(port): implement ProxyConfigServiceLinux as well as make use of |
358 // screwing up layout tests. | 358 // ProxyResolverV8 once it's implemented. |
359 LOG(WARNING) << "Proxies are not implemented; remove me once that's fixed."; | 359 // See: |
360 // http://code.google.com/p/chromium/issues/detail?id=4523 is the bug | 360 // - http://code.google.com/p/chromium/issues/detail?id=8143 |
361 // to implement this. | 361 // - http://code.google.com/p/chromium/issues/detail?id=2764 |
362 return CreateNull(); | 362 return CreateNull(); |
363 #endif | 363 #endif |
364 } | 364 } |
365 | 365 |
366 // static | 366 // static |
367 ProxyService* ProxyService::CreateNull() { | 367 ProxyService* ProxyService::CreateNull() { |
368 // The ProxyResolver is set to NULL, since it should never be called | 368 // The ProxyResolver is set to NULL, since it should never be called |
369 // (because the configuration will never require PAC). | 369 // (because the configuration will never require PAC). |
370 return new ProxyService(new ProxyConfigServiceNull, NULL); | 370 return new ProxyService(new ProxyConfigServiceNull, NULL); |
371 } | 371 } |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 } | 774 } |
775 } | 775 } |
776 | 776 |
777 void SyncProxyServiceHelper::OnCompletion(int rv) { | 777 void SyncProxyServiceHelper::OnCompletion(int rv) { |
778 result_ = rv; | 778 result_ = rv; |
779 event_.Signal(); | 779 event_.Signal(); |
780 } | 780 } |
781 | 781 |
782 } // namespace net | 782 } // namespace net |
783 | 783 |
OLD | NEW |