| 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 "base/strings/utf_offset_string_conversions.h" | 23 #include "base/strings/utf_offset_string_conversions.h" |
| 24 #include "net/base/address_family.h" | 24 #include "net/base/address_family.h" |
| 25 #include "net/base/escape.h" | 25 #include "net/base/escape.h" |
| 26 #include "net/base/ip_address_number.h" | |
| 27 #include "net/base/net_export.h" | 26 #include "net/base/net_export.h" |
| 28 #include "net/base/network_change_notifier.h" | 27 #include "net/base/network_change_notifier.h" |
| 29 // TODO(eroman): Remove this header and require consumers to include it | 28 // TODO(eroman): Remove this header and require consumers to include it |
| 30 // directly. | 29 // directly. |
| 31 #include "net/base/network_interfaces.h" | 30 #include "net/base/network_interfaces.h" |
| 32 | 31 |
| 33 class GURL; | 32 class GURL; |
| 34 | 33 |
| 35 namespace base { | 34 namespace base { |
| 36 class Time; | 35 class Time; |
| 37 } | 36 } |
| 38 | 37 |
| 39 namespace url { | 38 namespace url { |
| 40 struct CanonHostInfo; | 39 struct CanonHostInfo; |
| 41 struct Parsed; | 40 struct Parsed; |
| 42 } | 41 } |
| 43 | 42 |
| 44 namespace net { | 43 namespace net { |
| 45 | 44 |
| 45 // This is a "forward declaration" to avoid including ip_address_number.h |
| 46 // Keep this in sync. |
| 47 typedef std::vector<unsigned char> IPAddressNumber; |
| 48 |
| 46 // Used by FormatUrl to specify handling of certain parts of the url. | 49 // Used by FormatUrl to specify handling of certain parts of the url. |
| 47 typedef uint32 FormatUrlType; | 50 typedef uint32 FormatUrlType; |
| 48 typedef uint32 FormatUrlTypes; | 51 typedef uint32 FormatUrlTypes; |
| 49 | 52 |
| 50 #if defined(OS_WIN) | 53 #if defined(OS_WIN) |
| 51 // Bluetooth address size. Windows Bluetooth is supported via winsock. | 54 // Bluetooth address size. Windows Bluetooth is supported via winsock. |
| 52 static const size_t kBluetoothAddressSize = 6; | 55 static const size_t kBluetoothAddressSize = 6; |
| 53 #endif | 56 #endif |
| 54 | 57 |
| 55 // Nothing is ommitted. | 58 // Nothing is ommitted. |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 DSCP_CS5 = 40, // Video | 409 DSCP_CS5 = 40, // Video |
| 407 DSCP_EF = 46, // Voice | 410 DSCP_EF = 46, // Voice |
| 408 DSCP_CS6 = 48, // Voice | 411 DSCP_CS6 = 48, // Voice |
| 409 DSCP_CS7 = 56, // Control messages | 412 DSCP_CS7 = 56, // Control messages |
| 410 DSCP_LAST = DSCP_CS7 | 413 DSCP_LAST = DSCP_CS7 |
| 411 }; | 414 }; |
| 412 | 415 |
| 413 } // namespace net | 416 } // namespace net |
| 414 | 417 |
| 415 #endif // NET_BASE_NET_UTIL_H_ | 418 #endif // NET_BASE_NET_UTIL_H_ |
| OLD | NEW |