summaryrefslogtreecommitdiffstats
path: root/remoting/host/linux
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/host/linux')
-rw-r--r--remoting/host/linux/audio_pipe_reader.h4
-rw-r--r--remoting/host/linux/audio_pipe_reader_unittest.cc4
-rw-r--r--remoting/host/linux/x_server_clipboard_unittest.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/linux/audio_pipe_reader.h b/remoting/host/linux/audio_pipe_reader.h
index 45c0d86..949736c 100644
--- a/remoting/host/linux/audio_pipe_reader.h
+++ b/remoting/host/linux/audio_pipe_reader.h
@@ -52,8 +52,8 @@ class AudioPipeReader
void RemoveObserver(StreamObserver* observer);
// MessageLoopForIO::Watcher interface.
- virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
- virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
+ virtual void OnFileCanReadWithoutBlocking(int fd) override;
+ virtual void OnFileCanWriteWithoutBlocking(int fd) override;
private:
friend class base::DeleteHelper<AudioPipeReader>;
diff --git a/remoting/host/linux/audio_pipe_reader_unittest.cc b/remoting/host/linux/audio_pipe_reader_unittest.cc
index fb87949..69913bf 100644
--- a/remoting/host/linux/audio_pipe_reader_unittest.cc
+++ b/remoting/host/linux/audio_pipe_reader_unittest.cc
@@ -25,7 +25,7 @@ class AudioPipeReaderTest : public testing::Test,
: stop_at_position_(-1) {
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
pipe_path_ = test_dir_.path().AppendASCII("test_pipe");
audio_thread_.reset(new base::Thread("TestAudioThread"));
@@ -37,7 +37,7 @@ class AudioPipeReaderTest : public testing::Test,
}
// AudioPipeReader::StreamObserver interface.
- virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) OVERRIDE {
+ virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) override {
read_data_ += data->data();
if (stop_at_position_ > 0 &&
static_cast<int>(read_data_.size()) >= stop_at_position_) {
diff --git a/remoting/host/linux/x_server_clipboard_unittest.cc b/remoting/host/linux/x_server_clipboard_unittest.cc
index beb7f61..57ca4157 100644
--- a/remoting/host/linux/x_server_clipboard_unittest.cc
+++ b/remoting/host/linux/x_server_clipboard_unittest.cc
@@ -67,7 +67,7 @@ class ClipboardTestClient {
class XServerClipboardTest : public testing::Test {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
// XSynchronize() ensures that PumpXEvents() fully processes all X server
// requests and responses before returning to the caller.
Display* display1 = XOpenDisplay(NULL);
@@ -78,7 +78,7 @@ class XServerClipboardTest : public testing::Test {
client2_.Init(display2);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
XCloseDisplay(client1_.display());
XCloseDisplay(client2_.display());
}