| Index: ui/gfx/image/image.cc
|
| diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
|
| index bd8cb2026932125729f42becdcc702c0d673bc70..3046f36de28ca135c6d57fcb71617add6202e210 100644
|
| --- a/ui/gfx/image/image.cc
|
| +++ b/ui/gfx/image/image.cc
|
| @@ -66,9 +66,9 @@ ImageSkia* GetErrorImageSkia() {
|
| class PNGImageSource : public ImageSkiaSource {
|
| public:
|
| PNGImageSource() {}
|
| - virtual ~PNGImageSource() {}
|
| + ~PNGImageSource() override {}
|
|
|
| - virtual ImageSkiaRep GetImageForScale(float scale) override {
|
| + ImageSkiaRep GetImageForScale(float scale) override {
|
| if (image_skia_reps_.empty())
|
| return ImageSkiaRep();
|
|
|
| @@ -221,18 +221,13 @@ class ImageRepPNG : public ImageRep {
|
| image_png_reps_(image_png_reps) {
|
| }
|
|
|
| - virtual ~ImageRepPNG() {
|
| - }
|
| + ~ImageRepPNG() override {}
|
|
|
| - virtual int Width() const override {
|
| - return Size().width();
|
| - }
|
| + int Width() const override { return Size().width(); }
|
|
|
| - virtual int Height() const override {
|
| - return Size().height();
|
| - }
|
| + int Height() const override { return Size().height(); }
|
|
|
| - virtual gfx::Size Size() const override {
|
| + 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();
|
| @@ -267,20 +262,13 @@ class ImageRepSkia : public ImageRep {
|
| image_(image) {
|
| }
|
|
|
| - virtual ~ImageRepSkia() {
|
| - }
|
| + ~ImageRepSkia() override {}
|
|
|
| - virtual int Width() const override {
|
| - return image_->width();
|
| - }
|
| + int Width() const override { return image_->width(); }
|
|
|
| - virtual int Height() const override {
|
| - return image_->height();
|
| - }
|
| + int Height() const override { return image_->height(); }
|
|
|
| - virtual gfx::Size Size() const override {
|
| - return image_->size();
|
| - }
|
| + gfx::Size Size() const override { return image_->size(); }
|
|
|
| ImageSkia* image() { return image_.get(); }
|
|
|
| @@ -332,22 +320,16 @@ class ImageRepCocoa : public ImageRep {
|
| CHECK(image);
|
| }
|
|
|
| - virtual ~ImageRepCocoa() {
|
| + ~ImageRepCocoa() override {
|
| base::mac::NSObjectRelease(image_);
|
| image_ = nil;
|
| }
|
|
|
| - virtual int Width() const override {
|
| - return Size().width();
|
| - }
|
| + int Width() const override { return Size().width(); }
|
|
|
| - virtual int Height() const override {
|
| - return Size().height();
|
| - }
|
| + int Height() const override { return Size().height(); }
|
|
|
| - virtual gfx::Size Size() const override {
|
| - return internal::NSImageSize(image_);
|
| - }
|
| + gfx::Size Size() const override { return internal::NSImageSize(image_); }
|
|
|
| NSImage* image() const { return image_; }
|
|
|
|
|