summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server/sm_connection.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 17:57:16 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 17:57:16 +0000
commitaddc1be9629d2e030a853eefecf6997a229b91b9 (patch)
tree353e8aa621253eecf33a27a3c858041d794081bb /net/tools/flip_server/sm_connection.h
parentd0d912b0b0d084e5b10a004df2f1b469caeee3ee (diff)
downloadchromium_src-addc1be9629d2e030a853eefecf6997a229b91b9.zip
chromium_src-addc1be9629d2e030a853eefecf6997a229b91b9.tar.gz
chromium_src-addc1be9629d2e030a853eefecf6997a229b91b9.tar.bz2
Add OVERRIDE to net/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8648001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server/sm_connection.h')
-rw-r--r--net/tools/flip_server/sm_connection.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/net/tools/flip_server/sm_connection.h b/net/tools/flip_server/sm_connection.h
index aa91890..e7f1e99 100644
--- a/net/tools/flip_server/sm_connection.h
+++ b/net/tools/flip_server/sm_connection.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,6 +11,7 @@
#include <list>
#include <string>
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/create_listener.h"
#include "net/tools/flip_server/epoll_server.h"
#include "net/tools/flip_server/mem_cache.h"
@@ -54,10 +55,10 @@ class SMConnection : public SMConnectionInterface,
std::string server_ip_;
std::string server_port_;
- virtual EpollServer* epoll_server();
+ virtual EpollServer* epoll_server() OVERRIDE;
OutputList* output_list() { return &output_list_; }
MemoryCache* memory_cache() { return memory_cache_; }
- virtual void ReadyToSend();
+ virtual void ReadyToSend() OVERRIDE;
void EnqueueDataFrame(DataFrame* df);
int fd() const { return fd_; }
@@ -79,14 +80,16 @@ 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);
- virtual void OnModification(int fd, int event_mask) {}
- virtual void OnEvent(int fd, EpollEvent* event);
- virtual void OnUnregistration(int fd, bool replaced);
- virtual void OnShutdown(EpollServer* eps, int fd);
+ 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;
// NotifierInterface interface.
- virtual void Notify() {}
+ virtual void Notify() OVERRIDE {}
void Cleanup(const char* cleanup);