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

Unified Diff: net/server/web_socket.cc

Issue 10908051: net: Fix more clang warnings about missing virtual and OVERRIDE annotations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | net/test/local_test_server_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/web_socket.cc
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc
index 774c4d65d861099f2043c1f536eec2c98ecc5117..e2829daf429b6fd0853cef97296dbdf445788512 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;
« no previous file with comments | « no previous file | net/test/local_test_server_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698