diff options
author | mostynb <mostynb@opera.com> | 2014-10-09 04:01:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 11:01:43 +0000 |
commit | ba063d6038f4e0df5188cdd46589c62388d8e06b (patch) | |
tree | 5dd4b0be08ab43875cb16ed59f4c2c281f6c7412 /net/server/web_socket.cc | |
parent | c239532659a8ac3422094ffbd9f90e38abe0bf48 (diff) | |
download | chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.zip chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.gz chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.bz2 |
replace OVERRIDE and FINAL with override and final in net/
BUG=417463
Review URL: https://codereview.chromium.org/623213004
Cr-Commit-Position: refs/heads/master@{#298844}
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 ec0fdac..118cdf8 100644 --- a/net/server/web_socket.cc +++ b/net/server/web_socket.cc @@ -54,7 +54,7 @@ class WebSocketHixie76 : public net::WebSocket { return new WebSocketHixie76(server, connection, request, pos); } - virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE { + virtual void Accept(const HttpServerRequestInfo& request) override { std::string key1 = request.GetHeaderValue("sec-websocket-key1"); std::string key2 = request.GetHeaderValue("sec-websocket-key2"); @@ -86,7 +86,7 @@ class WebSocketHixie76 : public net::WebSocket { std::string(reinterpret_cast<char*>(digest.a), 16)); } - virtual ParseResult Read(std::string* message) OVERRIDE { + virtual ParseResult Read(std::string* message) override { DCHECK(message); HttpConnection::ReadIOBuffer* read_buf = connection_->read_buf(); if (read_buf->StartOfBuffer()[0]) @@ -103,7 +103,7 @@ class WebSocketHixie76 : public net::WebSocket { return FRAME_OK; } - virtual void Send(const std::string& message) OVERRIDE { + virtual void Send(const std::string& message) override { char message_start = 0; char message_end = -1; server_->SendRaw(connection_->id(), std::string(1, message_start)); @@ -199,7 +199,7 @@ class WebSocketHybi17 : public WebSocket { return new WebSocketHybi17(server, connection, request, pos); } - virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE { + 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"); @@ -217,7 +217,7 @@ class WebSocketHybi17 : public WebSocket { encoded_hash.c_str())); } - virtual ParseResult Read(std::string* message) OVERRIDE { + virtual ParseResult Read(std::string* message) override { HttpConnection::ReadIOBuffer* read_buf = connection_->read_buf(); base::StringPiece frame(read_buf->StartOfBuffer(), read_buf->GetSize()); int bytes_consumed = 0; @@ -230,7 +230,7 @@ class WebSocketHybi17 : public WebSocket { return result; } - virtual void Send(const std::string& message) OVERRIDE { + virtual void Send(const std::string& message) override { if (closed_) return; server_->SendRaw(connection_->id(), |