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

Unified Diff: Source/core/rendering/RenderFrameSet.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/RenderFrame.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFrameSet.h
diff --git a/Source/core/rendering/RenderFrameSet.h b/Source/core/rendering/RenderFrameSet.h
index 9e6b9733580aab9110a5f24e6005fc1a4ce75cb4..cfcdc569564d1029929e224c798b37465908a3b5 100644
--- a/Source/core/rendering/RenderFrameSet.h
+++ b/Source/core/rendering/RenderFrameSet.h
@@ -53,11 +53,11 @@ private:
Vector<bool> m_allowBorder;
};
-class RenderFrameSet FINAL : public RenderBox {
+class RenderFrameSet final : public RenderBox {
public:
RenderFrameSet(HTMLFrameSetElement*);
virtual ~RenderFrameSet();
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
@@ -95,17 +95,17 @@ private:
int m_splitResizeOffset;
};
- virtual RenderObjectChildList* virtualChildren() OVERRIDE { return children(); }
- virtual const RenderObjectChildList* virtualChildren() const OVERRIDE { return children(); }
+ virtual RenderObjectChildList* virtualChildren() override { return children(); }
+ virtual const RenderObjectChildList* virtualChildren() const override { return children(); }
- virtual const char* renderName() const OVERRIDE { return "RenderFrameSet"; }
- virtual bool isFrameSet() const OVERRIDE { return true; }
+ virtual const char* renderName() const override { return "RenderFrameSet"; }
+ virtual bool isFrameSet() const override { return true; }
- virtual void layout() OVERRIDE;
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
- virtual void computePreferredLogicalWidths() OVERRIDE;
- virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
- virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE;
+ virtual void layout() override;
+ virtual void paint(PaintInfo&, const LayoutPoint&) override;
+ virtual void computePreferredLogicalWidths() override;
+ virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
+ virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
inline HTMLFrameSetElement* frameSet() const;
« no previous file with comments | « Source/core/rendering/RenderFrame.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698