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

Side by Side Diff: third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.h

Issue 2814703002: Media Controls: move time display elements to media_controls module. (Closed)
Patch Set: review comments Created 3 years, 8 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) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 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 * 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 20 matching lines...) Expand all
31 #include "core/html/media/MediaControls.h" 31 #include "core/html/media/MediaControls.h"
32 #include "core/html/shadow/MediaControlElements.h" 32 #include "core/html/shadow/MediaControlElements.h"
33 #include "modules/ModulesExport.h" 33 #include "modules/ModulesExport.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class Event; 37 class Event;
38 class MediaControlsMediaEventListener; 38 class MediaControlsMediaEventListener;
39 class MediaControlsOrientationLockDelegate; 39 class MediaControlsOrientationLockDelegate;
40 class MediaControlsWindowEventListener; 40 class MediaControlsWindowEventListener;
41 class MediaControlCurrentTimeDisplayElement;
41 class MediaControlMuteButtonElement; 42 class MediaControlMuteButtonElement;
42 class MediaControlOverlayEnclosureElement; 43 class MediaControlOverlayEnclosureElement;
43 class MediaControlPanelEnclosureElement; 44 class MediaControlPanelEnclosureElement;
45 class MediaControlRemainingTimeDisplayElement;
44 class ShadowRoot; 46 class ShadowRoot;
45 47
46 // Default implementation of the core/ MediaControls interface used by 48 // Default implementation of the core/ MediaControls interface used by
47 // HTMLMediaElement. 49 // HTMLMediaElement.
48 class MODULES_EXPORT MediaControlsImpl final : public HTMLDivElement, 50 class MODULES_EXPORT MediaControlsImpl final : public HTMLDivElement,
49 public MediaControls { 51 public MediaControls {
50 USING_GARBAGE_COLLECTED_MIXIN(MediaControlsImpl); 52 USING_GARBAGE_COLLECTED_MIXIN(MediaControlsImpl);
51 WTF_MAKE_NONCOPYABLE(MediaControlsImpl); 53 WTF_MAKE_NONCOPYABLE(MediaControlsImpl);
52 54
53 public: 55 public:
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 204
203 // Media control elements. 205 // Media control elements.
204 Member<MediaControlOverlayEnclosureElement> overlay_enclosure_; 206 Member<MediaControlOverlayEnclosureElement> overlay_enclosure_;
205 Member<MediaControlOverlayPlayButtonElement> overlay_play_button_; 207 Member<MediaControlOverlayPlayButtonElement> overlay_play_button_;
206 Member<MediaControlCastButtonElement> overlay_cast_button_; 208 Member<MediaControlCastButtonElement> overlay_cast_button_;
207 Member<MediaControlPanelEnclosureElement> enclosure_; 209 Member<MediaControlPanelEnclosureElement> enclosure_;
208 Member<MediaControlPanelElement> panel_; 210 Member<MediaControlPanelElement> panel_;
209 Member<MediaControlPlayButtonElement> play_button_; 211 Member<MediaControlPlayButtonElement> play_button_;
210 Member<MediaControlTimelineElement> timeline_; 212 Member<MediaControlTimelineElement> timeline_;
211 Member<MediaControlCurrentTimeDisplayElement> current_time_display_; 213 Member<MediaControlCurrentTimeDisplayElement> current_time_display_;
212 Member<MediaControlTimeRemainingDisplayElement> duration_display_; 214 Member<MediaControlRemainingTimeDisplayElement> duration_display_;
213 Member<MediaControlMuteButtonElement> mute_button_; 215 Member<MediaControlMuteButtonElement> mute_button_;
214 Member<MediaControlVolumeSliderElement> volume_slider_; 216 Member<MediaControlVolumeSliderElement> volume_slider_;
215 Member<MediaControlToggleClosedCaptionsButtonElement> 217 Member<MediaControlToggleClosedCaptionsButtonElement>
216 toggle_closed_captions_button_; 218 toggle_closed_captions_button_;
217 Member<MediaControlTextTrackListElement> text_track_list_; 219 Member<MediaControlTextTrackListElement> text_track_list_;
218 Member<MediaControlOverflowMenuButtonElement> overflow_menu_; 220 Member<MediaControlOverflowMenuButtonElement> overflow_menu_;
219 Member<MediaControlOverflowMenuListElement> overflow_list_; 221 Member<MediaControlOverflowMenuListElement> overflow_list_;
220 222
221 Member<MediaControlCastButtonElement> cast_button_; 223 Member<MediaControlCastButtonElement> cast_button_;
222 Member<MediaControlFullscreenButtonElement> fullscreen_button_; 224 Member<MediaControlFullscreenButtonElement> fullscreen_button_;
(...skipping 16 matching lines...) Expand all
239 IntSize size_; 241 IntSize size_;
240 242
241 bool keep_showing_until_timer_fires_ : 1; 243 bool keep_showing_until_timer_fires_ : 1;
242 }; 244 };
243 245
244 DEFINE_ELEMENT_TYPE_CASTS(MediaControlsImpl, IsMediaControls()); 246 DEFINE_ELEMENT_TYPE_CASTS(MediaControlsImpl, IsMediaControls());
245 247
246 } // namespace blink 248 } // namespace blink
247 249
248 #endif 250 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698