summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 21:09:25 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 21:09:25 +0000
commitda1bd1855df84f4b851752dfc2ffe56f6e12e925 (patch)
tree4953bea3627412728228ce0b36a16cb19c2102d7
parenta099f3aeb1fa6c33d0b3f679fbd4e6bc616d85dc (diff)
downloadchromium_src-da1bd1855df84f4b851752dfc2ffe56f6e12e925.zip
chromium_src-da1bd1855df84f4b851752dfc2ffe56f6e12e925.tar.gz
chromium_src-da1bd1855df84f4b851752dfc2ffe56f6e12e925.tar.bz2
Tag IPC::Channel::Listener implementations with OVERRIDE
Review URL: http://codereview.chromium.org/7661031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97021 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/automation/automation_provider.h12
-rw-r--r--chrome/browser/automation/automation_resource_message_filter.h7
-rw-r--r--chrome/browser/service/service_process_control.h6
-rw-r--r--chrome/nacl/broker_thread.h5
-rw-r--r--chrome/service/service_ipc_server.h8
-rw-r--r--chrome_frame/cfproxy_private.h8
-rw-r--r--content/browser/appcache/appcache_dispatcher_host.h4
-rw-r--r--content/browser/browser_message_filter.h10
-rw-r--r--content/browser/file_system/file_system_dispatcher_host.h4
-rw-r--r--content/browser/gpu/gpu_process_host.h4
-rw-r--r--content/browser/in_process_webkit/dom_storage_message_filter.h8
-rw-r--r--content/browser/plugin_process_host.h6
-rw-r--r--content/browser/plugin_service_browsertest.cc2
-rw-r--r--content/browser/ppapi_broker_process_host.h6
-rw-r--r--content/browser/ppapi_plugin_process_host.h6
-rw-r--r--content/browser/renderer_host/browser_render_process_host.h6
-rw-r--r--content/browser/renderer_host/mock_render_process_host.h4
-rw-r--r--content/common/child_process_host.h12
-rw-r--r--content/common/gpu/gpu_channel.h6
-rw-r--r--content/common/gpu/transport_texture.h6
-rw-r--r--content/plugin/plugin_channel.h4
-rw-r--r--content/plugin/plugin_channel_base.h6
-rw-r--r--content/renderer/gpu/gpu_channel_host.h6
-rw-r--r--content/renderer/gpu/transport_texture_host.h6
-rw-r--r--ipc/ipc_channel_posix_unittest.cc10
-rw-r--r--ipc/ipc_channel_proxy.h6
-rw-r--r--ipc/ipc_tests.cc8
27 files changed, 90 insertions, 86 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index b389b88..6efe17d 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -127,11 +127,13 @@ class AutomationProvider
void AddLoginHandler(NavigationController* tab, LoginHandler* handler);
void RemoveLoginHandler(NavigationController* tab);
- // IPC implementations
- virtual bool Send(IPC::Message* msg);
- virtual void OnChannelConnected(int pid);
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelError();
+ // IPC::Channel::Sender implementation.
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
+
+ // IPC::Channel::Listener implementation.
+ virtual void OnChannelConnected(int pid) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
IPC::Message* reply_message_release() {
IPC::Message* reply_message = reply_message_;
diff --git a/chrome/browser/automation/automation_resource_message_filter.h b/chrome/browser/automation/automation_resource_message_filter.h
index fb184c4..c4b1f4d 100644
--- a/chrome/browser/automation/automation_resource_message_filter.h
+++ b/chrome/browser/automation/automation_resource_message_filter.h
@@ -61,9 +61,10 @@ class AutomationResourceMessageFilter
virtual void OnFilterAdded(IPC::Channel* channel);
virtual void OnFilterRemoved();
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelClosing();
- virtual bool OnMessageReceived(const IPC::Message& message);
+ // IPC::Channel::Listener implementation.
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelClosing() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
// ResourceDispatcherHost::Receiver methods:
virtual bool Send(IPC::Message* message);
diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h
index 08aa470..a98a026 100644
--- a/chrome/browser/service/service_process_control.h
+++ b/chrome/browser/service/service_process_control.h
@@ -68,9 +68,9 @@ class ServiceProcessControl : public IPC::Channel::Sender,
void Disconnect();
// IPC::Channel::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& message);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// IPC::Channel::Sender implementation
virtual bool Send(IPC::Message* message);
diff --git a/chrome/nacl/broker_thread.h b/chrome/nacl/broker_thread.h
index 3c1e3ac..b0a05b9 100644
--- a/chrome/nacl/broker_thread.h
+++ b/chrome/nacl/broker_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -23,7 +23,8 @@ class NaClBrokerThread : public ChildThread {
// Returns the one NaCl thread.
static NaClBrokerThread* current();
- virtual void OnChannelConnected(int32 peer_pid);
+ // IPC::Channel::Listener implementation.
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
private:
virtual bool OnControlMessageReceived(const IPC::Message& msg);
diff --git a/chrome/service/service_ipc_server.h b/chrome/service/service_ipc_server.h
index ed1613f..513f77e 100644
--- a/chrome/service/service_ipc_server.h
+++ b/chrome/service/service_ipc_server.h
@@ -35,10 +35,10 @@ class ServiceIPCServer : public IPC::Channel::Listener,
private:
- // IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ // IPC::Channel::Listener implementation.
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// IPC message handlers.
void OnEnableCloudPrintProxy(const std::string& lsid);
diff --git a/chrome_frame/cfproxy_private.h b/chrome_frame/cfproxy_private.h
index 19ade4e..61778e1d 100644
--- a/chrome_frame/cfproxy_private.h
+++ b/chrome_frame/cfproxy_private.h
@@ -155,10 +155,10 @@ class CFProxy : public Interface2IPCMessage,
virtual void Tab_RunUnloadHandlers(int tab);
//////////////////////////////////////////////////////////////////////////
- // IPC::Channel::Listener
- virtual bool OnMessageReceived(const IPC::Message& message);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ // IPC::Channel::Listener implementation.
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
bool CalledOnIpcThread() const {
return base::PlatformThread::CurrentId() == ipc_thread_.thread_id();
diff --git a/content/browser/appcache/appcache_dispatcher_host.h b/content/browser/appcache/appcache_dispatcher_host.h
index 4799159..ef5e891 100644
--- a/content/browser/appcache/appcache_dispatcher_host.h
+++ b/content/browser/appcache/appcache_dispatcher_host.h
@@ -32,9 +32,9 @@ class AppCacheDispatcherHost : public BrowserMessageFilter {
virtual ~AppCacheDispatcherHost();
// BrowserIOMessageFilter implementation
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
+ bool* message_was_ok) OVERRIDE;
private:
// BrowserMessageFilter override.
diff --git a/content/browser/browser_message_filter.h b/content/browser/browser_message_filter.h
index 621067b..674d492 100644
--- a/content/browser/browser_message_filter.h
+++ b/content/browser/browser_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -20,11 +20,11 @@ class BrowserMessageFilter : public IPC::ChannelProxy::MessageFilter,
// IPC::ChannelProxy::MessageFilter methods. If you override them, make sure
// to call them as well. These are always called on the IO thread.
- virtual void OnFilterAdded(IPC::Channel* channel);
- virtual void OnChannelClosing();
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+ virtual void OnChannelClosing() OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
// DON'T OVERRIDE THIS! Override the other version below.
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
// IPC::Message::Sender implementation. Can be called on any thread. Can't
// send sync messages (since we don't want to block the browser on any other
diff --git a/content/browser/file_system/file_system_dispatcher_host.h b/content/browser/file_system/file_system_dispatcher_host.h
index 80426aa..956fc43 100644
--- a/content/browser/file_system/file_system_dispatcher_host.h
+++ b/content/browser/file_system/file_system_dispatcher_host.h
@@ -44,9 +44,9 @@ class FileSystemDispatcherHost : public BrowserMessageFilter {
virtual ~FileSystemDispatcherHost();
// BrowserMessageFilter implementation.
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
+ bool* message_was_ok) OVERRIDE;
void UnregisterOperation(int request_id);
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index c50af2e..08f583d 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -54,8 +54,8 @@ class GpuProcessHost : public BrowserChildProcessHost,
virtual bool Send(IPC::Message* msg);
// ChildProcessHost implementation.
- virtual bool OnMessageReceived(const IPC::Message& message);
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
typedef Callback3<const IPC::ChannelHandle&,
base::ProcessHandle,
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.h b/content/browser/in_process_webkit/dom_storage_message_filter.h
index 315a2a7..108d12e 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.h
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.h
@@ -27,12 +27,12 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
DOMStorageMessageFilter(int process_id, WebKitContext* webkit_context);
// BrowserMessageFilter implementation
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
virtual void OverrideThreadForMessage(const IPC::Message& message,
- BrowserThread::ID* thread);
+ BrowserThread::ID* thread) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
- virtual void OnDestruct() const;
+ bool* message_was_ok) OVERRIDE;
+ virtual void OnDestruct() const OVERRIDE;
// Only call on the WebKit thread.
static void DispatchStorageEvent(const NullableString16& key,
diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h
index 63ea1b5..7fdba4d 100644
--- a/content/browser/plugin_process_host.h
+++ b/content/browser/plugin_process_host.h
@@ -64,9 +64,9 @@ class PluginProcessHost : public BrowserChildProcessHost {
// Force the plugin process to shutdown (cleanly).
virtual void ForceShutdown();
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// Tells the plugin process to create a new channel for communication with a
// renderer. When the plugin process responds with the channel name,
diff --git a/content/browser/plugin_service_browsertest.cc b/content/browser/plugin_service_browsertest.cc
index 188842c..95ce4b6 100644
--- a/content/browser/plugin_service_browsertest.cc
+++ b/content/browser/plugin_service_browsertest.cc
@@ -54,7 +54,7 @@ class MockPluginProcessHostClient : public PluginProcessHost::Client,
// Listener implementation.
MOCK_METHOD1(OnMessageReceived, bool(const IPC::Message& message));
- void OnChannelConnected(int32 peer_pid) {
+ void OnChannelConnected(int32 peer_pid) OVERRIDE {
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
new MessageLoop::QuitTask());
}
diff --git a/content/browser/ppapi_broker_process_host.h b/content/browser/ppapi_broker_process_host.h
index 38a0314..0fe0d90 100644
--- a/content/browser/ppapi_broker_process_host.h
+++ b/content/browser/ppapi_broker_process_host.h
@@ -55,9 +55,9 @@ class PpapiBrokerProcessHost : public BrowserChildProcessHost {
virtual bool CanShutdown();
virtual void OnProcessLaunched();
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
void CancelRequests();
diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h
index 5fe505f..4405aff7 100644
--- a/content/browser/ppapi_plugin_process_host.h
+++ b/content/browser/ppapi_plugin_process_host.h
@@ -69,9 +69,9 @@ class PpapiPluginProcessHost
virtual bool CanShutdown();
virtual void OnProcessLaunched();
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
void CancelRequests();
diff --git a/content/browser/renderer_host/browser_render_process_host.h b/content/browser/renderer_host/browser_render_process_host.h
index 9b49481..2f657ab 100644
--- a/content/browser/renderer_host/browser_render_process_host.h
+++ b/content/browser/renderer_host/browser_render_process_host.h
@@ -69,9 +69,9 @@ class BrowserRenderProcessHost : public RenderProcessHost,
virtual bool Send(IPC::Message* msg);
// IPC::Channel::Listener via RenderProcessHost.
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// ChildProcessLauncher::Client implementation.
virtual void OnProcessLaunched();
diff --git a/content/browser/renderer_host/mock_render_process_host.h b/content/browser/renderer_host/mock_render_process_host.h
index 7afb95a..03e163e 100644
--- a/content/browser/renderer_host/mock_render_process_host.h
+++ b/content/browser/renderer_host/mock_render_process_host.h
@@ -60,8 +60,8 @@ class MockRenderProcessHost : public RenderProcessHost {
virtual bool Send(IPC::Message* msg);
// IPC::Channel::Listener via RenderProcessHost.
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
// Attaches the factory object so we can remove this object in its destructor
// and prevent MockRenderProcessHostFacotry from deleting it.
diff --git a/content/common/child_process_host.h b/content/common/child_process_host.h
index 7e00c43..7fd7082 100644
--- a/content/common/child_process_host.h
+++ b/content/common/child_process_host.h
@@ -80,9 +80,9 @@ class ChildProcessHost : public IPC::Channel::Listener,
virtual void InstanceCreated();
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
bool opening_channel() { return opening_channel_; }
const std::string& channel_id() { return channel_id_; }
@@ -102,9 +102,9 @@ class ChildProcessHost : public IPC::Channel::Listener,
class ListenerHook : public IPC::Channel::Listener {
public:
explicit ListenerHook(ChildProcessHost* host);
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
private:
ChildProcessHost* host_;
};
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index 1efebca..5a5d501 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -73,9 +73,9 @@ class GpuChannel : public IPC::Channel::Listener,
}
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelError();
- virtual void OnChannelConnected(int32 peer_pid);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
// IPC::Message::Sender implementation:
virtual bool Send(IPC::Message* msg);
diff --git a/content/common/gpu/transport_texture.h b/content/common/gpu/transport_texture.h
index 3e01687..ae941e9 100644
--- a/content/common/gpu/transport_texture.h
+++ b/content/common/gpu/transport_texture.h
@@ -60,9 +60,9 @@ class TransportTexture : public IPC::Channel::Listener {
void TextureUpdated(int texture_id);
// IPC::Channel::Listener implementation.
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
private:
// Mapping from service (GPU) IDs to client (Renderer) IDs.
diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index b0edd9d..4439920 100644
--- a/content/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -56,8 +56,8 @@ class PluginChannel : public PluginChannelBase {
protected:
// IPC::Channel::Listener implementation:
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
virtual void CleanUp();
diff --git a/content/plugin/plugin_channel_base.h b/content/plugin/plugin_channel_base.h
index 6621409..f7f5693 100644
--- a/content/plugin/plugin_channel_base.h
+++ b/content/plugin/plugin_channel_base.h
@@ -128,9 +128,9 @@ class PluginChannelBase : public IPC::Channel::Listener,
virtual bool OnControlMessageReceived(const IPC::Message& msg);
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
void set_send_unblocking_only_during_unblock_dispatch() {
send_unblocking_only_during_unblock_dispatch_ = true;
diff --git a/content/renderer/gpu/gpu_channel_host.h b/content/renderer/gpu/gpu_channel_host.h
index ec5cd20..51b3971 100644
--- a/content/renderer/gpu/gpu_channel_host.h
+++ b/content/renderer/gpu/gpu_channel_host.h
@@ -59,9 +59,9 @@ class GpuChannelHost : public IPC::Channel::Listener,
const GPUInfo& gpu_info() const;
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// IPC::Message::Sender implementation:
virtual bool Send(IPC::Message* msg);
diff --git a/content/renderer/gpu/transport_texture_host.h b/content/renderer/gpu/transport_texture_host.h
index 780b49c..71e90c8 100644
--- a/content/renderer/gpu/transport_texture_host.h
+++ b/content/renderer/gpu/transport_texture_host.h
@@ -151,9 +151,9 @@ class TransportTextureHost
int GetPeerId();
// IPC::Channel::Listener.
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
private:
// Released all textures generated.
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index cc6f20b..14ecc608 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -43,35 +43,35 @@ class IPCChannelPosixTestListener : public IPC::Channel::Listener {
virtual ~IPCChannelPosixTestListener() {}
- virtual bool OnMessageReceived(const IPC::Message& message) {
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
EXPECT_EQ(message.type(), QUIT_MESSAGE);
status_ = MESSAGE_RECEIVED;
QuitRunLoop();
return true;
}
- virtual void OnChannelConnected(int32 peer_pid) {
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
status_ = CONNECTED;
if (!quit_only_on_message_) {
QuitRunLoop();
}
}
- virtual void OnChannelError() {
+ virtual void OnChannelError() OVERRIDE {
status_ = CHANNEL_ERROR;
if (!quit_only_on_message_) {
QuitRunLoop();
}
}
- virtual void OnChannelDenied() {
+ virtual void OnChannelDenied() OVERRIDE {
status_ = DENIED;
if (!quit_only_on_message_) {
QuitRunLoop();
}
}
- virtual void OnChannelListenError() {
+ virtual void OnChannelListenError() OVERRIDE {
status_ = LISTEN_ERROR;
if (!quit_only_on_message_) {
QuitRunLoop();
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index 0473e0c..792e3d6 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -191,9 +191,9 @@ class IPC_EXPORT ChannelProxy : public Message::Sender {
virtual ~Context();
// IPC::Channel::Listener methods:
- virtual bool OnMessageReceived(const Message& message);
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const Message& message) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// Like OnMessageReceived but doesn't try the filters.
bool OnMessageReceivedNoFilter(const Message& message);
diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc
index d8e3aeb..2727681 100644
--- a/ipc/ipc_tests.cc
+++ b/ipc/ipc_tests.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -288,11 +288,11 @@ TEST_F(IPCChannelTest, ChannelProxyTest) {
class ChannelListenerWithOnConnectedSend : public IPC::Channel::Listener {
public:
- virtual void OnChannelConnected(int32 peer_pid) {
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
SendNextMessage();
}
- virtual bool OnMessageReceived(const IPC::Message& message) {
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
IPC::MessageIterator iter(message);
iter.NextInt();
@@ -303,7 +303,7 @@ class ChannelListenerWithOnConnectedSend : public IPC::Channel::Listener {
return true;
}
- virtual void OnChannelError() {
+ virtual void OnChannelError() OVERRIDE {
// There is a race when closing the channel so the last message may be lost.
EXPECT_LE(messages_left_, 1);
MessageLoop::current()->Quit();