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

Unified Diff: media/video/capture/video_capture_device_unittest.cc

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (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 | « media/video/capture/mac/video_capture_device_mac.h ('k') | media/video/capture/win/filter_base_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/video_capture_device_unittest.cc
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index 0abd90e25075b1278ddfd0112f6cea764ca3f023..5b13464c15ae9852a9c608f84bdea753d7c62de4 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -72,7 +72,7 @@ class MockClient : public media::VideoCaptureDevice::Client {
explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb)
: main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {}
- virtual void OnError(const std::string& error_message) OVERRIDE {
+ virtual void OnError(const std::string& error_message) override {
OnErr();
}
@@ -80,7 +80,7 @@ class MockClient : public media::VideoCaptureDevice::Client {
int length,
const VideoCaptureFormat& format,
int rotation,
- base::TimeTicks timestamp) OVERRIDE {
+ base::TimeTicks timestamp) override {
main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, format));
}
@@ -88,7 +88,7 @@ class MockClient : public media::VideoCaptureDevice::Client {
const scoped_refptr<Buffer>& buffer,
const media::VideoCaptureFormat& buffer_format,
const scoped_refptr<media::VideoFrame>& frame,
- base::TimeTicks timestamp) OVERRIDE {
+ base::TimeTicks timestamp) override {
NOTREACHED();
}
« no previous file with comments | « media/video/capture/mac/video_capture_device_mac.h ('k') | media/video/capture/win/filter_base_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698