chrome/browser/chromeos/login/screens/update_screen.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/screens/update_screen.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: fixcaller 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

« no previous file with comments | « chrome/browser/chromeos/login/screens/terms_of_service_screen.h ('k') | chrome/browser/chromeos/login/screens/update_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/update_screen.h

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

index 44de547ecac9899bc26d72d3f3141ca6b06e96bd..cdc1d7adbde8705e6047a1ec97e45840e8f0ccfb 100644

--- a/chrome/browser/chromeos/login/screens/update_screen.h

+++ b/chrome/browser/chromeos/login/screens/update_screen.h

@@ -77,7 +77,7 @@ class UpdateScreen : public UpdateModel,

// Skip update UI, usually used only in debug builds/tests.

void CancelUpdate();

- base::OneShotTimer<UpdateScreen>& GetErrorMessageTimerForTesting();

+ base::OneShotTimer& GetErrorMessageTimerForTesting();

private:

FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);

@@ -126,7 +126,7 @@ class UpdateScreen : public UpdateModel,

// Timer for the interval to wait for the reboot.

// If reboot didn't happen - ask user to reboot manually.

- base::OneShotTimer<UpdateScreen> reboot_timer_;

+ base::OneShotTimer reboot_timer_;

// Returns a static InstanceSet.

typedef std::set<UpdateScreen*> InstanceSet;

@@ -181,7 +181,7 @@ class UpdateScreen : public UpdateModel,

// Timer for the captive portal detector to show portal login page.

// If redirect did not happen during this delay, error message is shown

// instead.

- base::OneShotTimer<UpdateScreen> error_message_timer_;

+ base::OneShotTimer error_message_timer_;

ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;