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

Unified Diff: ash/frame/default_header_painter.h

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_unittest.cc ('k') | ash/gpu_support_stub.h » ('j') | 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 c0ca2fdafd73920fbf16af3f571cd489e0c88f54..579197de064e4a8d869e9185a229aa286ac024b3 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/frame/default_header_painter.h
@@ -8,7 +8,7 @@
#include "ash/ash_export.h"
#include "ash/frame/header_painter.h"
#include "base/basictypes.h"
-#include "base/compiler_specific.h" // OVERRIDE
+#include "base/compiler_specific.h" // override
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -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;
+ 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;
// Sets the left header view for the header. Passing NULL removes the view.
void UpdateLeftHeaderView(views::View* left_header_view);
@@ -55,7 +55,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
// gfx::AnimationDelegate override:
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+ virtual 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') | ash/gpu_support_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698