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

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

Issue 157403002: Merge MediaControlsChromium into MediaControls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MediaControlsChromiumAndroid_h 26 #ifndef MediaControlsChromiumAndroid_h
27 #define MediaControlsChromiumAndroid_h 27 #define MediaControlsChromiumAndroid_h
28 28
29 #include "core/html/shadow/MediaControls.h" 29 #include "core/html/shadow/MediaControls.h"
30 #include "core/html/shadow/MediaControlsChromium.h"
31 30
32 namespace WebCore { 31 namespace WebCore {
33 32
34 class MediaControlsChromiumAndroid FINAL : public MediaControlsChromium { 33 class MediaControlsChromiumAndroid FINAL : public MediaControls {
35 public: 34 public:
36 static PassRefPtr<MediaControlsChromiumAndroid> createControls(Document&);
37
38 virtual void setMediaController(MediaControllerInterface*) OVERRIDE; 35 virtual void setMediaController(MediaControllerInterface*) OVERRIDE;
39 virtual void playbackStarted() OVERRIDE; 36 virtual void playbackStarted() OVERRIDE;
40 virtual void playbackStopped() OVERRIDE; 37 virtual void playbackStopped() OVERRIDE;
41 virtual bool shouldHideControls() OVERRIDE { return true; } 38 virtual bool shouldHideControls() OVERRIDE { return true; }
42 39
43 virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContai nerElement>) OVERRIDE; 40 virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContai nerElement>) OVERRIDE;
44 41
45 private: 42 private:
46 explicit MediaControlsChromiumAndroid(Document&); 43 explicit MediaControlsChromiumAndroid(Document&);
47 44
48 MediaControlOverlayPlayButtonElement* m_overlayPlayButton; 45 MediaControlOverlayPlayButtonElement* m_overlayPlayButton;
49 MediaControlOverlayEnclosureElement* m_overlayEnclosure; 46 MediaControlOverlayEnclosureElement* m_overlayEnclosure;
50 }; 47 };
51 48
52 } 49 }
53 50
54 #endif 51 #endif
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlsChromium.cpp ('k') | Source/core/html/shadow/MediaControlsChromiumAndroid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698