summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authornick <nick@chromium.org>2015-04-23 09:42:48 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 16:43:29 +0000
commitd60f71748cc8d3fdfa30811b6896df6e4113d15a (patch)
treeb72eb97d77234e62dbc5e02693f82ae4925b60b7 /ipc
parentc014b406ea6bbb0c1778de8b5adf2ccae3d05cb2 (diff)
downloadchromium_src-d60f71748cc8d3fdfa30811b6896df6e4113d15a.zip
chromium_src-d60f71748cc8d3fdfa30811b6896df6e4113d15a.tar.gz
chromium_src-d60f71748cc8d3fdfa30811b6896df6e4113d15a.tar.bz2
Update {virtual,override} to follow C++11 style in ipc.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1084323007 Cr-Commit-Position: refs/heads/master@{#326544}
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_channel_nacl.cc2
-rw-r--r--ipc/ipc_channel_nacl.h24
-rw-r--r--ipc/mojo/ipc_channel_mojo_unittest.cc4
3 files changed, 15 insertions, 15 deletions
diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc
index 49ac139..60a5dda 100644
--- a/ipc/ipc_channel_nacl.cc
+++ b/ipc/ipc_channel_nacl.cc
@@ -80,7 +80,7 @@ class ChannelNacl::ReaderThreadRunner
// DelegateSimpleThread implementation. Reads data from the pipe in a loop
// until either we are told to quit or a read fails.
- virtual void Run() override;
+ void Run() override;
private:
int pipe_;
diff --git a/ipc/ipc_channel_nacl.h b/ipc/ipc_channel_nacl.h
index 9c1e80f..f0649b2 100644
--- a/ipc/ipc_channel_nacl.h
+++ b/ipc/ipc_channel_nacl.h
@@ -38,14 +38,14 @@ class ChannelNacl : public Channel,
ChannelNacl(const IPC::ChannelHandle& channel_handle,
Mode mode,
Listener* listener);
- virtual ~ChannelNacl();
+ ~ChannelNacl() override;
// Channel implementation.
- 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;
+ base::ProcessId GetPeerPID() const override;
+ base::ProcessId GetSelfPID() const override;
+ bool Connect() override;
+ void Close() override;
+ bool Send(Message* message) override;
// Posted to the main thread by ReaderThreadRunner.
void DidRecvMsg(scoped_ptr<MessageContents> contents);
@@ -59,12 +59,12 @@ class ChannelNacl : public Channel,
void CallOnChannelConnected();
// ChannelReader implementation.
- virtual ReadState ReadData(char* buffer,
- int buffer_len,
- int* bytes_read) override;
- virtual bool WillDispatchInputMessage(Message* msg) override;
- virtual bool DidEmptyInputBuffers() override;
- virtual void HandleInternalMessage(const Message& msg) override;
+ ReadState ReadData(char* buffer,
+ int buffer_len,
+ int* bytes_read) override;
+ bool WillDispatchInputMessage(Message* msg) override;
+ bool DidEmptyInputBuffers() override;
+ void HandleInternalMessage(const Message& msg) override;
Mode mode_;
bool waiting_connect_;
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc
index bf70b7f..4018715 100644
--- a/ipc/mojo/ipc_channel_mojo_unittest.cc
+++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -551,7 +551,7 @@ MULTIPROCESS_IPC_TEST_CLIENT_MAIN(ParamTraitInvalidMessagePipeClient) {
#if defined(OS_WIN)
class IPCChannelMojoDeadHandleTest : public IPCChannelMojoTestBase {
protected:
- virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
+ scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
const IPC::ChannelHandle& handle,
base::SequencedTaskRunner* runner) override {
host_.reset(new IPC::ChannelMojoHost(task_runner()));
@@ -559,7 +559,7 @@ class IPCChannelMojoDeadHandleTest : public IPCChannelMojoTestBase {
task_runner(), handle);
}
- virtual bool DidStartClient() override {
+ bool DidStartClient() override {
IPCTestBase::DidStartClient();
const base::ProcessHandle client = client_process().Handle();
// Forces GetFileHandleForProcess() fail. It happens occasionally