diff options
Diffstat (limited to 'content/browser/renderer_host/websocket_host.cc')
| -rw-r--r-- | content/browser/renderer_host/websocket_host.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc index a8951a9..7749be8 100644 --- a/content/browser/renderer_host/websocket_host.cc +++ b/content/browser/renderer_host/websocket_host.cc @@ -95,25 +95,25 @@ class WebSocketEventHandler : public net::WebSocketEventInterface { virtual ChannelState OnAddChannelResponse( bool fail, const std::string& selected_subprotocol, - const std::string& extensions) OVERRIDE; + const std::string& extensions) override; virtual ChannelState OnDataFrame(bool fin, WebSocketMessageType type, - const std::vector<char>& data) OVERRIDE; - virtual ChannelState OnClosingHandshake() OVERRIDE; - virtual ChannelState OnFlowControl(int64 quota) OVERRIDE; + const std::vector<char>& data) override; + virtual ChannelState OnClosingHandshake() override; + virtual ChannelState OnFlowControl(int64 quota) override; virtual ChannelState OnDropChannel(bool was_clean, uint16 code, - const std::string& reason) OVERRIDE; - virtual ChannelState OnFailChannel(const std::string& message) OVERRIDE; + const std::string& reason) override; + virtual ChannelState OnFailChannel(const std::string& message) override; virtual ChannelState OnStartOpeningHandshake( - scoped_ptr<net::WebSocketHandshakeRequestInfo> request) OVERRIDE; + scoped_ptr<net::WebSocketHandshakeRequestInfo> request) override; virtual ChannelState OnFinishOpeningHandshake( - scoped_ptr<net::WebSocketHandshakeResponseInfo> response) OVERRIDE; + scoped_ptr<net::WebSocketHandshakeResponseInfo> response) override; virtual ChannelState OnSSLCertificateError( scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks, const GURL& url, const net::SSLInfo& ssl_info, - bool fatal) OVERRIDE; + bool fatal) override; private: class SSLErrorHandlerDelegate : public SSLErrorHandler::Delegate { @@ -126,8 +126,8 @@ class WebSocketEventHandler : public net::WebSocketEventInterface { // SSLErrorHandler::Delegate methods virtual void CancelSSLRequest(int error, - const net::SSLInfo* ssl_info) OVERRIDE; - virtual void ContinueSSLRequest() OVERRIDE; + const net::SSLInfo* ssl_info) override; + virtual void ContinueSSLRequest() override; private: scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks_; |