chrome/browser/chromeos/login/existing_user_controller.h - Issue 1355063004: Template methods on Timer classes instead of the classes themselves.

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/existing_user_controller.h

Issue 1355063004: Template methods on Timer classes instead of the classes themselves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: timer: . Created 5 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« base/timer/timer.h ('K') | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller.h

diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h

index 0df5d284cb40ac7ba6a56c6763b452bc354c3f2c..ee963b25abe76ef386c6ede884a5b5b9e159370f 100644

--- a/chrome/browser/chromeos/login/existing_user_controller.h

+++ b/chrome/browser/chromeos/login/existing_user_controller.h

@@ -240,7 +240,7 @@ class ExistingUserController : public LoginDisplay::Delegate,

void OnOAuth2TokensFetched(bool success, const UserContext& user_context);

// Public session auto-login timer.

- scoped_ptr<base::OneShotTimer<ExistingUserController> > auto_login_timer_;

+ scoped_ptr<base::OneShotTimer> auto_login_timer_;

// Public session auto-login timeout, in milliseconds.

int public_session_auto_login_delay_;

@@ -302,7 +302,7 @@ class ExistingUserController : public LoginDisplay::Delegate,

base::Time time_init_;

// Timer for the interval to wait for the reboot after TPM error UI was shown.

- base::OneShotTimer<ExistingUserController> reboot_timer_;

+ base::OneShotTimer reboot_timer_;

scoped_ptr<login::NetworkStateHelper> network_state_helper_;