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

Unified Diff: ui/views/border.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/views/background.cc ('k') | ui/views/bubble/bubble_border.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/border.cc
diff --git a/ui/views/border.cc b/ui/views/border.cc
index 0ff340642e0cc2c877557f0c748c3c353a374c8f..dac2daaf06eb96e536f2e235deffd270a13497d0 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;
+ virtual void Paint(const View& view, gfx::Canvas* canvas) override;
+ virtual gfx::Insets GetInsets() const override;
+ virtual gfx::Size GetMinimumSize() const override;
private:
const SkColor color_;
@@ -78,13 +78,13 @@ class EmptyBorder : public Border {
: insets_(top, left, bottom, right) {}
// Overridden from Border:
- virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {}
+ virtual void Paint(const View& view, gfx::Canvas* canvas) override {}
- virtual gfx::Insets GetInsets() const OVERRIDE {
+ virtual gfx::Insets GetInsets() const override {
return insets_;
}
- virtual gfx::Size GetMinimumSize() const OVERRIDE {
+ virtual gfx::Size GetMinimumSize() const override {
return gfx::Size();
}
@@ -105,15 +105,15 @@ class BorderPainter : public Border {
virtual ~BorderPainter() {}
// Overridden from Border:
- virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {
+ virtual void Paint(const View& view, gfx::Canvas* canvas) override {
Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds());
}
- virtual gfx::Insets GetInsets() const OVERRIDE {
+ virtual gfx::Insets GetInsets() const override {
return insets_;
}
- virtual gfx::Size GetMinimumSize() const OVERRIDE {
+ virtual gfx::Size GetMinimumSize() const override {
return painter_->GetMinimumSize();
}
« no previous file with comments | « ui/views/background.cc ('k') | ui/views/bubble/bubble_border.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698