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

Unified Diff: ash/frame/custom_frame_view_ash_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 f9476920c5d1aaf08ef49eb2f8c695d817c99e88..16cab37bb5e7095b65f1356c7186c6385b69fd0b 100644
--- a/ash/frame/custom_frame_view_ash_unittest.cc
+++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -27,7 +27,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
virtual ~TestWidgetDelegate() {}
virtual views::NonClientFrameView* CreateNonClientFrameView(
- views::Widget* widget) OVERRIDE {
+ views::Widget* widget) override {
custom_frame_view_ = new CustomFrameViewAsh(widget);
return custom_frame_view_;
}
@@ -49,26 +49,26 @@ class TestWidgetConstraintsDelegate : public TestWidgetDelegate {
virtual ~TestWidgetConstraintsDelegate() {}
// views::View:
- virtual gfx::Size GetMinimumSize() const OVERRIDE {
+ virtual gfx::Size GetMinimumSize() const override {
return minimum_size_;
}
- virtual gfx::Size GetMaximumSize() const OVERRIDE {
+ virtual gfx::Size GetMaximumSize() const override {
return maximum_size_;
}
- virtual views::View* GetContentsView() OVERRIDE {
+ virtual 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 {
+ virtual bool CanMaximize() const override {
return true;
}
- virtual bool CanMinimize() const OVERRIDE {
+ virtual bool CanMinimize() const override {
return true;
}
« 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