summaryrefslogtreecommitdiffstats
path: root/net/base/host_resolver_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/base/host_resolver_impl.h')
-rw-r--r--net/base/host_resolver_impl.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h
index d6d82d0..a571bb7 100644
--- a/net/base/host_resolver_impl.h
+++ b/net/base/host_resolver_impl.h
@@ -87,29 +87,10 @@ class HostResolverImpl : public HostResolver,
// be called.
virtual ~HostResolverImpl();
- // HostResolver methods:
- virtual int Resolve(const RequestInfo& info,
- AddressList* addresses,
- CompletionCallback* callback,
- RequestHandle* out_req,
- const BoundNetLog& source_net_log);
- virtual void CancelRequest(RequestHandle req);
- virtual void AddObserver(HostResolver::Observer* observer);
- virtual void RemoveObserver(HostResolver::Observer* observer);
-
- // Set address family, and disable IPv6 probe support.
- virtual void SetDefaultAddressFamily(AddressFamily address_family);
- virtual AddressFamily GetDefaultAddressFamily() const;
-
// Continuously observe whether IPv6 is supported, and set the allowable
// address family to IPv4 iff IPv6 is not supported.
void ProbeIPv6Support();
- virtual HostResolverImpl* GetAsHostResolverImpl();
-
- // TODO(eroman): hack for http://crbug.com/15513
- virtual void Shutdown();
-
// Returns the cache this resolver uses, or NULL if caching is disabled.
HostCache* cache() { return cache_.get(); }
@@ -128,6 +109,25 @@ class HostResolverImpl : public HostResolver,
size_t max_outstanding_jobs,
size_t max_pending_requests);
+ // HostResolver methods:
+ virtual int Resolve(const RequestInfo& info,
+ AddressList* addresses,
+ CompletionCallback* callback,
+ RequestHandle* out_req,
+ const BoundNetLog& source_net_log);
+ virtual void CancelRequest(RequestHandle req);
+ virtual void AddObserver(HostResolver::Observer* observer);
+ virtual void RemoveObserver(HostResolver::Observer* observer);
+
+ // Set address family, and disable IPv6 probe support.
+ virtual void SetDefaultAddressFamily(AddressFamily address_family);
+ virtual AddressFamily GetDefaultAddressFamily() const;
+
+ virtual HostResolverImpl* GetAsHostResolverImpl();
+
+ // TODO(eroman): hack for http://crbug.com/15513
+ virtual void Shutdown();
+
private:
class Job;
class JobPool;
@@ -185,9 +185,6 @@ class HostResolverImpl : public HostResolver,
int request_id,
const RequestInfo& info);
- // NetworkChangeNotifier::Observer methods:
- virtual void OnIPAddressChanged();
-
// Notify IPv6ProbeJob not to call back, and discard reference to the job.
void DiscardIPv6ProbeJob();
@@ -226,6 +223,9 @@ class HostResolverImpl : public HostResolver,
// Aborts all in progress jobs (but might start new ones).
void AbortAllInProgressJobs();
+ // NetworkChangeNotifier::Observer methods:
+ virtual void OnIPAddressChanged();
+
// Cache of host resolution results.
scoped_ptr<HostCache> cache_;