chrome/test/chromedriver/net/test_http_server.h - Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test

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: chrome/test/chromedriver/net/test_http_server.h

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (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 | « chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc ('k') | chrome/test/chromedriver/net/url_request_context_getter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/chromedriver/net/test_http_server.h

diff --git a/chrome/test/chromedriver/net/test_http_server.h b/chrome/test/chromedriver/net/test_http_server.h

index 70b26a5f7ec3a2d5f674780af1ae9370e1bcb725..f2b2913deb4a62a8de49e3e3683924ff54e9c559 100644

--- a/chrome/test/chromedriver/net/test_http_server.h

+++ b/chrome/test/chromedriver/net/test_http_server.h

@@ -61,15 +61,15 @@ class TestHttpServer : public net::HttpServer::Delegate {

GURL web_socket_url() const;

// Overridden from net::HttpServer::Delegate:

- virtual void OnConnect(int connection_id) OVERRIDE;

+ virtual void OnConnect(int connection_id) override;

virtual void OnHttpRequest(int connection_id,

- const net::HttpServerRequestInfo& info) OVERRIDE {}

+ const net::HttpServerRequestInfo& info) override {}

virtual void OnWebSocketRequest(

int connection_id,

- const net::HttpServerRequestInfo& info) OVERRIDE;

+ const net::HttpServerRequestInfo& info) override;

virtual void OnWebSocketMessage(int connection_id,

- const std::string& data) OVERRIDE;

- virtual void OnClose(int connection_id) OVERRIDE;

+ const std::string& data) override;

+ virtual void OnClose(int connection_id) override;

private:

void StartOnServerThread(bool* success, base::WaitableEvent* event);