diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 13:27:53 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 13:27:53 +0000 |
commit | 0e142bf597010b1528dc5ff5d9bc39b797524cf3 (patch) | |
tree | 9eda27d6dc28611649f03093660c6b68b0964d95 /net/server/web_socket.cc | |
parent | 3d87c09385d3597ad3da77237660cf2d9906be84 (diff) | |
download | chromium_src-0e142bf597010b1528dc5ff5d9bc39b797524cf3.zip chromium_src-0e142bf597010b1528dc5ff5d9bc39b797524cf3.tar.gz chromium_src-0e142bf597010b1528dc5ff5d9bc39b797524cf3.tar.bz2 |
net: Fix more clang warnings about missing virtual and OVERRIDE annotations.
BUG=115047
TBR=willchan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10908051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/web_socket.cc')
-rw-r--r-- | net/server/web_socket.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc index 774c4d6..e2829da 100644 --- a/net/server/web_socket.cc +++ b/net/server/web_socket.cc @@ -50,7 +50,7 @@ class WebSocketHixie76 : public net::WebSocket { return new WebSocketHixie76(connection, request, pos); } - virtual void Accept(const HttpServerRequestInfo& request) { + virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE { std::string key1 = request.GetHeaderValue("Sec-WebSocket-Key1"); std::string key2 = request.GetHeaderValue("Sec-WebSocket-Key2"); @@ -80,7 +80,7 @@ class WebSocketHixie76 : public net::WebSocket { connection_->Send(reinterpret_cast<char*>(digest.a), 16); } - virtual ParseResult Read(std::string* message) { + virtual ParseResult Read(std::string* message) OVERRIDE { DCHECK(message); const std::string& data = connection_->recv_data(); if (data[0]) @@ -97,7 +97,7 @@ class WebSocketHixie76 : public net::WebSocket { return FRAME_OK; } - virtual void Send(const std::string& message) { + virtual void Send(const std::string& message) OVERRIDE { char message_start = 0; char message_end = -1; connection_->Send(&message_start, 1); @@ -182,7 +182,7 @@ class WebSocketHybi17 : public WebSocket { return new WebSocketHybi17(connection, request, pos); } - virtual void Accept(const HttpServerRequestInfo& request) { + virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE { static const char* const kWebSocketGuid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; std::string key = request.GetHeaderValue("Sec-WebSocket-Key"); @@ -200,7 +200,7 @@ class WebSocketHybi17 : public WebSocket { connection_->Send(response); } - virtual ParseResult Read(std::string* message) { + virtual ParseResult Read(std::string* message) OVERRIDE { size_t data_length = connection_->recv_data().length(); if (data_length < 2) return FRAME_INCOMPLETE; @@ -284,7 +284,7 @@ class WebSocketHybi17 : public WebSocket { return closed_ ? FRAME_CLOSE : FRAME_OK; } - virtual void Send(const std::string& message) { + virtual void Send(const std::string& message) OVERRIDE { if (closed_) return; |