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

Unified Diff: ui/gfx/image/image.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/gfx/image/canvas_image_source.h ('k') | ui/gfx/image/image_family_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image.cc
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index 70ab5ed7ae6eadaed0fc832e3c13c1f587ec526c..bd8cb2026932125729f42becdcc702c0d673bc70 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -68,7 +68,7 @@ class PNGImageSource : public ImageSkiaSource {
PNGImageSource() {}
virtual ~PNGImageSource() {}
- virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ virtual ImageSkiaRep GetImageForScale(float scale) override {
if (image_skia_reps_.empty())
return ImageSkiaRep();
@@ -224,15 +224,15 @@ class ImageRepPNG : public ImageRep {
virtual ~ImageRepPNG() {
}
- virtual int Width() const OVERRIDE {
+ virtual int Width() const override {
return Size().width();
}
- virtual int Height() const OVERRIDE {
+ virtual int Height() const override {
return Size().height();
}
- virtual gfx::Size Size() const OVERRIDE {
+ virtual gfx::Size Size() const override {
// Read the PNG data to get the image size, caching it.
if (!size_cache_) {
for (std::vector<ImagePNGRep>::const_iterator it = image_reps().begin();
@@ -270,15 +270,15 @@ class ImageRepSkia : public ImageRep {
virtual ~ImageRepSkia() {
}
- virtual int Width() const OVERRIDE {
+ virtual int Width() const override {
return image_->width();
}
- virtual int Height() const OVERRIDE {
+ virtual int Height() const override {
return image_->height();
}
- virtual gfx::Size Size() const OVERRIDE {
+ virtual gfx::Size Size() const override {
return image_->size();
}
@@ -304,15 +304,15 @@ class ImageRepCocoaTouch : public ImageRep {
image_ = nil;
}
- virtual int Width() const OVERRIDE {
+ virtual int Width() const override {
return Size().width();
}
- virtual int Height() const OVERRIDE {
+ virtual int Height() const override {
return Size().height();
}
- virtual gfx::Size Size() const OVERRIDE {
+ virtual gfx::Size Size() const override {
return internal::UIImageSize(image_);
}
@@ -337,15 +337,15 @@ class ImageRepCocoa : public ImageRep {
image_ = nil;
}
- virtual int Width() const OVERRIDE {
+ virtual int Width() const override {
return Size().width();
}
- virtual int Height() const OVERRIDE {
+ virtual int Height() const override {
return Size().height();
}
- virtual gfx::Size Size() const OVERRIDE {
+ virtual gfx::Size Size() const override {
return internal::NSImageSize(image_);
}
« no previous file with comments | « ui/gfx/image/canvas_image_source.h ('k') | ui/gfx/image/image_family_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698