Index: extensions/browser/api/socket/tcp_socket.h |
diff --git a/extensions/browser/api/socket/tcp_socket.h b/extensions/browser/api/socket/tcp_socket.h |
index 4b0af13bb1eb0efc9ad549a881af8e5c7fb46c15..fa944eafd9bcf4fee06ced95ed9f2b888150a9f5 100644 |
--- a/extensions/browser/api/socket/tcp_socket.h |
+++ b/extensions/browser/api/socket/tcp_socket.h |
@@ -31,36 +31,36 @@ class TCPSocket : public Socket { |
virtual void Connect(const std::string& address, |
int port, |
- const CompletionCallback& callback) OVERRIDE; |
- virtual void Disconnect() OVERRIDE; |
- virtual int Bind(const std::string& address, int port) OVERRIDE; |
- virtual void Read(int count, const ReadCompletionCallback& callback) OVERRIDE; |
+ const CompletionCallback& callback) override; |
+ virtual void Disconnect() override; |
+ virtual int Bind(const std::string& address, int port) override; |
+ virtual void Read(int count, const ReadCompletionCallback& callback) override; |
virtual void RecvFrom(int count, |
- const RecvFromCompletionCallback& callback) OVERRIDE; |
+ const RecvFromCompletionCallback& callback) override; |
virtual void SendTo(scoped_refptr<net::IOBuffer> io_buffer, |
int byte_count, |
const std::string& address, |
int port, |
- const CompletionCallback& callback) OVERRIDE; |
- virtual bool SetKeepAlive(bool enable, int delay) OVERRIDE; |
- virtual bool SetNoDelay(bool no_delay) OVERRIDE; |
+ const CompletionCallback& callback) override; |
+ virtual bool SetKeepAlive(bool enable, int delay) override; |
+ virtual bool SetNoDelay(bool no_delay) override; |
virtual int Listen(const std::string& address, |
int port, |
int backlog, |
- std::string* error_msg) OVERRIDE; |
- virtual void Accept(const AcceptCompletionCallback& callback) OVERRIDE; |
+ std::string* error_msg) override; |
+ virtual void Accept(const AcceptCompletionCallback& callback) override; |
- virtual bool IsConnected() OVERRIDE; |
+ virtual bool IsConnected() override; |
- virtual bool GetPeerAddress(net::IPEndPoint* address) OVERRIDE; |
- virtual bool GetLocalAddress(net::IPEndPoint* address) OVERRIDE; |
+ virtual bool GetPeerAddress(net::IPEndPoint* address) override; |
+ virtual bool GetLocalAddress(net::IPEndPoint* address) override; |
// Like Disconnect(), only Release() doesn't delete the underlying stream |
// or attempt to close it. Useful when giving away ownership with |
// ClientStream(). |
virtual void Release(); |
- virtual Socket::SocketType GetSocketType() const OVERRIDE; |
+ virtual Socket::SocketType GetSocketType() const override; |
static TCPSocket* CreateSocketForTesting( |
net::TCPClientSocket* tcp_client_socket, |
@@ -80,7 +80,7 @@ class TCPSocket : public Socket { |
protected: |
virtual int WriteImpl(net::IOBuffer* io_buffer, |
int io_buffer_size, |
- const net::CompletionCallback& callback) OVERRIDE; |
+ const net::CompletionCallback& callback) override; |
private: |
void RefreshConnectionStatus(); |
@@ -116,7 +116,7 @@ class ResumableTCPSocket : public TCPSocket { |
bool is_connected); |
// Overriden from ApiResource |
- virtual bool IsPersistent() const OVERRIDE; |
+ virtual bool IsPersistent() const override; |
const std::string& name() const { return name_; } |
void set_name(const std::string& name) { name_ = name; } |
@@ -154,7 +154,7 @@ class ResumableTCPServerSocket : public TCPSocket { |
explicit ResumableTCPServerSocket(const std::string& owner_extension_id); |
// Overriden from ApiResource |
- virtual bool IsPersistent() const OVERRIDE; |
+ virtual bool IsPersistent() const override; |
const std::string& name() const { return name_; } |
void set_name(const std::string& name) { name_ = name; } |