| Index: ui/views/painter.cc
|
| diff --git a/ui/views/painter.cc b/ui/views/painter.cc
|
| index 37a5a309c9f6fefcc4f32e6e67644e59e1d5ffa0..2dcb0c4a5d62791c5f68654af699bee782c338c7 100644
|
| --- a/ui/views/painter.cc
|
| +++ b/ui/views/painter.cc
|
| @@ -27,11 +27,11 @@ namespace {
|
| class DashedFocusPainter : public Painter {
|
| public:
|
| explicit DashedFocusPainter(const gfx::Insets& insets);
|
| - virtual ~DashedFocusPainter();
|
| + ~DashedFocusPainter() override;
|
|
|
| // Painter:
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
|
|
| private:
|
| const gfx::Insets insets_;
|
| @@ -61,11 +61,11 @@ void DashedFocusPainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
|
| class SolidFocusPainter : public Painter {
|
| public:
|
| SolidFocusPainter(SkColor color, const gfx::Insets& insets);
|
| - virtual ~SolidFocusPainter();
|
| + ~SolidFocusPainter() override;
|
|
|
| // Painter:
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
|
|
| private:
|
| const SkColor color_;
|
| @@ -101,11 +101,11 @@ class GradientPainter : public Painter {
|
| SkColor* colors,
|
| SkScalar* pos,
|
| size_t count);
|
| - virtual ~GradientPainter();
|
| + ~GradientPainter() override;
|
|
|
| // Painter:
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
|
|
| private:
|
| // If |horizontal_| is true then the gradient is painted horizontally.
|
| @@ -172,11 +172,11 @@ class ImagePainter : public Painter {
|
| // Constructs an ImagePainter with the specified image and insets.
|
| ImagePainter(const gfx::ImageSkia& image, const gfx::Insets& insets);
|
|
|
| - virtual ~ImagePainter();
|
| + ~ImagePainter() override;
|
|
|
| // Painter:
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + void Paint(gfx::Canvas* canvas, const gfx::Size& size) override;
|
|
|
| private:
|
| scoped_ptr<gfx::NineImagePainter> nine_painter_;
|
|
|