summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 01:10:29 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 01:10:29 +0000
commitf2cbbc822ae7e9268d724463c309374102891912 (patch)
treed96e5e493ec7822e18e6c18c119862ab5664a6b1 /net/websockets
parent3986f1ebe6b259cffa05ed76949554987fb1464a (diff)
downloadchromium_src-f2cbbc822ae7e9268d724463c309374102891912.zip
chromium_src-f2cbbc822ae7e9268d724463c309374102891912.tar.gz
chromium_src-f2cbbc822ae7e9268d724463c309374102891912.tar.bz2
Add OVERRIDE to net/.
BUG=104314 Review URL: http://codereview.chromium.org/8568021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job.h39
-rw-r--r--net/websockets/websocket_net_log_params.h2
2 files changed, 22 insertions, 19 deletions
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index f3c0ab1..4df3315 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -53,31 +53,34 @@ class NET_EXPORT WebSocketJob
static void set_websocket_over_spdy_enabled(bool enabled);
State state() const { return state_; }
- virtual void Connect();
- virtual bool SendData(const char* data, int len);
- virtual void Close();
- virtual void RestartWithAuth(const AuthCredentials& credentials);
- virtual void DetachDelegate();
+ virtual void Connect() OVERRIDE;
+ virtual bool SendData(const char* data, int len) OVERRIDE;
+ virtual void Close() OVERRIDE;
+ virtual void RestartWithAuth(const AuthCredentials& credentials) OVERRIDE;
+ virtual void DetachDelegate() OVERRIDE;
// SocketStream::Delegate methods.
virtual int OnStartOpenConnection(
- SocketStream* socket, OldCompletionCallback* callback);
- virtual void OnConnected(SocketStream* socket, int max_pending_send_allowed);
- virtual void OnSentData(SocketStream* socket, int amount_sent);
- virtual void OnReceivedData(SocketStream* socket, const char* data, int len);
- virtual void OnClose(SocketStream* socket);
+ SocketStream* socket, OldCompletionCallback* callback) OVERRIDE;
+ virtual void OnConnected(SocketStream* socket,
+ int max_pending_send_allowed) OVERRIDE;
+ virtual void OnSentData(SocketStream* socket, int amount_sent) OVERRIDE;
+ virtual void OnReceivedData(SocketStream* socket,
+ const char* data,
+ int len) OVERRIDE;
+ virtual void OnClose(SocketStream* socket) OVERRIDE;
virtual void OnAuthRequired(
- SocketStream* socket, AuthChallengeInfo* auth_info);
- virtual void OnError(const SocketStream* socket, int error);
+ SocketStream* socket, AuthChallengeInfo* auth_info) OVERRIDE;
+ virtual void OnError(const SocketStream* socket, int error) OVERRIDE;
// SpdyWebSocketStream::Delegate methods.
- virtual void OnCreatedSpdyStream(int status);
- virtual void OnSentSpdyHeaders(int status);
+ virtual void OnCreatedSpdyStream(int status) OVERRIDE;
+ virtual void OnSentSpdyHeaders(int status) OVERRIDE;
virtual int OnReceivedSpdyResponseHeader(
- const spdy::SpdyHeaderBlock& headers, int status);
- virtual void OnSentSpdyData(int amount_sent);
- virtual void OnReceivedSpdyData(const char* data, int length);
- virtual void OnCloseSpdyStream();
+ const spdy::SpdyHeaderBlock& headers, int status) OVERRIDE;
+ virtual void OnSentSpdyData(int amount_sent) OVERRIDE;
+ virtual void OnReceivedSpdyData(const char* data, int length) OVERRIDE;
+ virtual void OnCloseSpdyStream() OVERRIDE;
private:
friend class WebSocketThrottle;
diff --git a/net/websockets/websocket_net_log_params.h b/net/websockets/websocket_net_log_params.h
index 7b90305..ac53856 100644
--- a/net/websockets/websocket_net_log_params.h
+++ b/net/websockets/websocket_net_log_params.h
@@ -24,7 +24,7 @@ class NET_EXPORT_PRIVATE NetLogWebSocketHandshakeParameter
public:
explicit NetLogWebSocketHandshakeParameter(const std::string& headers);
- virtual Value* ToValue() const;
+ virtual Value* ToValue() const OVERRIDE;
private:
virtual ~NetLogWebSocketHandshakeParameter();