Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1367)

Unified Diff: net/tools/epoll_server/epoll_server.h

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « net/tools/balsa/noop_balsa_visitor.h ('k') | net/tools/epoll_server/epoll_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/epoll_server/epoll_server.h
diff --git a/net/tools/epoll_server/epoll_server.h b/net/tools/epoll_server/epoll_server.h
index e8f139664f32023b027f169db26ce45531038e45..92d6555ca6e154f6957275173526128af04d3932 100644
--- a/net/tools/epoll_server/epoll_server.h
+++ b/net/tools/epoll_server/epoll_server.h
@@ -1019,21 +1019,21 @@ class EpollAlarm : public EpollAlarmCallbackInterface {
public:
EpollAlarm();
- virtual ~EpollAlarm();
+ ~EpollAlarm() override;
// Marks the alarm as unregistered and returns 0. The return value may be
// safely ignored by subclasses.
- virtual int64 OnAlarm() override;
+ int64 OnAlarm() override;
// Marks the alarm as registered, and stores the token.
- virtual void OnRegistration(const EpollServer::AlarmRegToken& token,
- EpollServer* eps) override;
+ void OnRegistration(const EpollServer::AlarmRegToken& token,
+ EpollServer* eps) override;
// Marks the alarm as unregistered.
- virtual void OnUnregistration() override;
+ void OnUnregistration() override;
// Marks the alarm as unregistered.
- virtual void OnShutdown(EpollServer* eps) override;
+ void OnShutdown(EpollServer* eps) override;
// If the alarm was registered, unregister it.
void UnregisterIfRegistered();
« no previous file with comments | « net/tools/balsa/noop_balsa_visitor.h ('k') | net/tools/epoll_server/epoll_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698