X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmojo%2Fservices%2Fnetwork%2Fweb_socket_impl.cc;h=ea0928fc627220f9e51fc70b0d01c48c5a60ca52;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=7ba9b22da9657457dc87812e099919a95bab50dc;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/mojo/services/network/web_socket_impl.cc b/src/mojo/services/network/web_socket_impl.cc index 7ba9b22..ea0928f 100644 --- a/src/mojo/services/network/web_socket_impl.cc +++ b/src/mojo/services/network/web_socket_impl.cc @@ -65,32 +65,31 @@ struct WebSocketEventHandler : public net::WebSocketEventInterface { WebSocketEventHandler(WebSocketClientPtr client) : client_(client.Pass()) { } - virtual ~WebSocketEventHandler() {} + ~WebSocketEventHandler() override {} private: // net::WebSocketEventInterface methods: - virtual ChannelState OnAddChannelResponse( - bool fail, - const std::string& selected_subprotocol, - const std::string& extensions) OVERRIDE; - virtual ChannelState OnDataFrame(bool fin, - WebSocketMessageType type, - const std::vector& 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; - virtual ChannelState OnStartOpeningHandshake( - scoped_ptr request) OVERRIDE; - virtual ChannelState OnFinishOpeningHandshake( - scoped_ptr response) OVERRIDE; - virtual ChannelState OnSSLCertificateError( + ChannelState OnAddChannelResponse(bool fail, + const std::string& selected_subprotocol, + const std::string& extensions) override; + ChannelState OnDataFrame(bool fin, + WebSocketMessageType type, + const std::vector& data) override; + ChannelState OnClosingHandshake() override; + ChannelState OnFlowControl(int64 quota) override; + ChannelState OnDropChannel(bool was_clean, + uint16 code, + const std::string& reason) override; + ChannelState OnFailChannel(const std::string& message) override; + ChannelState OnStartOpeningHandshake( + scoped_ptr request) override; + ChannelState OnFinishOpeningHandshake( + scoped_ptr response) override; + ChannelState OnSSLCertificateError( scoped_ptr callbacks, const GURL& url, const net::SSLInfo& ssl_info, - bool fatal) OVERRIDE; + bool fatal) override; // Called once we've written to |receive_stream_|. void DidWriteToReceiveStream(bool fin,