chrome/browser/ssl/ssl_error_handler.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/ssl/ssl_error_handler.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/spellchecker/spellcheck_host_metrics.h ('k') | chrome/browser/supervised_user/child_accounts/child_account_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/ssl_error_handler.h

diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h

index 30dfb4f4672b051bd8358b04b1c72e510c5e7d48..403b54469a84a0dcfacc76fed16366bd8ba741d4 100644

--- a/chrome/browser/ssl/ssl_error_handler.h

+++ b/chrome/browser/ssl/ssl_error_handler.h

@@ -86,9 +86,7 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,

// check and fires a one shot timer to wait for a "captive portal detected"

// result to arrive.

void StartHandlingError();

- const base::OneShotTimer<SSLErrorHandler>& get_timer() const {

- return timer_;

- }

+ const base::OneShotTimer& get_timer() const { return timer_; }

// These are virtual for tests:

virtual void CheckForCaptivePortal();

@@ -136,7 +134,7 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,

Profile* const profile_;

content::NotificationRegistrar registrar_;

- base::OneShotTimer<SSLErrorHandler> timer_;

+ base::OneShotTimer timer_;

scoped_ptr<CommonNameMismatchHandler> common_name_mismatch_handler_;