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. |