mojo/services/network/web_socket_impl.cc - Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/services/network/web_socket_impl.cc

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove compiler_specific.h inclusions Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « mojo/services/network/web_socket_impl.h ('k') | mojo/services/public/cpp/input_events/lib/mojo_extended_key_event_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/network/web_socket_impl.cc

diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc

index 7ba9b22da9657457dc87812e099919a95bab50dc..7617562a2dd1cc547bb467acba14a2f38d277bd3 100644

--- a/mojo/services/network/web_socket_impl.cc

+++ b/mojo/services/network/web_socket_impl.cc

@@ -72,25 +72,25 @@ struct 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;

// Called once we've written to |receive_stream_|.

void DidWriteToReceiveStream(bool fin,