chrome/browser/chromeos/login/network_screen.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: chrome/browser/chromeos/login/network_screen.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: chrome/browser/chromeos/login/network_screen.cc

diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc

index 7fabbb90ac30f4e4c2a622bbfcfbc400f1e03b52..a860934ec5f91dd801e6026bd4d6aa3eed9928b0 100644

--- a/chrome/browser/chromeos/login/network_screen.cc

+++ b/chrome/browser/chromeos/login/network_screen.cc

@@ -170,7 +170,8 @@ void NetworkScreen::StopWaitingForConnection(const string16& network_id) {

void NetworkScreen::WaitForConnection(const string16& network_id) {

if (network_id_ != network_id || !connection_timer_.IsRunning()) {

connection_timer_.Stop();

- connection_timer_.Start(base::TimeDelta::FromSeconds(kConnectionTimeoutSec),

+ connection_timer_.Start(FROM_HERE,

+ base::TimeDelta::FromSeconds(kConnectionTimeoutSec),

this,

&NetworkScreen::OnConnectionTimeout);

}