summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 16:09:44 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 16:09:44 +0000
commit2a026e544be39ea9c7da534bf8433fc8704fe5cc (patch)
tree9c964679770d5da383b7e486d10e65d70285b30c
parent8076ec09436c54c8c8d242629a7667abf0feb7a7 (diff)
downloadchromium_src-2a026e544be39ea9c7da534bf8433fc8704fe5cc.zip
chromium_src-2a026e544be39ea9c7da534bf8433fc8704fe5cc.tar.gz
chromium_src-2a026e544be39ea9c7da534bf8433fc8704fe5cc.tar.bz2
Add OVERRIDE to ipc/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8590004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110495 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ipc/ipc_channel.h2
-rw-r--r--ipc/ipc_channel_posix.h4
-rw-r--r--ipc/ipc_channel_proxy.h2
-rw-r--r--ipc/ipc_sync_channel.h16
-rw-r--r--ipc/ipc_sync_message_filter.h10
-rw-r--r--ipc/ipc_test_sink.h2
-rw-r--r--ipc/ipc_tests.h6
7 files changed, 21 insertions, 21 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
index 718f2b3..983503b 100644
--- a/ipc/ipc_channel.h
+++ b/ipc/ipc_channel.h
@@ -140,7 +140,7 @@ class IPC_EXPORT Channel : public Message::Sender {
//
// |message| must be allocated using operator new. This object will be
// deleted once the contents of the Message have been sent.
- virtual bool Send(Message* message);
+ virtual bool Send(Message* message) OVERRIDE;
#if defined(OS_POSIX) && !defined(OS_NACL)
// On POSIX an IPC::Channel wraps a socketpair(), this method returns the
diff --git a/ipc/ipc_channel_posix.h b/ipc/ipc_channel_posix.h
index e141998..800c366 100644
--- a/ipc/ipc_channel_posix.h
+++ b/ipc/ipc_channel_posix.h
@@ -82,8 +82,8 @@ class Channel::ChannelImpl : public MessageLoopForIO::Watcher {
bool IsHelloMessage(const Message* m) const;
// MessageLoopForIO::Watcher implementation.
- virtual void OnFileCanReadWithoutBlocking(int fd);
- virtual void OnFileCanWriteWithoutBlocking(int fd);
+ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
+ virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
Mode mode_;
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index 521389f..ea951fe 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -147,7 +147,7 @@ class IPC_EXPORT ChannelProxy : public Message::Sender {
// Send a message asynchronously. The message is routed to the background
// thread where it is passed to the IPC::Channel's Send method.
- virtual bool Send(Message* message);
+ virtual bool Send(Message* message) OVERRIDE;
// Used to intercept messages as they are received on the background thread.
//
diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h
index ae9a765..448d355 100644
--- a/ipc/ipc_sync_channel.h
+++ b/ipc/ipc_sync_channel.h
@@ -80,7 +80,7 @@ class IPC_EXPORT SyncChannel : public ChannelProxy,
virtual ~SyncChannel();
- virtual bool Send(Message* message);
+ virtual bool Send(Message* message) OVERRIDE;
virtual bool SendWithTimeout(Message* message, int timeout_ms);
// Whether we allow sending messages with no time-out.
@@ -154,19 +154,19 @@ class IPC_EXPORT SyncChannel : public ChannelProxy,
// ChannelProxy methods that we override.
// Called on the listener thread.
- virtual void Clear();
+ virtual void Clear() OVERRIDE;
// Called on the IPC thread.
- virtual bool OnMessageReceived(const Message& msg);
- virtual void OnChannelError();
- virtual void OnChannelOpened();
- virtual void OnChannelClosed();
+ virtual bool OnMessageReceived(const Message& msg) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
+ virtual void OnChannelOpened() OVERRIDE;
+ virtual void OnChannelClosed() OVERRIDE;
// Cancels all pending Send calls.
void CancelPendingSends();
// WaitableEventWatcher::Delegate implementation.
- virtual void OnWaitableEventSignaled(base::WaitableEvent* arg);
+ virtual void OnWaitableEventSignaled(base::WaitableEvent* arg) OVERRIDE;
typedef std::deque<PendingSyncMsg> PendingSyncMessageQueue;
PendingSyncMessageQueue deserializers_;
@@ -181,7 +181,7 @@ class IPC_EXPORT SyncChannel : public ChannelProxy,
private:
// WaitableEventWatcher::Delegate implementation.
- virtual void OnWaitableEventSignaled(base::WaitableEvent* arg);
+ virtual void OnWaitableEventSignaled(base::WaitableEvent* arg) OVERRIDE;
SyncContext* sync_context() {
return reinterpret_cast<SyncContext*>(context());
diff --git a/ipc/ipc_sync_message_filter.h b/ipc/ipc_sync_message_filter.h
index 4b5b55f..1f0f46d 100644
--- a/ipc/ipc_sync_message_filter.h
+++ b/ipc/ipc_sync_message_filter.h
@@ -33,13 +33,13 @@ class IPC_EXPORT SyncMessageFilter : public ChannelProxy::MessageFilter,
virtual ~SyncMessageFilter();
// Message::Sender implementation.
- virtual bool Send(Message* message);
+ virtual bool Send(Message* message) OVERRIDE;
// ChannelProxy::MessageFilter implementation.
- virtual void OnFilterAdded(Channel* channel);
- virtual void OnChannelError();
- virtual void OnChannelClosing();
- virtual bool OnMessageReceived(const Message& message);
+ virtual void OnFilterAdded(Channel* channel) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
+ virtual void OnChannelClosing() OVERRIDE;
+ virtual bool OnMessageReceived(const Message& message) OVERRIDE;
private:
void SendOnIOThread(Message* message);
diff --git a/ipc/ipc_test_sink.h b/ipc/ipc_test_sink.h
index ad1125a..735fa1b 100644
--- a/ipc/ipc_test_sink.h
+++ b/ipc/ipc_test_sink.h
@@ -78,7 +78,7 @@ class TestSink : public Channel {
// Interface in IPC::Channel. This copies the message to the sink and then
// deletes it.
- virtual bool Send(IPC::Message* message);
+ virtual bool Send(IPC::Message* message) OVERRIDE;
// Used by the source of the messages to send the message to the sink. This
// will make a copy of the message and store it in the list.
diff --git a/ipc/ipc_tests.h b/ipc/ipc_tests.h
index bfefb4c..f4fa113 100644
--- a/ipc/ipc_tests.h
+++ b/ipc/ipc_tests.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -36,8 +36,8 @@ class IPCChannelTest : public base::MultiProcessTest {
protected:
// Create a new MessageLoopForIO For each test.
- virtual void SetUp();
- virtual void TearDown();
+ virtual void SetUp() OVERRIDE;
+ virtual void TearDown() OVERRIDE;
// Spawns a child process of the specified type
base::ProcessHandle SpawnChild(ChildType child_type, IPC::Channel* channel);