| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #ifdef WEBRTC_IOS | 27 #ifdef WEBRTC_IOS |
| 28 #include <CFNetwork/CFNetwork.h> | 28 #include <CFNetwork/CFNetwork.h> |
| 29 #include "macconversion.h" | 29 #include "macconversion.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 #include <map> | 32 #include <map> |
| 33 #include <memory> | 33 #include <memory> |
| 34 | 34 |
| 35 #include "webrtc/base/arraysize.h" | 35 #include "webrtc/base/arraysize.h" |
| 36 #include "webrtc/base/checks.h" | 36 #include "webrtc/base/checks.h" |
| 37 #include "webrtc/base/common.h" |
| 37 #include "webrtc/base/fileutils.h" | 38 #include "webrtc/base/fileutils.h" |
| 38 #include "webrtc/base/httpcommon.h" | 39 #include "webrtc/base/httpcommon.h" |
| 39 #include "webrtc/base/httpcommon-inl.h" | 40 #include "webrtc/base/httpcommon-inl.h" |
| 40 #include "webrtc/base/pathutils.h" | 41 #include "webrtc/base/pathutils.h" |
| 41 #include "webrtc/base/stringutils.h" | 42 #include "webrtc/base/stringutils.h" |
| 42 | 43 |
| 43 #define _TRY_JSPROXY 0 | 44 #define _TRY_JSPROXY 0 |
| 44 #define _TRY_WM_FINDPROXY 0 | 45 #define _TRY_WM_FINDPROXY 0 |
| 45 | 46 |
| 46 #if defined(WEBRTC_WIN) | 47 #if defined(WEBRTC_WIN) |
| (...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1282 if (!result) { | 1283 if (!result) { |
| 1283 // Either auto detection is not supported or we simply didn't | 1284 // Either auto detection is not supported or we simply didn't |
| 1284 // find any proxy, reset type. | 1285 // find any proxy, reset type. |
| 1285 proxy->type = rtc::PROXY_NONE; | 1286 proxy->type = rtc::PROXY_NONE; |
| 1286 } | 1287 } |
| 1287 } | 1288 } |
| 1288 return result; | 1289 return result; |
| 1289 } | 1290 } |
| 1290 | 1291 |
| 1291 } // namespace rtc | 1292 } // namespace rtc |
| OLD | NEW |