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

Side by Side Diff: Source/core/accessibility/AXScrollView.h

Issue 603423002: Replace OVERRIDE and FINAL with their C++11 counterparts in core/accessibility (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Narrowing area to core/accessibility 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/accessibility/AXSVGRoot.h ('k') | Source/core/accessibility/AXScrollbar.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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 16 matching lines...) Expand all
27 #define AXScrollView_h 27 #define AXScrollView_h
28 28
29 #include "core/accessibility/AXObject.h" 29 #include "core/accessibility/AXObject.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class AXScrollbar; 33 class AXScrollbar;
34 class Scrollbar; 34 class Scrollbar;
35 class ScrollView; 35 class ScrollView;
36 36
37 class AXScrollView FINAL : public AXObject { 37 class AXScrollView final : public AXObject {
38 public: 38 public:
39 static PassRefPtr<AXScrollView> create(ScrollView*); 39 static PassRefPtr<AXScrollView> create(ScrollView*);
40 virtual AccessibilityRole roleValue() const OVERRIDE { return ScrollAreaRole ; } 40 virtual AccessibilityRole roleValue() const override { return ScrollAreaRole ; }
41 ScrollView* scrollView() const { return m_scrollView; } 41 ScrollView* scrollView() const { return m_scrollView; }
42 42
43 virtual ~AXScrollView(); 43 virtual ~AXScrollView();
44 virtual void detach() OVERRIDE; 44 virtual void detach() override;
45 45
46 protected: 46 protected:
47 virtual ScrollableArea* getScrollableAreaIfScrollable() const OVERRIDE; 47 virtual ScrollableArea* getScrollableAreaIfScrollable() const override;
48 virtual void scrollTo(const IntPoint&) const OVERRIDE; 48 virtual void scrollTo(const IntPoint&) const override;
49 49
50 private: 50 private:
51 explicit AXScrollView(ScrollView*); 51 explicit AXScrollView(ScrollView*);
52 52
53 virtual bool computeAccessibilityIsIgnored() const OVERRIDE; 53 virtual bool computeAccessibilityIsIgnored() const override;
54 virtual bool isAXScrollView() const OVERRIDE { return true; } 54 virtual bool isAXScrollView() const override { return true; }
55 virtual bool isEnabled() const OVERRIDE { return true; } 55 virtual bool isEnabled() const override { return true; }
56 56
57 virtual bool isAttachment() const OVERRIDE; 57 virtual bool isAttachment() const override;
58 virtual Widget* widgetForAttachmentView() const OVERRIDE; 58 virtual Widget* widgetForAttachmentView() const override;
59 59
60 virtual AXObject* scrollBar(AccessibilityOrientation) OVERRIDE; 60 virtual AXObject* scrollBar(AccessibilityOrientation) override;
61 virtual void addChildren() OVERRIDE; 61 virtual void addChildren() override;
62 virtual void clearChildren() OVERRIDE; 62 virtual void clearChildren() override;
63 virtual AXObject* accessibilityHitTest(const IntPoint&) const OVERRIDE; 63 virtual AXObject* accessibilityHitTest(const IntPoint&) const override;
64 virtual void updateChildrenIfNecessary() OVERRIDE; 64 virtual void updateChildrenIfNecessary() override;
65 virtual void setNeedsToUpdateChildren() OVERRIDE { m_childrenDirty = true; } 65 virtual void setNeedsToUpdateChildren() override { m_childrenDirty = true; }
66 void updateScrollbars(); 66 void updateScrollbars();
67 67
68 virtual FrameView* documentFrameView() const OVERRIDE; 68 virtual FrameView* documentFrameView() const override;
69 virtual LayoutRect elementRect() const OVERRIDE; 69 virtual LayoutRect elementRect() const override;
70 virtual AXObject* parentObject() const OVERRIDE; 70 virtual AXObject* parentObject() const override;
71 virtual AXObject* parentObjectIfExists() const OVERRIDE; 71 virtual AXObject* parentObjectIfExists() const override;
72 72
73 AXObject* webAreaObject() const; 73 AXObject* webAreaObject() const;
74 virtual AXObject* firstChild() const OVERRIDE { return webAreaObject(); } 74 virtual AXObject* firstChild() const override { return webAreaObject(); }
75 AXScrollbar* addChildScrollbar(Scrollbar*); 75 AXScrollbar* addChildScrollbar(Scrollbar*);
76 void removeChildScrollbar(AXObject*); 76 void removeChildScrollbar(AXObject*);
77 77
78 ScrollView* m_scrollView; 78 ScrollView* m_scrollView;
79 RefPtr<AXObject> m_horizontalScrollbar; 79 RefPtr<AXObject> m_horizontalScrollbar;
80 RefPtr<AXObject> m_verticalScrollbar; 80 RefPtr<AXObject> m_verticalScrollbar;
81 bool m_childrenDirty; 81 bool m_childrenDirty;
82 }; 82 };
83 83
84 DEFINE_AX_OBJECT_TYPE_CASTS(AXScrollView, isAXScrollView()); 84 DEFINE_AX_OBJECT_TYPE_CASTS(AXScrollView, isAXScrollView());
85 85
86 } // namespace blink 86 } // namespace blink
87 87
88 #endif // AXScrollView_h 88 #endif // AXScrollView_h
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXSVGRoot.h ('k') | Source/core/accessibility/AXScrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698