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

Side by Side Diff: Source/core/html/shadow/MediaControlElementTypes.h

Issue 1219013005: Fix virtual/override/final usage in Source/core/html/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 101
102 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement { 102 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement {
103 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement); 103 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaControlDivElement);
104 public: 104 public:
105 DECLARE_VIRTUAL_TRACE(); 105 DECLARE_VIRTUAL_TRACE();
106 106
107 protected: 107 protected:
108 MediaControlDivElement(MediaControls&, MediaControlElementType); 108 MediaControlDivElement(MediaControls&, MediaControlElementType);
109 109
110 private: 110 private:
111 virtual bool isMediaControlElement() const override final { return true; } 111 bool isMediaControlElement() const final { return true; }
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 DECLARE_VIRTUAL_TRACE(); 119 DECLARE_VIRTUAL_TRACE();
120 120
121 protected: 121 protected:
122 MediaControlInputElement(MediaControls&, MediaControlElementType); 122 MediaControlInputElement(MediaControls&, MediaControlElementType);
123 123
124 private: 124 private:
125 virtual void updateDisplayType() { } 125 virtual void updateDisplayType() { }
126 virtual bool isMediaControlElement() const override final { return true; } 126 bool isMediaControlElement() const final { return true; }
127 virtual bool isMouseFocusable() const override; 127 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