Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Unified Diff: mojo/spy/websocket_server.h

Issue 668663006: Standardize usage of virtual/override/final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/spy/spy_server_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/spy/websocket_server.h
diff --git a/mojo/spy/websocket_server.h b/mojo/spy/websocket_server.h
index c6dc07696828892d9569b8e1dc8cf8b45ae03849..879682d44481d1e1e4b179b37d582016e8665302 100644
--- a/mojo/spy/websocket_server.h
+++ b/mojo/spy/websocket_server.h
@@ -25,7 +25,7 @@ class WebSocketServer : public net::HttpServer::Delegate,
public:
// Pass 0 in |port| to listen in one available port.
explicit WebSocketServer(int port, ScopedMessagePipeHandle server_pipe);
- virtual ~WebSocketServer();
+ ~WebSocketServer() override;
// Begin accepting HTTP requests. Must be called from an IO MessageLoop.
bool Start();
// Returns the listening port, useful if 0 was passed to the contructor.
@@ -39,26 +39,21 @@ class WebSocketServer : public net::HttpServer::Delegate,
protected:
// Overridden from net::HttpServer::Delegate.
- virtual void OnConnect(int connection_id) override {}
- virtual void OnHttpRequest(
- int connection_id,
- const net::HttpServerRequestInfo& info) override;
- virtual void OnWebSocketRequest(
- int connection_id,
- const net::HttpServerRequestInfo& info) override;
- virtual void OnWebSocketMessage(
- int connection_id,
- const std::string& data) override;
- virtual void OnClose(int connection_id) override;
+ void OnConnect(int connection_id) override {}
+ void OnHttpRequest(int connection_id,
+ const net::HttpServerRequestInfo& info) override;
+ void OnWebSocketRequest(int connection_id,
+ const net::HttpServerRequestInfo& info) override;
+ void OnWebSocketMessage(int connection_id, const std::string& data) override;
+ void OnClose(int connection_id) override;
// Overriden form spy_api::SpyClient.
- virtual void OnFatalError(spy_api::Result result) override;
- virtual void OnSessionEnd(spy_api::Result result) override;
- virtual void OnClientConnection(
- const mojo::String& name,
- uint32_t id,
- spy_api::ConnectionOptions options) override;
- virtual void OnMessage(spy_api::MessagePtr message) override;
+ void OnFatalError(spy_api::Result result) override;
+ void OnSessionEnd(spy_api::Result result) override;
+ void OnClientConnection(const mojo::String& name,
+ uint32_t id,
+ spy_api::ConnectionOptions options) override;
+ void OnMessage(spy_api::MessagePtr message) override;
// Callbacks from calling spy_api::SpyServer.
void OnStartSession(spy_api::Result, mojo::String);
« no previous file with comments | « mojo/spy/spy_server_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698