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

Unified Diff: Source/core/rendering/RenderButton.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch 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 | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderCombineText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderButton.h
diff --git a/Source/core/rendering/RenderButton.h b/Source/core/rendering/RenderButton.h
index bfe7e28bdb72a03c84d7b9adfa9dcc240c070e8f..72754973ed0401c57eaf3db1d959db27f15d6a06 100644
--- a/Source/core/rendering/RenderButton.h
+++ b/Source/core/rendering/RenderButton.h
@@ -29,35 +29,35 @@ namespace blink {
// RenderButtons are just like normal flexboxes except that they will generate an anonymous block child.
// For inputs, they will also generate an anonymous RenderText and keep its style and content up
// to date as the button changes.
-class RenderButton FINAL : public RenderFlexibleBox {
+class RenderButton final : public RenderFlexibleBox {
public:
explicit RenderButton(Element*);
virtual ~RenderButton();
- virtual const char* renderName() const OVERRIDE { return "RenderButton"; }
- virtual bool isRenderButton() const OVERRIDE { return true; }
+ virtual const char* renderName() const override { return "RenderButton"; }
+ virtual bool isRenderButton() const override { return true; }
- virtual bool canBeSelectionLeaf() const OVERRIDE { return node() && node()->hasEditableStyle(); }
- virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return true; }
+ virtual bool canBeSelectionLeaf() const override { return node() && node()->hasEditableStyle(); }
+ virtual bool canCollapseAnonymousBlockChild() const override { return true; }
- virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) OVERRIDE;
- virtual void removeChild(RenderObject*) OVERRIDE;
- virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE { }
- virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
+ virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) override;
+ virtual void removeChild(RenderObject*) override;
+ virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
+ virtual bool createsAnonymousWrapper() const override { return true; }
// <button> should allow whitespace even though RenderFlexibleBox doesn't.
- virtual bool canHaveWhitespaceChildren() const OVERRIDE { return true; }
+ virtual bool canHaveWhitespaceChildren() const override { return true; }
- virtual bool canHaveGeneratedChildren() const OVERRIDE;
- virtual bool hasControlClip() const OVERRIDE { return true; }
- virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE;
+ virtual bool canHaveGeneratedChildren() const override;
+ virtual bool hasControlClip() const override { return true; }
+ virtual LayoutRect controlClipRect(const LayoutPoint&) const override;
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode) const OVERRIDE;
+ virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode) const override;
private:
- virtual void updateAnonymousChildStyle(const RenderObject* child, RenderStyle* childStyle) const OVERRIDE;
+ virtual void updateAnonymousChildStyle(const RenderObject* child, RenderStyle* childStyle) const override;
- virtual bool hasLineIfEmpty() const OVERRIDE { return isHTMLInputElement(node()); }
+ virtual bool hasLineIfEmpty() const override { return isHTMLInputElement(node()); }
RenderBlock* m_inner;
};
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderCombineText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698