Standardize usage of virtual/override/final in ipc/
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
Several formatting edits by clang-format were manually reverted, due to
mangling of some of the more complicate IPC macros.
BUG=417463
R=agl@chromium.org
Review URL: https://codereview.chromium.org/666493005
Cr-Commit-Position: refs/heads/master@{#300623}
CrOS-Libchrome-Original-Commit: fe61fca6faca13c54768ee131dc79c8e06421097
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h
index b307fd4..e5a4e33 100644
--- a/ipc/mojo/ipc_channel_mojo.h
+++ b/ipc/mojo/ipc_channel_mojo.h
@@ -87,21 +87,21 @@
static scoped_ptr<ChannelFactory> CreateClientFactory(
const ChannelHandle& channel_handle);
- virtual ~ChannelMojo();
+ ~ChannelMojo() override;
// ChannelMojoHost tells the client handle using this API.
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;
+ bool Connect() override;
+ void Close() override;
+ bool Send(Message* message) override;
+ base::ProcessId GetPeerPID() const override;
+ base::ProcessId GetSelfPID() const override;
#if defined(OS_POSIX) && !defined(OS_NACL)
- virtual int GetClientFileDescriptor() const override;
- virtual base::ScopedFD TakeClientFileDescriptor() override;
+ int GetClientFileDescriptor() const override;
+ base::ScopedFD TakeClientFileDescriptor() override;
// These access protected API of IPC::Message, which has ChannelMojo
// as a friend class.
@@ -114,9 +114,8 @@
#endif // defined(OS_POSIX) && !defined(OS_NACL)
// MojoBootstrapDelegate implementation
- virtual void OnPipeAvailable(
- mojo::embedder::ScopedPlatformHandle handle) override;
- virtual void OnBootstrapError() override;
+ void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle) override;
+ void OnBootstrapError() override;
// Called from MessagePipeReader implementations
void OnMessageReceived(Message& message);