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 25 matching lines...) Expand all Loading... | |
36 #include "webrtc/base/httpcommon.h" | 36 #include "webrtc/base/httpcommon.h" |
37 #include "webrtc/base/httpcommon-inl.h" | 37 #include "webrtc/base/httpcommon-inl.h" |
38 #include "webrtc/base/pathutils.h" | 38 #include "webrtc/base/pathutils.h" |
39 #include "webrtc/base/stringutils.h" | 39 #include "webrtc/base/stringutils.h" |
40 | 40 |
41 #if defined(WEBRTC_WIN) | 41 #if defined(WEBRTC_WIN) |
42 #define _TRY_WINHTTP 1 | 42 #define _TRY_WINHTTP 1 |
43 #define _TRY_JSPROXY 0 | 43 #define _TRY_JSPROXY 0 |
44 #define _TRY_WM_FINDPROXY 0 | 44 #define _TRY_WM_FINDPROXY 0 |
45 #define _TRY_IE_LAN_SETTINGS 1 | 45 #define _TRY_IE_LAN_SETTINGS 1 |
46 #else | |
47 #define _TRY_WINHTTP 0 | |
48 #define _TRY_JSPROXY 0 | |
kjellander_webrtc
2016/09/23 12:32:36
_TRY_JSPROXY 1 ?
kwiberg-webrtc
2016/09/26 08:34:30
It used to default to 0 (unless someone was settin
kjellander_webrtc
2016/09/26 08:38:14
OK, but then you can move them outside the
#if def
kwiberg-webrtc
2016/09/26 08:48:52
Sure.
| |
49 #define _TRY_WM_FINDPROXY 0 | |
kjellander_webrtc
2016/09/23 12:32:36
_TRY_WM_FINDPROXY 1 ?
kwiberg-webrtc
2016/09/26 08:34:30
Same.
| |
50 #define _TRY_IE_LAN_SETTINGS 0 | |
46 #endif // WEBRTC_WIN | 51 #endif // WEBRTC_WIN |
47 | 52 |
48 // For all platforms try Firefox. | 53 // For all platforms try Firefox. |
49 #define _TRY_FIREFOX 1 | 54 #define _TRY_FIREFOX 1 |
50 | 55 |
51 // Use profiles.ini to find the correct profile for this user. | 56 // Use profiles.ini to find the correct profile for this user. |
52 // If not set, we'll just look for the default one. | 57 // If not set, we'll just look for the default one. |
53 #define USE_FIREFOX_PROFILES_INI 1 | 58 #define USE_FIREFOX_PROFILES_INI 1 |
54 | 59 |
55 static const size_t kMaxLineLength = 1024; | 60 static const size_t kMaxLineLength = 1024; |
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1286 if (!result) { | 1291 if (!result) { |
1287 // Either auto detection is not supported or we simply didn't | 1292 // Either auto detection is not supported or we simply didn't |
1288 // find any proxy, reset type. | 1293 // find any proxy, reset type. |
1289 proxy->type = rtc::PROXY_NONE; | 1294 proxy->type = rtc::PROXY_NONE; |
1290 } | 1295 } |
1291 } | 1296 } |
1292 return result; | 1297 return result; |
1293 } | 1298 } |
1294 | 1299 |
1295 } // namespace rtc | 1300 } // namespace rtc |
OLD | NEW |