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

Unified Diff: tools/android/forwarder2/device_forwarder_main.cc

Issue 898173002: Update {virtual,override,final} to follow C++11 style in tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | tools/android/forwarder2/host_forwarder_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/device_forwarder_main.cc
diff --git a/tools/android/forwarder2/device_forwarder_main.cc b/tools/android/forwarder2/device_forwarder_main.cc
index c215efa6b3c89af57f73ffd8a0ceddb76d76f2c7..8b5df26ccb55249b2bfc6045689441e0eea4eaec 100644
--- a/tools/android/forwarder2/device_forwarder_main.cc
+++ b/tools/android/forwarder2/device_forwarder_main.cc
@@ -48,7 +48,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
public:
ServerDelegate() : initialized_(false) {}
- virtual ~ServerDelegate() {
+ ~ServerDelegate() override {
if (!controller_thread_.get())
return;
// The DeviceController instance, if any, is constructed on the controller
@@ -68,7 +68,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
}
// Daemon::ServerDelegate:
- virtual void Init() override {
+ void Init() override {
DCHECK(!g_notifier);
g_notifier = new forwarder2::PipeNotifier();
signal(SIGTERM, KillHandler);
@@ -77,7 +77,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
controller_thread_->Start();
}
- virtual void OnClientConnected(scoped_ptr<Socket> client_socket) override {
+ void OnClientConnected(scoped_ptr<Socket> client_socket) override {
if (initialized_) {
client_socket->WriteString("OK");
return;
@@ -119,7 +119,7 @@ class ClientDelegate : public Daemon::ClientDelegate {
bool has_failed() const { return has_failed_; }
// Daemon::ClientDelegate:
- virtual void OnDaemonReady(Socket* daemon_socket) override {
+ void OnDaemonReady(Socket* daemon_socket) override {
char buf[kBufSize];
const int bytes_read = daemon_socket->Read(
buf, sizeof(buf) - 1 /* leave space for null terminator */);
« no previous file with comments | « no previous file | tools/android/forwarder2/host_forwarder_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698