Source/core/html/shadow/MediaControlElementTypes.h - Issue 291163004: Implement media cast buttons

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

Issue 291163004: Implement media cast buttons (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase to fix merge problem with TestExpectations Created 6 years, 3 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

OLD	NEW
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 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 MediaControlsPanel,	56 MediaControlsPanel,

57 MediaVolumeSliderContainer,	57 MediaVolumeSliderContainer,

58 MediaVolumeSlider,	58 MediaVolumeSlider,

59 MediaVolumeSliderThumb,	59 MediaVolumeSliderThumb,

60 MediaFullScreenVolumeSlider,	60 MediaFullScreenVolumeSlider,

61 MediaFullScreenVolumeSliderThumb,	61 MediaFullScreenVolumeSliderThumb,

62 MediaTextTrackDisplayContainer,	62 MediaTextTrackDisplayContainer,

63 MediaTextTrackDisplay,	63 MediaTextTrackDisplay,

64 MediaExitFullscreenButton,	64 MediaExitFullscreenButton,

65 MediaOverlayPlayButton,	65 MediaOverlayPlayButton,

	66 MediaCastOffButton,

	67 MediaCastOnButton,

	68 MediaOverlayCastOffButton,

	69 MediaOverlayCastOnButton,

	70
	Peter Beverloo 2014/09/15 12:59:38 micro nit: excess blank line. micro nit: excess blank line. aberent 2014/09/16 09:44:18 Done. Show quoted text On 2014/09/15 12:59:38, Peter Beverloo wrote: > micro nit: excess blank line. Done.
66 };	71 };

67	72

68 HTMLMediaElement* toParentMediaElement(Node*);	73 HTMLMediaElement* toParentMediaElement(Node*);

69 inline HTMLMediaElement* toParentMediaElement(RenderObject* renderer) { return t oParentMediaElement(renderer->node()); }	74 inline HTMLMediaElement* toParentMediaElement(RenderObject* renderer) { return t oParentMediaElement(renderer->node()); }

70	75

71 MediaControlElementType mediaControlElementType(Node*);	76 MediaControlElementType mediaControlElementType(Node*);

72	77

73 // ----------------------------	78 // ----------------------------

74	79

75 class MediaControlElement : public WillBeGarbageCollectedMixin {	80 class MediaControlElement : public WillBeGarbageCollectedMixin {

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133 protected:	138 protected:

134 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType);	139 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType);

135	140

136 private:	141 private:

137 double m_currentValue;	142 double m_currentValue;

138 };	143 };

139	144

140 } // namespace blink	145 } // namespace blink

141	146

142 #endif // MediaControlElementTypes_h	147 #endif // MediaControlElementTypes_h

OLD	NEW

« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControlElements.h » ('j') | Source/core/html/shadow/MediaControlElements.h » ('J')