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

Unified Diff: ash/frame/default_header_painter.h

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_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/default_header_painter.h
diff --git a/ash/frame/default_header_painter.h b/ash/frame/default_header_painter.h
index 63ee6465c59411af182530d75a6a4c855f16abdc..4c875c04978cc4d65fa992f27a85c4eb318918fd 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/frame/default_header_painter.h
@@ -32,7 +32,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
public gfx::AnimationDelegate {
public:
DefaultHeaderPainter();
- virtual ~DefaultHeaderPainter();
+ ~DefaultHeaderPainter() override;
// DefaultHeaderPainter does not take ownership of any of the parameters.
void Init(views::Widget* frame,
@@ -40,13 +40,13 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
FrameCaptionButtonContainerView* caption_button_container);
// HeaderPainter overrides:
- virtual int GetMinimumHeaderWidth() const override;
- virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) override;
- virtual void LayoutHeader() override;
- virtual int GetHeaderHeightForPainting() const override;
- virtual void SetHeaderHeightForPainting(int height) override;
- virtual void SchedulePaintForTitle() override;
- virtual void UpdateLeftViewXInset(int left_view_x_inset) override;
+ int GetMinimumHeaderWidth() const override;
+ void PaintHeader(gfx::Canvas* canvas, Mode mode) override;
+ void LayoutHeader() override;
+ int GetHeaderHeightForPainting() const override;
+ void SetHeaderHeightForPainting(int height) override;
+ void SchedulePaintForTitle() override;
+ void UpdateLeftViewXInset(int left_view_x_inset) override;
// Sets the left header view for the header. Passing NULL removes the view.
void UpdateLeftHeaderView(views::View* left_header_view);
@@ -59,7 +59,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
// gfx::AnimationDelegate override:
- virtual void AnimationProgressed(const gfx::Animation* animation) override;
+ void AnimationProgressed(const gfx::Animation* animation) override;
// Paints highlight around the edge of the header for inactive restored
// windows.
« no previous file with comments | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698