summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/base/animation/animation_container_unittest.cc2
-rw-r--r--ui/base/animation/animation_unittest.cc8
-rw-r--r--ui/base/dragdrop/drag_utils.cc2
-rw-r--r--ui/base/resource/resource_bundle.cc3
-rw-r--r--ui/gfx/color_analysis_unittest.cc2
-rw-r--r--ui/gfx/image/image_skia_operations.cc2
6 files changed, 10 insertions, 9 deletions
diff --git a/ui/base/animation/animation_container_unittest.cc b/ui/base/animation/animation_container_unittest.cc
index 55b53e5..45beeed 100644
--- a/ui/base/animation/animation_container_unittest.cc
+++ b/ui/base/animation/animation_container_unittest.cc
@@ -33,7 +33,7 @@ class TestAnimation : public LinearAnimation {
: LinearAnimation(20, 20, delegate) {
}
- virtual void AnimateToState(double state) {
+ virtual void AnimateToState(double state) OVERRIDE {
}
private:
diff --git a/ui/base/animation/animation_unittest.cc b/ui/base/animation/animation_unittest.cc
index 3961aae..a2321c4 100644
--- a/ui/base/animation/animation_unittest.cc
+++ b/ui/base/animation/animation_unittest.cc
@@ -29,7 +29,7 @@ class RunAnimation : public LinearAnimation {
: LinearAnimation(frame_rate, delegate) {
}
- virtual void AnimateToState(double state) {
+ virtual void AnimateToState(double state) OVERRIDE {
EXPECT_LE(0.0, state);
EXPECT_GE(1.0, state);
}
@@ -44,7 +44,7 @@ class CancelAnimation : public LinearAnimation {
: LinearAnimation(duration, frame_rate, delegate) {
}
- virtual void AnimateToState(double state) {
+ virtual void AnimateToState(double state) OVERRIDE {
if (state >= 0.5)
Stop();
}
@@ -59,7 +59,7 @@ class EndAnimation : public LinearAnimation {
: LinearAnimation(duration, frame_rate, delegate) {
}
- virtual void AnimateToState(double state) {
+ virtual void AnimateToState(double state) OVERRIDE {
if (state >= 0.5)
End();
}
@@ -71,7 +71,7 @@ class EndAnimation : public LinearAnimation {
// AnimationDelegate implementation that deletes the animation in ended.
class DeletingAnimationDelegate : public AnimationDelegate {
public:
- virtual void AnimationEnded(const Animation* animation) {
+ virtual void AnimationEnded(const Animation* animation) OVERRIDE {
delete animation;
MessageLoop::current()->Quit();
}
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc
index 34f4f93..97e855c 100644
--- a/ui/base/dragdrop/drag_utils.cc
+++ b/ui/base/dragdrop/drag_utils.cc
@@ -39,7 +39,7 @@ class FileDragImageSource : public gfx::CanvasImageSource {
}
// Overridden from gfx::CanvasImageSource.
- void Draw(gfx::Canvas* canvas) OVERRIDE {
+ virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
// Set up our text portion
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 5a2db84..0071a5a 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -79,7 +79,8 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
virtual ~ResourceBundleImageSource() {}
// gfx::ImageSkiaSource overrides:
- virtual gfx::ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) {
+ virtual gfx::ImageSkiaRep GetImageForScale(
+ ui::ScaleFactor scale_factor) OVERRIDE {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
scoped_ptr<SkBitmap> result(rb.LoadBitmap(resource_id_, scale_factor));
diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
index a723520..9bdf091 100644
--- a/ui/gfx/color_analysis_unittest.cc
+++ b/ui/gfx/color_analysis_unittest.cc
@@ -108,7 +108,7 @@ class MockKMeanImageSampler : public color_utils::KMeanImageSampler {
current_result_index_ = 0;
}
- virtual int GetSample(int width, int height) {
+ virtual int GetSample(int width, int height) OVERRIDE {
if (current_result_index_ >= prebaked_sample_results_.size()) {
current_result_index_ = 0;
}
diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc
index d753f93..9657de9 100644
--- a/ui/gfx/image/image_skia_operations.cc
+++ b/ui/gfx/image/image_skia_operations.cc
@@ -281,7 +281,7 @@ class ExtractSubsetImageSource: public gfx::ImageSkiaSource {
subset_bounds_(subset_bounds) {
}
- ~ExtractSubsetImageSource() {
+ virtual ~ExtractSubsetImageSource() {
}
// gfx::ImageSkiaSource overrides: