summaryrefslogtreecommitdiffstats
path: root/net/base/host_resolver.h
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 19:03:29 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 19:03:29 +0000
commitb2b8b8313cf35d02e038f48f03cb0dd2a56ace0b (patch)
tree4641fae4757e349cb50097423e85a589ae95a234 /net/base/host_resolver.h
parentff4db3653c00cd23104ab773db6d97533e786105 (diff)
downloadchromium_src-b2b8b8313cf35d02e038f48f03cb0dd2a56ace0b.zip
chromium_src-b2b8b8313cf35d02e038f48f03cb0dd2a56ace0b.tar.gz
chromium_src-b2b8b8313cf35d02e038f48f03cb0dd2a56ace0b.tar.bz2
Revert "Clean up dns prefetch code, and also port it."
This reverts commit r9312. Revert "Fix HostResolver crash when MessageLoop is destroyed during" This reverts commit r9317. BUG=5687,6683 TBR=ph Review URL: http://codereview.chromium.org/21133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver.h')
-rw-r--r--net/base/host_resolver.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index 6e61eb5..bfae53c 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -41,9 +41,10 @@ class HostResolver {
//
// When callback is null, the operation completes synchronously.
//
- // When callback is non-null, the operation will be performed asynchronously.
- // ERR_IO_PENDING is returned if it has been scheduled successfully. Real
- // result code will be passed to the completion callback.
+ // When callback is non-null, ERR_IO_PENDING is returned if the operation
+ // could not be completed synchronously, in which case the result code will
+ // be passed to the callback when available.
+ //
int Resolve(const std::string& hostname, int port,
AddressList* addresses, CompletionCallback* callback);