Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: ipc/mojo/ipc_channel_mojo.h

Issue 669953003: Revert of Standardize usage of virtual/override/final in ipc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_test_sink.h ('k') | ipc/mojo/ipc_channel_mojo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/mojo/ipc_channel_mojo.h
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h
index e5a4e335541c7f46d194290f2b88bb51b4aecc5c..b307fd49c6beee9b88705ec62237cb61fbc4c03d 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);
- ~ChannelMojo() override;
+ virtual ~ChannelMojo();
// ChannelMojoHost tells the client handle using this API.
void OnClientLaunched(base::ProcessHandle handle);
// Channel implementation
- bool Connect() override;
- void Close() override;
- bool Send(Message* message) override;
- base::ProcessId GetPeerPID() const override;
- 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)
- int GetClientFileDescriptor() const override;
- base::ScopedFD TakeClientFileDescriptor() override;
+ virtual int GetClientFileDescriptor() const override;
+ virtual base::ScopedFD TakeClientFileDescriptor() override;
// These access protected API of IPC::Message, which has ChannelMojo
// as a friend class.
@@ -114,8 +114,9 @@
#endif // defined(OS_POSIX) && !defined(OS_NACL)
// MojoBootstrapDelegate implementation
- void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle) override;
- void OnBootstrapError() override;
+ virtual void OnPipeAvailable(
+ mojo::embedder::ScopedPlatformHandle handle) override;
+ virtual void OnBootstrapError() override;
// Called from MessagePipeReader implementations
void OnMessageReceived(Message& message);
« no previous file with comments | « ipc/ipc_test_sink.h ('k') | ipc/mojo/ipc_channel_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698