| Index: ui/views/border.cc
|
| diff --git a/ui/views/border.cc b/ui/views/border.cc
|
| index dac2daaf06eb96e536f2e235deffd270a13497d0..b36936e914d8b401b9cbcf22bdde2e1ba70a88ca 100644
|
| --- a/ui/views/border.cc
|
| +++ b/ui/views/border.cc
|
| @@ -20,9 +20,9 @@ class SidedSolidBorder : public Border {
|
| SidedSolidBorder(int top, int left, int bottom, int right, SkColor color);
|
|
|
| // Overridden from Border:
|
| - virtual void Paint(const View& view, gfx::Canvas* canvas) override;
|
| - virtual gfx::Insets GetInsets() const override;
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| + void Paint(const View& view, gfx::Canvas* canvas) override;
|
| + gfx::Insets GetInsets() const override;
|
| + gfx::Size GetMinimumSize() const override;
|
|
|
| private:
|
| const SkColor color_;
|
| @@ -78,15 +78,11 @@ class EmptyBorder : public Border {
|
| : insets_(top, left, bottom, right) {}
|
|
|
| // Overridden from Border:
|
| - virtual void Paint(const View& view, gfx::Canvas* canvas) override {}
|
| + void Paint(const View& view, gfx::Canvas* canvas) override {}
|
|
|
| - virtual gfx::Insets GetInsets() const override {
|
| - return insets_;
|
| - }
|
| + gfx::Insets GetInsets() const override { return insets_; }
|
|
|
| - virtual gfx::Size GetMinimumSize() const override {
|
| - return gfx::Size();
|
| - }
|
| + gfx::Size GetMinimumSize() const override { return gfx::Size(); }
|
|
|
| private:
|
| const gfx::Insets insets_;
|
| @@ -102,18 +98,16 @@ class BorderPainter : public Border {
|
| DCHECK(painter);
|
| }
|
|
|
| - virtual ~BorderPainter() {}
|
| + ~BorderPainter() override {}
|
|
|
| // Overridden from Border:
|
| - virtual void Paint(const View& view, gfx::Canvas* canvas) override {
|
| + void Paint(const View& view, gfx::Canvas* canvas) override {
|
| Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds());
|
| }
|
|
|
| - virtual gfx::Insets GetInsets() const override {
|
| - return insets_;
|
| - }
|
| + gfx::Insets GetInsets() const override { return insets_; }
|
|
|
| - virtual gfx::Size GetMinimumSize() const override {
|
| + gfx::Size GetMinimumSize() const override {
|
| return painter_->GetMinimumSize();
|
| }
|
|
|
|
|