Commit da1bd185 authored by evan@chromium.org's avatar evan@chromium.org

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
parent a099f3ae
......@@ -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_;
......
......@@ -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);
......
......@@ -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);
......
// 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);
......
......@@ -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);
......
......@@ -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();
......
......@@ -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.
......
// 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
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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());
}
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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.
......
......@@ -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_;
};
......
......@@ -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);
......
......@@ -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.
......
......@@ -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();
......
......@@ -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;
......
......@@ -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);
......
......@@ -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.
......
......@@ -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();
......
......@@ -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);
......
// 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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment