summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/base/animation/animation.h5
-rw-r--r--ui/base/animation/linear_animation.h8
-rw-r--r--ui/base/animation/multi_animation.h6
-rw-r--r--ui/base/animation/slide_animation.h4
-rw-r--r--ui/base/animation/throb_animation.h10
-rw-r--r--ui/base/test/ui_cocoa_test_helper.h3
-rw-r--r--ui/gfx/native_theme_base.h5
-rw-r--r--ui/gfx/platform_font_mac.h21
-rw-r--r--ui/gfx/platform_font_pango.h21
-rw-r--r--ui/gfx/platform_font_win.h21
10 files changed, 55 insertions, 49 deletions
diff --git a/ui/base/animation/animation.h b/ui/base/animation/animation.h
index 3b8288d..257e99b 100644
--- a/ui/base/animation/animation.h
+++ b/ui/base/animation/animation.h
@@ -6,6 +6,7 @@
#define UI_BASE_ANIMATION_ANIMATION_H_
#pragma once
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/time.h"
#include "ui/base/animation/animation_container_element.h"
@@ -81,9 +82,9 @@ class UI_EXPORT Animation : public AnimationContainerElement {
AnimationDelegate* delegate() { return delegate_; }
// AnimationContainer::Element overrides
- virtual void SetStartTime(base::TimeTicks start_time);
+ virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE;
virtual void Step(base::TimeTicks time_now) = 0;
- virtual base::TimeDelta GetTimerInterval() const;
+ virtual base::TimeDelta GetTimerInterval() const OVERRIDE;
private:
// Interval for the animation.
diff --git a/ui/base/animation/linear_animation.h b/ui/base/animation/linear_animation.h
index a327c0a..7baf476 100644
--- a/ui/base/animation/linear_animation.h
+++ b/ui/base/animation/linear_animation.h
@@ -31,7 +31,7 @@ class UI_EXPORT LinearAnimation : public Animation {
// Gets the value for the current state, according to the animation curve in
// use. This class provides only for a linear relationship, however subclasses
// can override this to provide others.
- virtual double GetCurrentValue() const;
+ virtual double GetCurrentValue() const OVERRIDE;
// Skip to the end of the current animation.
void End();
@@ -48,13 +48,13 @@ class UI_EXPORT LinearAnimation : public Animation {
// Invoked by the AnimationContainer when the animation is running to advance
// the animation. Use |time_now| rather than Time::Now to avoid multiple
// animations running at the same time diverging.
- virtual void Step(base::TimeTicks time_now);
+ virtual void Step(base::TimeTicks time_now) OVERRIDE;
// Overriden to advance to the end (if End was invoked).
- virtual void AnimationStopped();
+ virtual void AnimationStopped() OVERRIDE;
// Overriden to return true if state is not 1.
- virtual bool ShouldSendCanceledFromStop();
+ virtual bool ShouldSendCanceledFromStop() OVERRIDE;
private:
base::TimeDelta duration_;
diff --git a/ui/base/animation/multi_animation.h b/ui/base/animation/multi_animation.h
index ff4cd5d..240c6da6 100644
--- a/ui/base/animation/multi_animation.h
+++ b/ui/base/animation/multi_animation.h
@@ -55,15 +55,15 @@ class UI_EXPORT MultiAnimation : public Animation {
// Returns the current value. The current value for a MultiAnimation is
// determined from the tween type of the current part.
- virtual double GetCurrentValue() const;
+ virtual double GetCurrentValue() const OVERRIDE;
// Returns the index of the current part.
size_t current_part_index() const { return current_part_index_; }
protected:
// Animation overrides.
- virtual void Step(base::TimeTicks time_now);
- virtual void SetStartTime(base::TimeTicks start_time);
+ virtual void Step(base::TimeTicks time_now) OVERRIDE;
+ virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE;
private:
// Returns the part containing the specified time. |time_ms| is reset to be
diff --git a/ui/base/animation/slide_animation.h b/ui/base/animation/slide_animation.h
index 7542845..4d90e1d 100644
--- a/ui/base/animation/slide_animation.h
+++ b/ui/base/animation/slide_animation.h
@@ -67,13 +67,13 @@ class UI_EXPORT SlideAnimation : public LinearAnimation {
int GetSlideDuration() const { return slide_duration_; }
void SetTweenType(Tween::Type tween_type) { tween_type_ = tween_type; }
- virtual double GetCurrentValue() const;
+ virtual double GetCurrentValue() const OVERRIDE;
bool IsShowing() const { return showing_; }
bool IsClosing() const { return !showing_ && value_end_ < value_current_; }
private:
// Overridden from Animation.
- virtual void AnimateToState(double state);
+ virtual void AnimateToState(double state) OVERRIDE;
AnimationDelegate* target_;
diff --git a/ui/base/animation/throb_animation.h b/ui/base/animation/throb_animation.h
index ff6faa09..46aae2f 100644
--- a/ui/base/animation/throb_animation.h
+++ b/ui/base/animation/throb_animation.h
@@ -30,12 +30,12 @@ class UI_EXPORT ThrobAnimation : public SlideAnimation {
void SetThrobDuration(int duration) { throb_duration_ = duration; }
// Overridden to reset to the slide duration.
- virtual void Reset();
- virtual void Show();
- virtual void Hide();
+ virtual void Reset() OVERRIDE;
+ virtual void Show() OVERRIDE;
+ virtual void Hide() OVERRIDE;
// Overridden to maintain the slide duration.
- virtual void SetSlideDuration(int duration);
+ virtual void SetSlideDuration(int duration) OVERRIDE;
// The number of cycles remaining until the animation stops.
void set_cycles_remaining(int value) { cycles_remaining_ = value; }
@@ -43,7 +43,7 @@ class UI_EXPORT ThrobAnimation : public SlideAnimation {
protected:
// Overriden to continually throb (assuming we're throbbing).
- virtual void Step(base::TimeTicks time_now);
+ virtual void Step(base::TimeTicks time_now) OVERRIDE;
private:
// Resets state such that we behave like SlideAnimation.
diff --git a/ui/base/test/ui_cocoa_test_helper.h b/ui/base/test/ui_cocoa_test_helper.h
index 9b1c513..ba0d504 100644
--- a/ui/base/test/ui_cocoa_test_helper.h
+++ b/ui/base/test/ui_cocoa_test_helper.h
@@ -10,6 +10,7 @@
#import <Cocoa/Cocoa.h>
+#include "base/compiler_specific.h"
#import "base/mac/scoped_nsautorelease_pool.h"
#include "testing/platform_test.h"
@@ -59,7 +60,7 @@ class CocoaTest : public PlatformTest {
// to close them before CocoaTest::TearDown is called. A standard way of doing
// this would be to create them in SetUp (after calling CocoaTest::Setup) and
// then close them in TearDown before calling CocoaTest::TearDown.
- virtual void TearDown();
+ virtual void TearDown() OVERRIDE;
// Retuns a test window that can be used by views and other UI objects
// as part of their tests. Is created lazily, and will be closed correctly
diff --git a/ui/gfx/native_theme_base.h b/ui/gfx/native_theme_base.h
index 351486c..6488e68 100644
--- a/ui/gfx/native_theme_base.h
+++ b/ui/gfx/native_theme_base.h
@@ -6,6 +6,7 @@
#define UI_GFX_NATIVE_THEME_BASE_H_
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "skia/ext/platform_canvas.h"
#include "ui/gfx/native_theme.h"
@@ -19,12 +20,12 @@ class NativeThemeBase : public NativeTheme {
// NativeTheme implementation:
virtual gfx::Size GetPartSize(Part part,
State state,
- const ExtraParams& extra) const;
+ const ExtraParams& extra) const OVERRIDE;
virtual void Paint(SkCanvas* canvas,
Part part,
State state,
const gfx::Rect& rect,
- const ExtraParams& extra) const;
+ const ExtraParams& extra) const OVERRIDE;
protected:
NativeThemeBase();
diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h
index 64ae669..60076152 100644
--- a/ui/gfx/platform_font_mac.h
+++ b/ui/gfx/platform_font_mac.h
@@ -6,6 +6,7 @@
#define UI_GFX_PLATFORM_FONT_MAC_H_
#pragma once
+#include "base/compiler_specific.h"
#include "ui/gfx/platform_font.h"
namespace gfx {
@@ -19,16 +20,16 @@ class PlatformFontMac : public PlatformFont {
int font_size);
// Overridden from PlatformFont:
- virtual Font DeriveFont(int size_delta, int style) const;
- virtual int GetHeight() const;
- virtual int GetBaseline() const;
- virtual int GetAverageCharacterWidth() const;
- virtual int GetStringWidth(const string16& text) const;
- virtual int GetExpectedTextWidth(int length) const;
- virtual int GetStyle() const;
- virtual std::string GetFontName() const;
- virtual int GetFontSize() const;
- virtual NativeFont GetNativeFont() const;
+ virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
+ virtual int GetHeight() const OVERRIDE;
+ virtual int GetBaseline() const OVERRIDE;
+ virtual int GetAverageCharacterWidth() const OVERRIDE;
+ virtual int GetStringWidth(const string16& text) const OVERRIDE;
+ virtual int GetExpectedTextWidth(int length) const OVERRIDE;
+ virtual int GetStyle() const OVERRIDE;
+ virtual std::string GetFontName() const OVERRIDE;
+ virtual int GetFontSize() const OVERRIDE;
+ virtual NativeFont GetNativeFont() const OVERRIDE;
private:
PlatformFontMac(const std::string& font_name, int font_size, int style);
diff --git a/ui/gfx/platform_font_pango.h b/ui/gfx/platform_font_pango.h
index 2e4ccdd..7f81939 100644
--- a/ui/gfx/platform_font_pango.h
+++ b/ui/gfx/platform_font_pango.h
@@ -6,6 +6,7 @@
#define UI_GFX_PLATFORM_FONT_PANGO_H_
#pragma once
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#include "ui/gfx/platform_font.h"
@@ -39,16 +40,16 @@ class UI_EXPORT PlatformFontPango : public PlatformFont {
double underline_thickness() const;
// Overridden from PlatformFont:
- virtual Font DeriveFont(int size_delta, int style) const;
- virtual int GetHeight() const;
- virtual int GetBaseline() const;
- virtual int GetAverageCharacterWidth() const;
- virtual int GetStringWidth(const string16& text) const;
- virtual int GetExpectedTextWidth(int length) const;
- virtual int GetStyle() const;
- virtual std::string GetFontName() const;
- virtual int GetFontSize() const;
- virtual NativeFont GetNativeFont() const;
+ virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
+ virtual int GetHeight() const OVERRIDE;
+ virtual int GetBaseline() const OVERRIDE;
+ virtual int GetAverageCharacterWidth() const OVERRIDE;
+ virtual int GetStringWidth(const string16& text) const OVERRIDE;
+ virtual int GetExpectedTextWidth(int length) const OVERRIDE;
+ virtual int GetStyle() const OVERRIDE;
+ virtual std::string GetFontName() const OVERRIDE;
+ virtual int GetFontSize() const OVERRIDE;
+ virtual NativeFont GetNativeFont() const OVERRIDE;
private:
// Create a new instance of this object with the specified properties. Called
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h
index c56ff93..6914b8a 100644
--- a/ui/gfx/platform_font_win.h
+++ b/ui/gfx/platform_font_win.h
@@ -6,6 +6,7 @@
#define UI_GFX_PLATFORM_FONT_WIN_H_
#pragma once
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "ui/base/ui_export.h"
#include "ui/gfx/platform_font.h"
@@ -41,16 +42,16 @@ class UI_EXPORT PlatformFontWin : public PlatformFont {
static AdjustFontCallback adjust_font_callback;
// Overridden from PlatformFont:
- virtual Font DeriveFont(int size_delta, int style) const;
- virtual int GetHeight() const;
- virtual int GetBaseline() const;
- virtual int GetAverageCharacterWidth() const;
- virtual int GetStringWidth(const string16& text) const;
- virtual int GetExpectedTextWidth(int length) const;
- virtual int GetStyle() const;
- virtual std::string GetFontName() const;
- virtual int GetFontSize() const;
- virtual NativeFont GetNativeFont() const;
+ virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
+ virtual int GetHeight() const OVERRIDE;
+ virtual int GetBaseline() const OVERRIDE;
+ virtual int GetAverageCharacterWidth() const OVERRIDE;
+ virtual int GetStringWidth(const string16& text) const OVERRIDE;
+ virtual int GetExpectedTextWidth(int length) const OVERRIDE;
+ virtual int GetStyle() const OVERRIDE;
+ virtual std::string GetFontName() const OVERRIDE;
+ virtual int GetFontSize() const OVERRIDE;
+ virtual NativeFont GetNativeFont() const OVERRIDE;
private:
virtual ~PlatformFontWin() {}
generated by cgit v1.1 at 2025-02-10 22:07:29 +0000