net/proxy/init_proxy_resolver.cc - Issue 7812036: Update base/timer.h code to pass through Location from call sites.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/proxy/init_proxy_resolver.cc

Issue 7812036: Update base/timer.h code to pass through Location from call sites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/proxy/init_proxy_resolver.cc

diff --git a/net/proxy/init_proxy_resolver.cc b/net/proxy/init_proxy_resolver.cc

index d2983b650543694ada3bbbc4b6a2a61664e2d861..c63fe3730bcaecfc72b8e49f63e3047639be4e77 100644

--- a/net/proxy/init_proxy_resolver.cc

+++ b/net/proxy/init_proxy_resolver.cc

@@ -165,7 +165,8 @@ int InitProxyResolver::DoWait() {

return OK;

// Otherwise wait the specified amount of time.

- wait_timer_.Start(wait_delay_, this, &InitProxyResolver::OnWaitTimerFired);

+ wait_timer_.Start(wait_delay_, this, &InitProxyResolver::OnWaitTimerFired,

+ FROM_HERE);

net_log_.BeginEvent(NetLog::TYPE_INIT_PROXY_RESOLVER_WAIT, NULL);

return ERR_IO_PENDING;

}