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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.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_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc
index 76a41433965163132644ccae7c22bb6a6bdf57a1..3deab41c82eb8af26e6b9825d90194286084c59b 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc
@@ -49,12 +49,11 @@ class WMStateWaiter : public X11PropertyChangeWaiter {
atom_cache_.reset(new ui::X11AtomCache(gfx::GetXDisplay(), kAtomsToCache));
}
- virtual ~WMStateWaiter() {
- }
+ ~WMStateWaiter() override {}
private:
// X11PropertyChangeWaiter:
- virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
+ bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
std::vector<Atom> hints;
if (ui::GetAtomArrayProperty(xwindow(), "_NET_WM_STATE", &hints)) {
std::vector<Atom>::iterator it = std::find(
@@ -84,22 +83,16 @@ class ShapedNonClientFrameView : public NonClientFrameView {
explicit ShapedNonClientFrameView() {
}
- virtual ~ShapedNonClientFrameView() {
- }
+ ~ShapedNonClientFrameView() override {}
// NonClientFrameView:
- virtual gfx::Rect GetBoundsForClientView() const override {
- return bounds();
- }
- virtual gfx::Rect GetWindowBoundsForClientBounds(
+ gfx::Rect GetBoundsForClientView() const override { return bounds(); }
+ gfx::Rect GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const override {
return client_bounds;
}
- virtual int NonClientHitTest(const gfx::Point& point) override {
- return HTNOWHERE;
- }
- virtual void GetWindowMask(const gfx::Size& size,
- gfx::Path* window_mask) override {
+ int NonClientHitTest(const gfx::Point& point) override { return HTNOWHERE; }
+ void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override {
int right = size.width();
int bottom = size.height();
@@ -111,14 +104,10 @@ class ShapedNonClientFrameView : public NonClientFrameView {
window_mask->lineTo(right - 10, 0);
window_mask->close();
}
- virtual void ResetWindowControls() override {
- }
- virtual void UpdateWindowIcon() override {
- }
- virtual void UpdateWindowTitle() override {
- }
- virtual void SizeConstraintsChanged() override {
- }
+ void ResetWindowControls() override {}
+ void UpdateWindowIcon() override {}
+ void UpdateWindowTitle() override {}
+ void SizeConstraintsChanged() override {}
private:
DISALLOW_COPY_AND_ASSIGN(ShapedNonClientFrameView);
@@ -129,12 +118,10 @@ class ShapedWidgetDelegate : public WidgetDelegateView {
ShapedWidgetDelegate() {
}
- virtual ~ShapedWidgetDelegate() {
- }
+ ~ShapedWidgetDelegate() override {}
// WidgetDelegateView:
- virtual NonClientFrameView* CreateNonClientFrameView(
- Widget* widget) override {
+ NonClientFrameView* CreateNonClientFrameView(Widget* widget) override {
return new ShapedNonClientFrameView;
}
@@ -202,10 +189,9 @@ class DesktopWindowTreeHostX11Test : public ViewsTestBase {
public:
DesktopWindowTreeHostX11Test() {
}
- virtual ~DesktopWindowTreeHostX11Test() {
- }
+ ~DesktopWindowTreeHostX11Test() override {}
- virtual void SetUp() override {
+ void SetUp() override {
ViewsTestBase::SetUp();
// Make X11 synchronous for our display connection. This does not force the
@@ -213,7 +199,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