| Index: ppapi/shared_impl/private/ppb_host_resolver_shared.h
|
| ===================================================================
|
| --- ppapi/shared_impl/private/ppb_host_resolver_shared.h (revision 156377)
|
| +++ ppapi/shared_impl/private/ppb_host_resolver_shared.h (working copy)
|
| @@ -14,10 +14,6 @@
|
| #include "ppapi/shared_impl/tracked_callback.h"
|
| #include "ppapi/thunk/ppb_host_resolver_private_api.h"
|
|
|
| -namespace net {
|
| -class AddressList;
|
| -}
|
| -
|
| namespace ppapi {
|
|
|
| struct HostPortPair {
|
| @@ -25,13 +21,6 @@
|
| uint16_t port;
|
| };
|
|
|
| -typedef std::vector<PP_NetAddress_Private> NetAddressList;
|
| -
|
| -#if !defined(OS_NACL) && !defined(NACL_WIN64)
|
| -PPAPI_SHARED_EXPORT NetAddressList*
|
| - CreateNetAddressListFromAddressList(const net::AddressList& list);
|
| -#endif
|
| -
|
| class PPAPI_SHARED_EXPORT PPB_HostResolver_Shared
|
| : public thunk::PPB_HostResolver_Private_API,
|
| public Resource {
|
| @@ -58,9 +47,10 @@
|
| virtual bool GetNetAddress(uint32_t index,
|
| PP_NetAddress_Private* address) OVERRIDE;
|
|
|
| - void OnResolveCompleted(bool succeeded,
|
| - const std::string& canonical_name,
|
| - const NetAddressList& net_address_list);
|
| + void OnResolveCompleted(
|
| + bool succeeded,
|
| + const std::string& canonical_name,
|
| + const std::vector<PP_NetAddress_Private>& net_address_list);
|
|
|
| // Send functions that need to be implemented differently for the
|
| // proxied and non-proxied derived classes.
|
| @@ -76,7 +66,7 @@
|
| scoped_refptr<TrackedCallback> resolve_callback_;
|
|
|
| std::string canonical_name_;
|
| - NetAddressList net_address_list_;
|
| + std::vector<PP_NetAddress_Private> net_address_list_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PPB_HostResolver_Shared);
|
| };
|
|
|