diff options
author | mostynb <mostynb@opera.com> | 2014-10-07 00:17:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 07:17:32 +0000 |
commit | 50a41f330c528275c2980d59dbe9d99d8aec2b49 (patch) | |
tree | 9fc16ccb13091088d318fa57c4a5c28e5dd05945 /ipc/mojo | |
parent | c2ea7251fcf2113162201e24b4f65f8f36ef94d6 (diff) | |
download | chromium_src-50a41f330c528275c2980d59dbe9d99d8aec2b49.zip chromium_src-50a41f330c528275c2980d59dbe9d99d8aec2b49.tar.gz chromium_src-50a41f330c528275c2980d59dbe9d99d8aec2b49.tar.bz2 |
replace OVERRIDE and FINAL with override and final in ipc/
BUG=417463
Review URL: https://codereview.chromium.org/633563002
Cr-Commit-Position: refs/heads/master@{#298413}
Diffstat (limited to 'ipc/mojo')
-rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 4 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo.h | 18 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo_host.cc | 6 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo_readers.h | 16 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo_unittest.cc | 28 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_bootstrap.cc | 12 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_bootstrap.h | 4 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_bootstrap_unittest.cc | 4 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_perftest.cc | 6 |
9 files changed, 49 insertions, 49 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index d3a9f79..791a970 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -27,11 +27,11 @@ class MojoChannelFactory : public ChannelFactory { Channel::Mode mode) : delegate_(delegate), channel_handle_(channel_handle), mode_(mode) {} - virtual std::string GetName() const OVERRIDE { + virtual std::string GetName() const override { return channel_handle_.name; } - virtual scoped_ptr<Channel> BuildChannel(Listener* listener) OVERRIDE { + virtual scoped_ptr<Channel> BuildChannel(Listener* listener) override { return ChannelMojo::Create(delegate_, channel_handle_, mode_, listener) .PassAs<Channel>(); } diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index 5867c08..696d744 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -90,15 +90,15 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel, void OnClientLaunched(base::ProcessHandle handle); // Channel implementation - virtual bool Connect() OVERRIDE; - virtual void Close() OVERRIDE; - virtual bool Send(Message* message) OVERRIDE; - virtual base::ProcessId GetPeerPID() const OVERRIDE; - virtual base::ProcessId GetSelfPID() const OVERRIDE; + virtual bool Connect() override; + virtual void Close() override; + virtual bool Send(Message* message) override; + virtual base::ProcessId GetPeerPID() const override; + virtual base::ProcessId GetSelfPID() const override; #if defined(OS_POSIX) && !defined(OS_NACL) - virtual int GetClientFileDescriptor() const OVERRIDE; - virtual int TakeClientFileDescriptor() OVERRIDE; + virtual int GetClientFileDescriptor() const override; + virtual int TakeClientFileDescriptor() override; // These access protected API of IPC::Message, which has ChannelMojo // as a friend class. @@ -112,8 +112,8 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel, // MojoBootstrapDelegate implementation virtual void OnPipeAvailable( - mojo::embedder::ScopedPlatformHandle handle) OVERRIDE; - virtual void OnBootstrapError() OVERRIDE; + mojo::embedder::ScopedPlatformHandle handle) override; + virtual void OnBootstrapError() override; // Called from MessagePipeReader implementations void OnMessageReceived(Message& message); diff --git a/ipc/mojo/ipc_channel_mojo_host.cc b/ipc/mojo/ipc_channel_mojo_host.cc index 87290ce..efe2a2c 100644 --- a/ipc/mojo/ipc_channel_mojo_host.cc +++ b/ipc/mojo/ipc_channel_mojo_host.cc @@ -20,9 +20,9 @@ class ChannelMojoHost::ChannelDelegate : public ChannelMojo::Delegate { virtual ~ChannelDelegate(); // ChannelMojo::Delegate - virtual base::WeakPtr<Delegate> ToWeakPtr() OVERRIDE; - virtual void OnChannelCreated(base::WeakPtr<ChannelMojo> channel) OVERRIDE; - virtual scoped_refptr<base::TaskRunner> GetIOTaskRunner() OVERRIDE; + virtual base::WeakPtr<Delegate> ToWeakPtr() override; + virtual void OnChannelCreated(base::WeakPtr<ChannelMojo> channel) override; + virtual scoped_refptr<base::TaskRunner> GetIOTaskRunner() override; // Returns an weak ptr of ChannelDelegate instead of Delegate base::WeakPtr<ChannelDelegate> GetWeakPtr(); diff --git a/ipc/mojo/ipc_channel_mojo_readers.h b/ipc/mojo/ipc_channel_mojo_readers.h index 13ddead..fae62ad 100644 --- a/ipc/mojo/ipc_channel_mojo_readers.h +++ b/ipc/mojo/ipc_channel_mojo_readers.h @@ -33,9 +33,9 @@ class MessageReader : public MessagePipeReader { bool Send(scoped_ptr<Message> message); // MessagePipeReader implementation - virtual void OnMessageReceived() OVERRIDE; - virtual void OnPipeClosed() OVERRIDE; - virtual void OnPipeError(MojoResult error) OVERRIDE; + virtual void OnMessageReceived() override; + virtual void OnPipeClosed() override; + virtual void OnPipeError(MojoResult error) override; private: ChannelMojo* owner_; @@ -52,8 +52,8 @@ class ControlReader : public MessagePipeReader { virtual bool Connect(); // MessagePipeReader implementation - virtual void OnPipeClosed() OVERRIDE; - virtual void OnPipeError(MojoResult error) OVERRIDE; + virtual void OnPipeClosed() override; + virtual void OnPipeError(MojoResult error) override; protected: ChannelMojo* owner_; @@ -68,10 +68,10 @@ class ServerControlReader : public ControlReader { virtual ~ServerControlReader(); // ControlReader override - virtual bool Connect() OVERRIDE; + virtual bool Connect() override; // MessagePipeReader implementation - virtual void OnMessageReceived() OVERRIDE; + virtual void OnMessageReceived() override; private: MojoResult SendHelloRequest(); @@ -88,7 +88,7 @@ class ClientControlReader : public ControlReader { ClientControlReader(mojo::ScopedMessagePipeHandle pipe, ChannelMojo* owner); // MessagePipeReader implementation - virtual void OnMessageReceived() OVERRIDE; + virtual void OnMessageReceived() override; private: MojoResult RespondHelloRequest(MojoHandle message_channel); diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc index 39224a0..c66fc91 100644 --- a/ipc/mojo/ipc_channel_mojo_unittest.cc +++ b/ipc/mojo/ipc_channel_mojo_unittest.cc @@ -29,7 +29,7 @@ class ListenerThatExpectsOK : public IPC::Listener { virtual ~ListenerThatExpectsOK() {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { PickleIterator iter(message); std::string should_be_ok; EXPECT_TRUE(iter.ReadString(&should_be_ok)); @@ -39,7 +39,7 @@ class ListenerThatExpectsOK : public IPC::Listener { return true; } - virtual void OnChannelError() OVERRIDE { + virtual void OnChannelError() override { // The connection should be healthy while the listener is waiting // message. An error can occur after that because the peer // process dies. @@ -81,13 +81,13 @@ class IPCChannelMojoTest : public IPCTestBase { protected: virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory( const IPC::ChannelHandle& handle, - base::TaskRunner* runner) OVERRIDE { + base::TaskRunner* runner) override { host_.reset(new IPC::ChannelMojoHost(task_runner())); return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(), handle); } - virtual bool DidStartClient() OVERRIDE { + virtual bool DidStartClient() override { bool ok = IPCTestBase::DidStartClient(); DCHECK(ok); host_->OnClientLaunched(client_process()); @@ -106,7 +106,7 @@ class TestChannelListenerWithExtraExpectations : is_connected_called_(false) { } - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE { + virtual void OnChannelConnected(int32 peer_pid) override { IPC::TestChannelListener::OnChannelConnected(peer_pid); EXPECT_TRUE(base::kNullProcessId != peer_pid); is_connected_called_ = true; @@ -165,15 +165,15 @@ class ListenerExpectingErrors : public IPC::Listener { : has_error_(false) { } - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE { + virtual void OnChannelConnected(int32 peer_pid) override { base::MessageLoop::current()->Quit(); } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return true; } - virtual void OnChannelError() OVERRIDE { + virtual void OnChannelError() override { has_error_ = true; base::MessageLoop::current()->Quit(); } @@ -189,13 +189,13 @@ class IPCChannelMojoErrorTest : public IPCTestBase { protected: virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory( const IPC::ChannelHandle& handle, - base::TaskRunner* runner) OVERRIDE { + base::TaskRunner* runner) override { host_.reset(new IPC::ChannelMojoHost(task_runner())); return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(), handle); } - virtual bool DidStartClient() OVERRIDE { + virtual bool DidStartClient() override { bool ok = IPCTestBase::DidStartClient(); DCHECK(ok); host_->OnClientLaunched(client_process()); @@ -211,11 +211,11 @@ class ListenerThatQuits : public IPC::Listener { ListenerThatQuits() { } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return true; } - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE { + virtual void OnChannelConnected(int32 peer_pid) override { base::MessageLoop::current()->Quit(); } }; @@ -268,7 +268,7 @@ class ListenerThatExpectsFile : public IPC::Listener { virtual ~ListenerThatExpectsFile() {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { PickleIterator iter(message); base::ScopedFD fd; @@ -282,7 +282,7 @@ class ListenerThatExpectsFile : public IPC::Listener { return true; } - virtual void OnChannelError() OVERRIDE { + virtual void OnChannelError() override { NOTREACHED(); } diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc index 1b50b3f..f45a18e 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.cc +++ b/ipc/mojo/ipc_mojo_bootstrap.cc @@ -20,15 +20,15 @@ class IPC_MOJO_EXPORT MojoServerBootstrap : public MojoBootstrap { public: MojoServerBootstrap(); - virtual void OnClientLaunched(base::ProcessHandle process) OVERRIDE; + virtual void OnClientLaunched(base::ProcessHandle process) override; private: void SendClientPipe(); void SendClientPipeIfReady(); // Listener implementations - virtual bool OnMessageReceived(const Message& message) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual bool OnMessageReceived(const Message& message) override; + virtual void OnChannelConnected(int32 peer_pid) override; mojo::embedder::ScopedPlatformHandle server_pipe_; base::ProcessHandle client_process_; @@ -103,12 +103,12 @@ class IPC_MOJO_EXPORT MojoClientBootstrap : public MojoBootstrap { public: MojoClientBootstrap(); - virtual void OnClientLaunched(base::ProcessHandle process) OVERRIDE; + virtual void OnClientLaunched(base::ProcessHandle process) override; private: // Listener implementations - virtual bool OnMessageReceived(const Message& message) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual bool OnMessageReceived(const Message& message) override; + virtual void OnChannelConnected(int32 peer_pid) override; DISALLOW_COPY_AND_ASSIGN(MojoClientBootstrap); }; diff --git a/ipc/mojo/ipc_mojo_bootstrap.h b/ipc/mojo/ipc_mojo_bootstrap.h index 4d9e471..f0e4188 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.h +++ b/ipc/mojo/ipc_mojo_bootstrap.h @@ -67,8 +67,8 @@ class IPC_MOJO_EXPORT MojoBootstrap : public Listener { void Init(scoped_ptr<Channel> channel, Delegate* delegate); // Listener implementations - virtual void OnBadMessageReceived(const Message& message) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual void OnBadMessageReceived(const Message& message) override; + virtual void OnChannelError() override; scoped_ptr<Channel> channel_; Delegate* delegate_; diff --git a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc index 207c060..8bffd88 100644 --- a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc +++ b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc @@ -24,8 +24,8 @@ class TestingDelegate : public IPC::MojoBootstrap::Delegate { TestingDelegate() : passed_(false) {} virtual void OnPipeAvailable( - mojo::embedder::ScopedPlatformHandle handle) OVERRIDE; - virtual void OnBootstrapError() OVERRIDE; + mojo::embedder::ScopedPlatformHandle handle) override; + virtual void OnBootstrapError() override; bool passed() const { return passed_; } diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc index 20893d4..dca405e 100644 --- a/ipc/mojo/ipc_mojo_perftest.cc +++ b/ipc/mojo/ipc_mojo_perftest.cc @@ -31,13 +31,13 @@ public: virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory( const IPC::ChannelHandle& handle, - base::TaskRunner* runner) OVERRIDE { + base::TaskRunner* runner) override { host_.reset(new IPC::ChannelMojoHost(task_runner())); return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(), handle); } - virtual bool DidStartClient() OVERRIDE { + virtual bool DidStartClient() override { bool ok = IPCTestBase::DidStartClient(); DCHECK(ok); host_->OnClientLaunched(client_process()); @@ -74,7 +74,7 @@ class MojoTestClient : public IPC::test::PingPongTestClient { MojoTestClient(); virtual scoped_ptr<IPC::Channel> CreateChannel( - IPC::Listener* listener) OVERRIDE; + IPC::Listener* listener) override; }; MojoTestClient::MojoTestClient() { |