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

Unified Diff: net/tools/flip_server/sm_connection.h

Issue 683113005: Update from chromium https://crrev.com/302282 (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/flip_server/ring_buffer.h ('k') | net/tools/flip_server/spdy_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/flip_server/sm_connection.h
diff --git a/net/tools/flip_server/sm_connection.h b/net/tools/flip_server/sm_connection.h
index 5c5a5fddb54b30913dab7f9575019f63f0a68387..c3b7393e2b8f49a1b76e23e60c860da1fc24c4b9 100644
--- a/net/tools/flip_server/sm_connection.h
+++ b/net/tools/flip_server/sm_connection.h
@@ -44,7 +44,7 @@ class SMConnection : public SMConnectionInterface,
public EpollCallbackInterface,
public NotifierInterface {
public:
- virtual ~SMConnection();
+ ~SMConnection() override;
static SMConnection* NewSMConnection(EpollServer* epoll_server,
SSLState* ssl_state,
@@ -57,10 +57,10 @@ class SMConnection : public SMConnectionInterface,
std::string server_ip_;
std::string server_port_;
- virtual EpollServer* epoll_server() override;
+ EpollServer* epoll_server() override;
OutputList* output_list() { return &output_list_; }
MemoryCache* memory_cache() { return memory_cache_; }
- virtual void ReadyToSend() override;
+ void ReadyToSend() override;
void EnqueueDataFrame(DataFrame* df);
int fd() const { return fd_; }
@@ -82,16 +82,14 @@ class SMConnection : public SMConnectionInterface,
int Send(const char* data, int len, int flags);
// EpollCallbackInterface interface.
- virtual void OnRegistration(EpollServer* eps,
- int fd,
- int event_mask) override;
- virtual void OnModification(int fd, int event_mask) override {}
- virtual void OnEvent(int fd, EpollEvent* event) override;
- virtual void OnUnregistration(int fd, bool replaced) override;
- virtual void OnShutdown(EpollServer* eps, int fd) override;
+ void OnRegistration(EpollServer* eps, int fd, int event_mask) override;
+ void OnModification(int fd, int event_mask) override {}
+ void OnEvent(int fd, EpollEvent* event) override;
+ void OnUnregistration(int fd, bool replaced) override;
+ void OnShutdown(EpollServer* eps, int fd) override;
// NotifierInterface interface.
- virtual void Notify() override {}
+ void Notify() override {}
void Cleanup(const char* cleanup);
« no previous file with comments | « net/tools/flip_server/ring_buffer.h ('k') | net/tools/flip_server/spdy_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698