| 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 #ifndef NET_BASE_NET_UTIL_H_ | 5 #ifndef NET_BASE_NET_UTIL_H_ |
| 6 #define NET_BASE_NET_UTIL_H_ | 6 #define NET_BASE_NET_UTIL_H_ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| 11 #include <windows.h> | 11 #include <windows.h> |
| 12 #include <ws2tcpip.h> | 12 #include <ws2tcpip.h> |
| 13 #elif defined(OS_POSIX) | 13 #elif defined(OS_POSIX) |
| 14 #include <sys/types.h> | 14 #include <sys/types.h> |
| 15 #include <sys/socket.h> | 15 #include <sys/socket.h> |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 #include <string> | 18 #include <string> |
| 19 #include <vector> | 19 #include <vector> |
| 20 | 20 |
| 21 #include "base/basictypes.h" | 21 #include "base/basictypes.h" |
| 22 #include "base/strings/string16.h" | 22 #include "base/strings/string16.h" |
| 23 #include "net/base/address_family.h" | 23 #include "net/base/address_family.h" |
| 24 #include "net/base/escape.h" | 24 #include "net/base/escape.h" |
| 25 #include "net/base/net_export.h" | 25 #include "net/base/net_export.h" |
| 26 #include "net/base/net_log.h" | 26 #include "net/base/net_log.h" |
| 27 | 27 |
| 28 class GURL; | 28 class GURL; |
| 29 #if defined(OS_ANDROID) |
| 30 #include <jni.h> |
| 31 #endif |
| 29 | 32 |
| 30 namespace base { | 33 namespace base { |
| 31 class Time; | 34 class Time; |
| 32 } | 35 } |
| 33 | 36 |
| 34 namespace url_canon { | 37 namespace url_canon { |
| 35 struct CanonHostInfo; | 38 struct CanonHostInfo; |
| 36 } | 39 } |
| 37 | 40 |
| 38 namespace url_parse { | 41 namespace url_parse { |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 DSCP_AF41 = 34, // Video | 518 DSCP_AF41 = 34, // Video |
| 516 DSCP_AF42 = 36, // Video | 519 DSCP_AF42 = 36, // Video |
| 517 DSCP_AF43 = 38, // Video | 520 DSCP_AF43 = 38, // Video |
| 518 DSCP_CS5 = 40, // Video | 521 DSCP_CS5 = 40, // Video |
| 519 DSCP_EF = 46, // Voice | 522 DSCP_EF = 46, // Voice |
| 520 DSCP_CS6 = 48, // Voice | 523 DSCP_CS6 = 48, // Voice |
| 521 DSCP_CS7 = 56, // Control messages | 524 DSCP_CS7 = 56, // Control messages |
| 522 DSCP_LAST = DSCP_CS7 | 525 DSCP_LAST = DSCP_CS7 |
| 523 }; | 526 }; |
| 524 | 527 |
| 528 // Network operator numeric name. |
| 529 NET_EXPORT std::string GetNetworkOperatorID(); |
| 530 |
| 531 #if defined(OS_ANDROID) |
| 532 bool NetworkInfo_GetNetworkOperatorID(JNIEnv* env); |
| 533 #endif |
| 534 |
| 525 } // namespace net | 535 } // namespace net |
| 526 | 536 |
| 527 #endif // NET_BASE_NET_UTIL_H_ | 537 #endif // NET_BASE_NET_UTIL_H_ |
| OLD | NEW |