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

Unified Diff: ui/views/window/custom_frame_view_unittest.cc

Issue 661033006: 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 | « ui/views/window/custom_frame_view.h ('k') | ui/views/window/dialog_client_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/custom_frame_view_unittest.cc
diff --git a/ui/views/window/custom_frame_view_unittest.cc b/ui/views/window/custom_frame_view_unittest.cc
index 68c79e87ab7ddb44ca93132a7829611bf5109705..fe20bf982c1b9b456dd4e5690e2f00bd0a0032a0 100644
--- a/ui/views/window/custom_frame_view_unittest.cc
+++ b/ui/views/window/custom_frame_view_unittest.cc
@@ -24,7 +24,7 @@ class MinimizeAndMaximizeStateControlDelegate : public WidgetDelegateView {
MinimizeAndMaximizeStateControlDelegate()
: can_maximize_(true),
can_minimize_(true) {}
- virtual ~MinimizeAndMaximizeStateControlDelegate() {}
+ ~MinimizeAndMaximizeStateControlDelegate() override {}
void set_can_maximize(bool can_maximize) {
can_maximize_ = can_maximize;
@@ -35,8 +35,8 @@ class MinimizeAndMaximizeStateControlDelegate : public WidgetDelegateView {
}
// WidgetDelegate:
- virtual bool CanMaximize() const override { return can_maximize_; }
- virtual bool CanMinimize() const override { return can_minimize_; }
+ bool CanMaximize() const override { return can_maximize_; }
+ bool CanMinimize() const override { return can_minimize_; }
private:
bool can_maximize_;
@@ -50,7 +50,7 @@ class MinimizeAndMaximizeStateControlDelegate : public WidgetDelegateView {
class CustomFrameViewTest : public ViewsTestBase {
public:
CustomFrameViewTest() {}
- virtual ~CustomFrameViewTest() {}
+ ~CustomFrameViewTest() override {}
CustomFrameView* custom_frame_view() {
return custom_frame_view_;
@@ -66,8 +66,8 @@ class CustomFrameViewTest : public ViewsTestBase {
}
// ViewsTestBase:
- virtual void SetUp() override;
- virtual void TearDown() override;
+ void SetUp() override;
+ void TearDown() override;
protected:
const std::vector<views::FrameButton>& leading_buttons() {
« no previous file with comments | « ui/views/window/custom_frame_view.h ('k') | ui/views/window/dialog_client_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698