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

Side by Side Diff: Source/core/html/HTMLFrameElementBase.h

Issue 635793002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « Source/core/html/HTMLFrameElement.h ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann <hausmann@kde.org> 4 * (C) 2000 Simon Hausmann <hausmann@kde.org>
5 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 13 matching lines...) Expand all
24 #ifndef HTMLFrameElementBase_h 24 #ifndef HTMLFrameElementBase_h
25 #define HTMLFrameElementBase_h 25 #define HTMLFrameElementBase_h
26 26
27 #include "core/html/HTMLFrameOwnerElement.h" 27 #include "core/html/HTMLFrameOwnerElement.h"
28 #include "platform/scroll/ScrollTypes.h" 28 #include "platform/scroll/ScrollTypes.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 class HTMLFrameElementBase : public HTMLFrameOwnerElement { 32 class HTMLFrameElementBase : public HTMLFrameOwnerElement {
33 public: 33 public:
34 virtual ScrollbarMode scrollingMode() const OVERRIDE FINAL { return m_scroll ing; } 34 virtual ScrollbarMode scrollingMode() const override final { return m_scroll ing; }
35 35
36 int marginWidth() const { return m_marginWidth; } 36 int marginWidth() const { return m_marginWidth; }
37 int marginHeight() const { return m_marginHeight; } 37 int marginHeight() const { return m_marginHeight; }
38 38
39 virtual bool canContainRangeEndPoint() const OVERRIDE FINAL { return false; } 39 virtual bool canContainRangeEndPoint() const override final { return false; }
40 40
41 protected: 41 protected:
42 HTMLFrameElementBase(const QualifiedName&, Document&); 42 HTMLFrameElementBase(const QualifiedName&, Document&);
43 43
44 bool isURLAllowed() const; 44 bool isURLAllowed() const;
45 45
46 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 46 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
47 virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE; 47 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
48 virtual void didNotifySubtreeInsertionsToDocument() OVERRIDE FINAL; 48 virtual void didNotifySubtreeInsertionsToDocument() override final;
49 virtual void attach(const AttachContext& = AttachContext()) OVERRIDE; 49 virtual void attach(const AttachContext& = AttachContext()) override;
50 50
51 // FIXME: Remove this method once we have input routing in the browser 51 // FIXME: Remove this method once we have input routing in the browser
52 // process. See http://crbug.com/339659. 52 // process. See http://crbug.com/339659.
53 virtual void defaultEventHandler(Event*) OVERRIDE; 53 virtual void defaultEventHandler(Event*) override;
54 54
55 private: 55 private:
56 virtual bool supportsFocus() const OVERRIDE FINAL; 56 virtual bool supportsFocus() const override final;
57 virtual void setFocus(bool) OVERRIDE FINAL; 57 virtual void setFocus(bool) override final;
58 58
59 virtual bool isURLAttribute(const Attribute&) const OVERRIDE FINAL; 59 virtual bool isURLAttribute(const Attribute&) const override final;
60 virtual bool hasLegalLinkAttribute(const QualifiedName&) const OVERRIDE FINA L; 60 virtual bool hasLegalLinkAttribute(const QualifiedName&) const override fina l;
61 virtual bool isHTMLContentAttribute(const Attribute&) const OVERRIDE FINAL; 61 virtual bool isHTMLContentAttribute(const Attribute&) const override final;
62 62
63 virtual bool areAuthorShadowsAllowed() const OVERRIDE FINAL { return false; } 63 virtual bool areAuthorShadowsAllowed() const override final { return false; }
64 64
65 void setLocation(const String&); 65 void setLocation(const String&);
66 void setNameAndOpenURL(); 66 void setNameAndOpenURL();
67 void openURL(bool lockBackForwardList = true); 67 void openURL(bool lockBackForwardList = true);
68 68
69 AtomicString m_URL; 69 AtomicString m_URL;
70 AtomicString m_frameName; 70 AtomicString m_frameName;
71 71
72 ScrollbarMode m_scrolling; 72 ScrollbarMode m_scrolling;
73 73
74 int m_marginWidth; 74 int m_marginWidth;
75 int m_marginHeight; 75 int m_marginHeight;
76 }; 76 };
77 77
78 inline bool isHTMLFrameElementBase(const HTMLElement& element) 78 inline bool isHTMLFrameElementBase(const HTMLElement& element)
79 { 79 {
80 return isHTMLFrameElement(element) || isHTMLIFrameElement(element); 80 return isHTMLFrameElement(element) || isHTMLIFrameElement(element);
81 } 81 }
82 82
83 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLFrameElementBase); 83 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLFrameElementBase);
84 84
85 } // namespace blink 85 } // namespace blink
86 86
87 #endif // HTMLFrameElementBase_h 87 #endif // HTMLFrameElementBase_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameElement.h ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698