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

Unified Diff: ash/frame/custom_frame_view_ash_unittest.cc

Issue 683593003: 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
« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/frame/default_header_painter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/custom_frame_view_ash_unittest.cc
diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc
index 16cab37bb5e7095b65f1356c7186c6385b69fd0b..4725f4468b22fbaa7f28f74b0e3e7ea4964e1601 100644
--- a/ash/frame/custom_frame_view_ash_unittest.cc
+++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -24,9 +24,9 @@ namespace ash {
class TestWidgetDelegate : public views::WidgetDelegateView {
public:
TestWidgetDelegate() {}
- virtual ~TestWidgetDelegate() {}
+ ~TestWidgetDelegate() override {}
- virtual views::NonClientFrameView* CreateNonClientFrameView(
+ views::NonClientFrameView* CreateNonClientFrameView(
views::Widget* widget) override {
custom_frame_view_ = new CustomFrameViewAsh(widget);
return custom_frame_view_;
@@ -46,31 +46,23 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
class TestWidgetConstraintsDelegate : public TestWidgetDelegate {
public:
TestWidgetConstraintsDelegate() {}
- virtual ~TestWidgetConstraintsDelegate() {}
+ ~TestWidgetConstraintsDelegate() override {}
// views::View:
- virtual gfx::Size GetMinimumSize() const override {
- return minimum_size_;
- }
+ gfx::Size GetMinimumSize() const override { return minimum_size_; }
- virtual gfx::Size GetMaximumSize() const override {
- return maximum_size_;
- }
+ gfx::Size GetMaximumSize() const override { return maximum_size_; }
- virtual views::View* GetContentsView() override {
+ views::View* GetContentsView() override {
// Set this instance as the contents view so that the maximum and minimum
// size constraints will be used.
return this;
}
// views::WidgetDelegate:
- virtual bool CanMaximize() const override {
- return true;
- }
+ bool CanMaximize() const override { return true; }
- virtual bool CanMinimize() const override {
- return true;
- }
+ bool CanMinimize() const override { return true; }
void set_minimum_size(const gfx::Size& min_size) {
minimum_size_ = min_size;
@@ -105,7 +97,7 @@ class TestWidgetConstraintsDelegate : public TestWidgetDelegate {
class CustomFrameViewAshTest : public test::AshTestBase {
public:
CustomFrameViewAshTest() {}
- virtual ~CustomFrameViewAshTest() {}
+ ~CustomFrameViewAshTest() override {}
protected:
scoped_ptr<views::Widget> CreateWidget(TestWidgetDelegate* delegate) {
« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/frame/default_header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698