Index: net/socket/websocket_transport_client_socket_pool.h |
diff --git a/net/socket/websocket_transport_client_socket_pool.h b/net/socket/websocket_transport_client_socket_pool.h |
index 74b8f784802fcde533e7873eafcbbd181aeb7ad2..e91835453dbab460707ddcdc5480437ee7f5559d 100644 |
--- a/net/socket/websocket_transport_client_socket_pool.h |
+++ b/net/socket/websocket_transport_client_socket_pool.h |
@@ -65,7 +65,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : public ConnectJob { |
const BoundNetLog& request_net_log() const { return request_net_log_; } |
// ConnectJob methods. |
- virtual LoadState GetLoadState() const OVERRIDE; |
+ virtual LoadState GetLoadState() const override; |
private: |
friend class WebSocketTransportConnectSubJob; |
@@ -90,7 +90,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : public ConnectJob { |
// Begins the host resolution and the TCP connect. Returns OK on success |
// and ERR_IO_PENDING if it cannot immediately service the request. |
// Otherwise, it returns a net error code. |
- virtual int ConnectInternal() OVERRIDE; |
+ virtual int ConnectInternal() override; |
TransportConnectJobHelper helper_; |
@@ -138,33 +138,33 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool |
RequestPriority priority, |
ClientSocketHandle* handle, |
const CompletionCallback& callback, |
- const BoundNetLog& net_log) OVERRIDE; |
+ const BoundNetLog& net_log) override; |
virtual void RequestSockets(const std::string& group_name, |
const void* params, |
int num_sockets, |
- const BoundNetLog& net_log) OVERRIDE; |
+ const BoundNetLog& net_log) override; |
virtual void CancelRequest(const std::string& group_name, |
- ClientSocketHandle* handle) OVERRIDE; |
+ ClientSocketHandle* handle) override; |
virtual void ReleaseSocket(const std::string& group_name, |
scoped_ptr<StreamSocket> socket, |
- int id) OVERRIDE; |
- virtual void FlushWithError(int error) OVERRIDE; |
- virtual void CloseIdleSockets() OVERRIDE; |
- virtual int IdleSocketCount() const OVERRIDE; |
+ int id) override; |
+ virtual void FlushWithError(int error) override; |
+ virtual void CloseIdleSockets() override; |
+ virtual int IdleSocketCount() const override; |
virtual int IdleSocketCountInGroup( |
- const std::string& group_name) const OVERRIDE; |
+ const std::string& group_name) const override; |
virtual LoadState GetLoadState( |
const std::string& group_name, |
- const ClientSocketHandle* handle) const OVERRIDE; |
+ const ClientSocketHandle* handle) const override; |
virtual base::DictionaryValue* GetInfoAsValue( |
const std::string& name, |
const std::string& type, |
- bool include_nested_pools) const OVERRIDE; |
- virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; |
- virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
+ bool include_nested_pools) const override; |
+ virtual base::TimeDelta ConnectionTimeout() const override; |
+ virtual ClientSocketPoolHistograms* histograms() const override; |
// HigherLayeredPool implementation. |
- virtual bool IsStalled() const OVERRIDE; |
+ virtual bool IsStalled() const override; |
private: |
class ConnectJobDelegate : public ConnectJob::Delegate { |
@@ -172,7 +172,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool |
explicit ConnectJobDelegate(WebSocketTransportClientSocketPool* owner); |
virtual ~ConnectJobDelegate(); |
- virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE; |
+ virtual void OnConnectJobComplete(int result, ConnectJob* job) override; |
private: |
WebSocketTransportClientSocketPool* owner_; |