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

Side by Side Diff: Source/core/html/shadow/MediaControlElementTypes.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 MediaControls& m_mediaControls; 97 MediaControls& m_mediaControls;
98 MediaControlElementType m_displayType; 98 MediaControlElementType m_displayType;
99 RawPtrWillBeMember<HTMLElement> m_element; 99 RawPtrWillBeMember<HTMLElement> m_element;
100 }; 100 };
101 101
102 // ---------------------------- 102 // ----------------------------
103 103
104 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement { 104 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement {
105 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement); 105 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement);
106 public: 106 public:
107 virtual void trace(Visitor*) OVERRIDE; 107 virtual void trace(Visitor*) override;
108 108
109 protected: 109 protected:
110 virtual bool isMediaControlElement() const OVERRIDE FINAL { return true; } 110 virtual bool isMediaControlElement() const override final { return true; }
111 MediaControlDivElement(MediaControls&, MediaControlElementType); 111 MediaControlDivElement(MediaControls&, MediaControlElementType);
112 }; 112 };
113 113
114 // ---------------------------- 114 // ----------------------------
115 115
116 class MediaControlInputElement : public HTMLInputElement, public MediaControlEle ment { 116 class MediaControlInputElement : public HTMLInputElement, public MediaControlEle ment {
117 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlInputElement); 117 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlInputElement);
118 public: 118 public:
119 virtual void trace(Visitor*) OVERRIDE; 119 virtual void trace(Visitor*) override;
120 120
121 protected: 121 protected:
122 virtual bool isMediaControlElement() const OVERRIDE FINAL { return true; } 122 virtual bool isMediaControlElement() const override final { return true; }
123 MediaControlInputElement(MediaControls&, MediaControlElementType); 123 MediaControlInputElement(MediaControls&, MediaControlElementType);
124 124
125 private: 125 private:
126 virtual void updateDisplayType() { } 126 virtual void updateDisplayType() { }
127 virtual bool isMouseFocusable() const OVERRIDE; 127 virtual bool isMouseFocusable() const override;
128 }; 128 };
129 129
130 // ---------------------------- 130 // ----------------------------
131 131
132 class MediaControlTimeDisplayElement : public MediaControlDivElement { 132 class MediaControlTimeDisplayElement : public MediaControlDivElement {
133 public: 133 public:
134 void setCurrentValue(double); 134 void setCurrentValue(double);
135 double currentValue() const { return m_currentValue; } 135 double currentValue() const { return m_currentValue; }
136 136
137 protected: 137 protected:
138 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); 138 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType);
139 139
140 private: 140 private:
141 double m_currentValue; 141 double m_currentValue;
142 }; 142 };
143 143
144 } // namespace blink 144 } // namespace blink
145 145
146 #endif // MediaControlElementTypes_h 146 #endif // MediaControlElementTypes_h
OLDNEW
« no previous file with comments | « Source/core/html/shadow/DetailsMarkerControl.h ('k') | Source/core/html/shadow/MediaControlElements.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698