| Index: ppapi/shared_impl/private/net_address_private_impl.h
|
| ===================================================================
|
| --- ppapi/shared_impl/private/net_address_private_impl.h (revision 156377)
|
| +++ ppapi/shared_impl/private/net_address_private_impl.h (working copy)
|
| @@ -5,6 +5,8 @@
|
| #ifndef PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_
|
| #define PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_
|
|
|
| +#include <vector>
|
| +
|
| #include "base/basictypes.h"
|
| #include "ppapi/c/pp_stdint.h"
|
| #include "ppapi/shared_impl/ppapi_shared_export.h"
|
| @@ -12,11 +14,6 @@
|
| struct PP_NetAddress_Private;
|
| struct sockaddr;
|
|
|
| -namespace net {
|
| -class AddressList;
|
| -class IPEndPoint;
|
| -}
|
| -
|
| namespace ppapi {
|
|
|
| class PPAPI_SHARED_EXPORT NetAddressPrivateImpl {
|
| @@ -27,19 +24,14 @@
|
| uint32_t sa_length,
|
| PP_NetAddress_Private* net_addr);
|
|
|
| - static bool IPEndPointToNetAddress(const net::IPEndPoint& ip,
|
| + static bool IPEndPointToNetAddress(const std::vector<unsigned char>& address,
|
| + int port,
|
| PP_NetAddress_Private* net_addr);
|
|
|
| - // Converts the first address to a PP_NetAddress_Private.
|
| - static bool AddressListToNetAddress(const net::AddressList& address_list,
|
| - PP_NetAddress_Private* net_addr);
|
| -
|
| static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr,
|
| - net::IPEndPoint* ip_end_point);
|
| + std::vector<unsigned char>* address,
|
| + int* port);
|
|
|
| - static bool NetAddressToAddressList(const PP_NetAddress_Private& net_addr,
|
| - net::AddressList* address_list);
|
| -
|
| static const PP_NetAddress_Private kInvalidNetAddress;
|
|
|
| private:
|
|
|