summaryrefslogtreecommitdiffstats
path: root/remoting/host/setup
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-09-24 00:53:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-24 07:53:38 +0000
commit8c3eb804c56b7173f00e58e040f47fe867dabda7 (patch)
tree3dee4211092c1942e4eaf24684f3255cfddd9e34 /remoting/host/setup
parentf7033f79311149ae641bcaa3986c753f60f1db7e (diff)
downloadchromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.zip
chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.gz
chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.bz2
base: Template methods on Timer classes instead of the classes themselves.
The base class for OneShotTimer and DelayedTimer is templated but only the Start method needs to be (which has a TODO to make it go away entirely too). The DelayedTimer class is also templated but only its constructor needs to be, and the type can be inferred at the callsite, so less typing all around. R=thakis@chromium.org TBR=sky,brettw BUG=148832 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1355063004 Cr-Commit-Position: refs/heads/master@{#350496}
Diffstat (limited to 'remoting/host/setup')
-rw-r--r--remoting/host/setup/me2me_native_messaging_host.h2
-rw-r--r--remoting/host/setup/win/auth_code_getter.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/setup/me2me_native_messaging_host.h b/remoting/host/setup/me2me_native_messaging_host.h
index c889258..02c730d 100644
--- a/remoting/host/setup/me2me_native_messaging_host.h
+++ b/remoting/host/setup/me2me_native_messaging_host.h
@@ -159,7 +159,7 @@ class Me2MeNativeMessagingHost
scoped_ptr<ElevatedChannelEventHandler> elevated_channel_event_handler_;
// Timer to control the lifetime of the elevated host.
- base::OneShotTimer<Me2MeNativeMessagingHost> elevated_host_timer_;
+ base::OneShotTimer elevated_host_timer_;
#endif // defined(OS_WIN)
bool needs_elevation_;
diff --git a/remoting/host/setup/win/auth_code_getter.h b/remoting/host/setup/win/auth_code_getter.h
index 7493d7c..4373895 100644
--- a/remoting/host/setup/win/auth_code_getter.h
+++ b/remoting/host/setup/win/auth_code_getter.h
@@ -44,7 +44,7 @@ class AuthCodeGetter : public base::NonThreadSafe {
// The browser through which the user requests an authorization code.
base::win::ScopedComPtr<IWebBrowser2, &IID_IWebBrowser2> browser_;
// A timer used to poll the browser's URL.
- base::OneShotTimer<AuthCodeGetter> timer_;
+ base::OneShotTimer timer_;
// The interval at which the timer fires.
base::TimeDelta timer_interval_;