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

Side by Side Diff: Source/core/accessibility/AXMediaControls.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/AXListBoxOption.h ('k') | Source/core/accessibility/AXMenuList.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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 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 23 matching lines...) Expand all
34 #include "core/html/shadow/MediaControlElements.h" 34 #include "core/html/shadow/MediaControlElements.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class AccessibilityMediaControl : public AXRenderObject { 38 class AccessibilityMediaControl : public AXRenderObject {
39 39
40 public: 40 public:
41 static PassRefPtr<AXObject> create(RenderObject*); 41 static PassRefPtr<AXObject> create(RenderObject*);
42 virtual ~AccessibilityMediaControl() { } 42 virtual ~AccessibilityMediaControl() { }
43 43
44 virtual AccessibilityRole roleValue() const OVERRIDE; 44 virtual AccessibilityRole roleValue() const override;
45 45
46 virtual String title() const OVERRIDE FINAL; 46 virtual String title() const override final;
47 virtual String accessibilityDescription() const OVERRIDE; 47 virtual String accessibilityDescription() const override;
48 virtual String helpText() const OVERRIDE; 48 virtual String helpText() const override;
49 49
50 protected: 50 protected:
51 explicit AccessibilityMediaControl(RenderObject*); 51 explicit AccessibilityMediaControl(RenderObject*);
52 MediaControlElementType controlType() const; 52 MediaControlElementType controlType() const;
53 virtual bool computeAccessibilityIsIgnored() const OVERRIDE; 53 virtual bool computeAccessibilityIsIgnored() const override;
54 }; 54 };
55 55
56 56
57 class AccessibilityMediaTimeline FINAL : public AXSlider { 57 class AccessibilityMediaTimeline final : public AXSlider {
58 58
59 public: 59 public:
60 static PassRefPtr<AXObject> create(RenderObject*); 60 static PassRefPtr<AXObject> create(RenderObject*);
61 virtual ~AccessibilityMediaTimeline() { } 61 virtual ~AccessibilityMediaTimeline() { }
62 62
63 virtual String helpText() const OVERRIDE; 63 virtual String helpText() const override;
64 virtual String valueDescription() const OVERRIDE; 64 virtual String valueDescription() const override;
65 const AtomicString& getAttribute(const QualifiedName& attribute) const; 65 const AtomicString& getAttribute(const QualifiedName& attribute) const;
66 66
67 private: 67 private:
68 explicit AccessibilityMediaTimeline(RenderObject*); 68 explicit AccessibilityMediaTimeline(RenderObject*);
69 }; 69 };
70 70
71 71
72 class AXMediaControlsContainer FINAL : public AccessibilityMediaControl { 72 class AXMediaControlsContainer final : public AccessibilityMediaControl {
73 73
74 public: 74 public:
75 static PassRefPtr<AXObject> create(RenderObject*); 75 static PassRefPtr<AXObject> create(RenderObject*);
76 virtual ~AXMediaControlsContainer() { } 76 virtual ~AXMediaControlsContainer() { }
77 77
78 virtual AccessibilityRole roleValue() const OVERRIDE { return ToolbarRole; } 78 virtual AccessibilityRole roleValue() const override { return ToolbarRole; }
79 79
80 virtual String helpText() const OVERRIDE; 80 virtual String helpText() const override;
81 virtual String accessibilityDescription() const OVERRIDE; 81 virtual String accessibilityDescription() const override;
82 82
83 private: 83 private:
84 explicit AXMediaControlsContainer(RenderObject*); 84 explicit AXMediaControlsContainer(RenderObject*);
85 bool controllingVideoElement() const; 85 bool controllingVideoElement() const;
86 virtual bool computeAccessibilityIsIgnored() const OVERRIDE; 86 virtual bool computeAccessibilityIsIgnored() const override;
87 }; 87 };
88 88
89 89
90 class AccessibilityMediaTimeDisplay FINAL : public AccessibilityMediaControl { 90 class AccessibilityMediaTimeDisplay final : public AccessibilityMediaControl {
91 91
92 public: 92 public:
93 static PassRefPtr<AXObject> create(RenderObject*); 93 static PassRefPtr<AXObject> create(RenderObject*);
94 virtual ~AccessibilityMediaTimeDisplay() { } 94 virtual ~AccessibilityMediaTimeDisplay() { }
95 95
96 virtual AccessibilityRole roleValue() const OVERRIDE { return StaticTextRole ; } 96 virtual AccessibilityRole roleValue() const override { return StaticTextRole ; }
97 97
98 virtual String stringValue() const OVERRIDE; 98 virtual String stringValue() const override;
99 virtual String accessibilityDescription() const OVERRIDE; 99 virtual String accessibilityDescription() const override;
100 100
101 private: 101 private:
102 explicit AccessibilityMediaTimeDisplay(RenderObject*); 102 explicit AccessibilityMediaTimeDisplay(RenderObject*);
103 virtual bool computeAccessibilityIsIgnored() const OVERRIDE; 103 virtual bool computeAccessibilityIsIgnored() const override;
104 }; 104 };
105 105
106 106
107 } // namespace blink 107 } // namespace blink
108 108
109 #endif // AXMediaControls_h 109 #endif // AXMediaControls_h
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXListBoxOption.h ('k') | Source/core/accessibility/AXMenuList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698