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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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: 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 8a986d7bc9a98fbb032f4eb63e04ce7315235e1a..869a3c7e632a37f02131325d02d6d5abca359972 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
@@ -44,7 +44,7 @@ class ActivationWaiter : public X11PropertyChangeWaiter {
private:
// X11PropertyChangeWaiter:
- virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) OVERRIDE {
+ virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
XID xid = 0;
ui::GetXIDProperty(ui::GetX11RootWindow(), "_NET_ACTIVE_WINDOW", &xid);
return xid != window_;
@@ -64,7 +64,7 @@ class MouseMoveCounterHandler : public ui::EventHandler {
}
// ui::EventHandler:
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+ virtual void OnMouseEvent(ui::MouseEvent* event) override {
if (event->type() == ui::ET_MOUSE_MOVED)
++count_;
}
@@ -135,7 +135,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase {
}
// testing::Test
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ViewsTestBase::SetUp();
// Make X11 synchronous for our display connection. This does not force the
@@ -143,7 +143,7 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase {
XSynchronize(gfx::GetXDisplay(), True);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
XSynchronize(gfx::GetXDisplay(), False);
ViewsTestBase::TearDown();
}

Powered by Google App Engine
This is Rietveld 408576698