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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc

Issue 678073003: Standardize usage of virtual/override/final specifiers. (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
Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc
index 869a3c7e632a37f02131325d02d6d5abca359972..32a85809c7386720089e48cffb2dd54c694c41c2 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc
@@ -39,12 +39,11 @@ class ActivationWaiter : public X11PropertyChangeWaiter {
window_(window) {
}
- virtual ~ActivationWaiter() {
- }
+ ~ActivationWaiter() override {}
private:
// X11PropertyChangeWaiter:
- virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
+ bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
XID xid = 0;
ui::GetXIDProperty(ui::GetX11RootWindow(), "_NET_ACTIVE_WINDOW", &xid);
return xid != window_;
@@ -60,11 +59,10 @@ class MouseMoveCounterHandler : public ui::EventHandler {
public:
MouseMoveCounterHandler() : count_(0) {
}
- virtual ~MouseMoveCounterHandler() {
- }
+ ~MouseMoveCounterHandler() override {}
// ui::EventHandler:
- virtual void OnMouseEvent(ui::MouseEvent* event) override {
+ void OnMouseEvent(ui::MouseEvent* event) override {
if (event->type() == ui::ET_MOUSE_MOVED)
++count_;
}
@@ -123,8 +121,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase {
public:
DesktopWindowTreeHostX11Test() {
}
- virtual ~DesktopWindowTreeHostX11Test() {
- }
+ ~DesktopWindowTreeHostX11Test() override {}
static void SetUpTestCase() {
gfx::GLSurface::InitializeOneOffForTests();
@@ -135,7 +132,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase {
}
// testing::Test
- virtual void SetUp() override {
+ void SetUp() override {
ViewsTestBase::SetUp();
// Make X11 synchronous for our display connection. This does not force the
@@ -143,7 +140,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase {
XSynchronize(gfx::GetXDisplay(), True);
}
- virtual void TearDown() override {
+ void TearDown() override {
XSynchronize(gfx::GetXDisplay(), False);
ViewsTestBase::TearDown();
}

Powered by Google App Engine
This is Rietveld 408576698