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

Unified Diff: ui/views/widget/desktop_aura/desktop_screen_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_screen_x11_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
index 4b18ee712ffcf29b78ac30e674eb3352bff31af1..c453be844fb56e13d6af2c28599ce486c3d4d99b 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
@@ -27,14 +27,14 @@ class TestDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
explicit TestDesktopNativeWidgetAura(
views::internal::NativeWidgetDelegate* delegate)
: views::DesktopNativeWidgetAura(delegate) {}
- virtual ~TestDesktopNativeWidgetAura() {}
+ ~TestDesktopNativeWidgetAura() override {}
void set_window_component(int window_component) {
window_component_ = window_component;
}
// DesktopNativeWidgetAura:
- virtual int GetNonClientComponent(const gfx::Point& point) const override {
+ int GetNonClientComponent(const gfx::Point& point) const override {
return window_component_;
}
@@ -55,10 +55,10 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
public gfx::DisplayObserver {
public:
DesktopScreenX11Test() {}
- virtual ~DesktopScreenX11Test() {}
+ ~DesktopScreenX11Test() override {}
// Overridden from testing::Test:
- virtual void SetUp() override {
+ void SetUp() override {
ViewsTestBase::SetUp();
// Initialize the world to the single monitor case.
std::vector<gfx::Display> displays;
@@ -67,7 +67,7 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
screen_->AddObserver(this);
}
- virtual void TearDown() override {
+ void TearDown() override {
screen_.reset();
ViewsTestBase::TearDown();
}
@@ -111,16 +111,16 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
private:
// Overridden from gfx::DisplayObserver:
- virtual void OnDisplayAdded(const gfx::Display& new_display) override {
+ void OnDisplayAdded(const gfx::Display& new_display) override {
added_display_.push_back(new_display);
}
- virtual void OnDisplayRemoved(const gfx::Display& old_display) override {
+ void OnDisplayRemoved(const gfx::Display& old_display) override {
removed_display_.push_back(old_display);
}
- virtual void OnDisplayMetricsChanged(const gfx::Display& display,
- uint32_t metrics) override {
+ void OnDisplayMetricsChanged(const gfx::Display& display,
+ uint32_t metrics) override {
changed_display_.push_back(display);
}
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_screen_x11.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698