summaryrefslogtreecommitdiffstats
path: root/ppapi/shared_impl/private/ppb_host_resolver_shared.h
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 18:12:02 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 18:12:02 +0000
commit9984ca0682185909a315ed1d2d51007b04d05126 (patch)
tree3a0d0b59e5eb7a6e7c1236014dad0f16e02dbfbf /ppapi/shared_impl/private/ppb_host_resolver_shared.h
parentf4148f30946db3e5d316e3dd411eebca3bf5649c (diff)
downloadchromium_src-9984ca0682185909a315ed1d2d51007b04d05126.zip
chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.tar.gz
chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.tar.bz2
Remove PPAPI dependency on 'net'.
This is needed to complete the port of the PPAPI proxy plugin-side to NaCl. This replaces usages in ppapi of types in 'net' with simpler base types (eg. instead of IPEndPoint, use a std::vector<unsigned char> address and an int port). Also, this removes some static methods in net_address_private_impl.* that are hardly used, and removes the ppapi::NetAddressList typedef, using std::vector<PP_NetAddress_Private> instead. BUG=116317 TEST=existing, no new functionality Review URL: https://chromiumcodereview.appspot.com/10909154 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl/private/ppb_host_resolver_shared.h')
-rw-r--r--ppapi/shared_impl/private/ppb_host_resolver_shared.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/ppapi/shared_impl/private/ppb_host_resolver_shared.h b/ppapi/shared_impl/private/ppb_host_resolver_shared.h
index 33adaf9..7372dc5 100644
--- a/ppapi/shared_impl/private/ppb_host_resolver_shared.h
+++ b/ppapi/shared_impl/private/ppb_host_resolver_shared.h
@@ -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 @@ struct HostPortPair {
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 @@ class PPAPI_SHARED_EXPORT PPB_HostResolver_Shared
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 @@ class PPAPI_SHARED_EXPORT PPB_HostResolver_Shared
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);
};