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

Unified Diff: chrome/browser/media/native_desktop_media_list_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
Index: chrome/browser/media/native_desktop_media_list_unittest.cc
diff --git a/chrome/browser/media/native_desktop_media_list_unittest.cc b/chrome/browser/media/native_desktop_media_list_unittest.cc
index 085c4543bb476d05c3477afc1dd4b0c625be4557..460a8519491b2054f9adb67969eeb6af2557b352 100644
--- a/chrome/browser/media/native_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/native_desktop_media_list_unittest.cc
@@ -35,11 +35,11 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer {
virtual ~FakeScreenCapturer() {}
// webrtc::ScreenCapturer implementation.
- virtual void Start(Callback* callback) OVERRIDE {
+ virtual void Start(Callback* callback) override {
callback_ = callback;
}
- virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE {
+ virtual void Capture(const webrtc::DesktopRegion& region) override {
DCHECK(callback_);
webrtc::DesktopFrame* frame =
new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10));
@@ -48,18 +48,18 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer {
}
virtual void SetMouseShapeObserver(
- MouseShapeObserver* mouse_shape_observer) OVERRIDE {
+ MouseShapeObserver* mouse_shape_observer) override {
NOTIMPLEMENTED();
}
- virtual bool GetScreenList(ScreenList* screens) OVERRIDE {
+ virtual bool GetScreenList(ScreenList* screens) override {
webrtc::ScreenCapturer::Screen screen;
screen.id = 0;
screens->push_back(screen);
return true;
}
- virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE {
+ virtual bool SelectScreen(webrtc::ScreenId id) override {
EXPECT_EQ(0, id);
return true;
}
@@ -90,11 +90,11 @@ class FakeWindowCapturer : public webrtc::WindowCapturer {
}
// webrtc::WindowCapturer implementation.
- virtual void Start(Callback* callback) OVERRIDE {
+ virtual void Start(Callback* callback) override {
callback_ = callback;
}
- virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE {
+ virtual void Capture(const webrtc::DesktopRegion& region) override {
DCHECK(callback_);
base::AutoLock lock(frame_values_lock_);
@@ -108,18 +108,18 @@ class FakeWindowCapturer : public webrtc::WindowCapturer {
callback_->OnCaptureCompleted(frame);
}
- virtual bool GetWindowList(WindowList* windows) OVERRIDE {
+ virtual bool GetWindowList(WindowList* windows) override {
base::AutoLock lock(window_list_lock_);
*windows = window_list_;
return true;
}
- virtual bool SelectWindow(WindowId id) OVERRIDE {
+ virtual bool SelectWindow(WindowId id) override {
selected_window_id_ = id;
return true;
}
- virtual bool BringSelectedWindowToFront() OVERRIDE {
+ virtual bool BringSelectedWindowToFront() override {
return true;
}
« no previous file with comments | « chrome/browser/media/native_desktop_media_list.cc ('k') | chrome/browser/media/protected_media_identifier_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698