| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 void SuspendAllMediaPlayers(); | 55 void SuspendAllMediaPlayers(); |
| 56 | 56 |
| 57 // Initiates a synchronous MediaSession request for browser side players. | 57 // Initiates a synchronous MediaSession request for browser side players. |
| 58 // | 58 // |
| 59 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and | 59 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and |
| 60 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 | 60 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 |
| 61 bool RequestPlay(RenderFrameHost* render_frame_host, | 61 bool RequestPlay(RenderFrameHost* render_frame_host, |
| 62 int delegate_id, | 62 int delegate_id, |
| 63 bool has_audio, | 63 bool has_audio, |
| 64 bool is_remote, | 64 bool is_remote, |
| 65 base::TimeDelta duration); | 65 media::MediaContentType media_content_type); |
| 66 | 66 |
| 67 void DisconnectMediaSession(RenderFrameHost* render_frame_host, | 67 void DisconnectMediaSession(RenderFrameHost* render_frame_host, |
| 68 int delegate_id); | 68 int delegate_id); |
| 69 | 69 |
| 70 #if defined(VIDEO_HOLE) | 70 #if defined(VIDEO_HOLE) |
| 71 void OnFrameInfoUpdated(); | 71 void OnFrameInfoUpdated(); |
| 72 #endif // defined(VIDEO_HOLE) | 72 #endif // defined(VIDEO_HOLE) |
| 73 | 73 |
| 74 // MediaWebContentsObserver overrides. | 74 // MediaWebContentsObserver overrides. |
| 75 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; | 75 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 base::ScopedPtrHashMap<RenderFrameHost*, | 109 base::ScopedPtrHashMap<RenderFrameHost*, |
| 110 std::unique_ptr<BrowserSurfaceViewManager>>; | 110 std::unique_ptr<BrowserSurfaceViewManager>>; |
| 111 SurfaceViewManagerMap surface_view_managers_; | 111 SurfaceViewManagerMap surface_view_managers_; |
| 112 | 112 |
| 113 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); | 113 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 } // namespace content | 116 } // namespace content |
| 117 | 117 |
| 118 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 118 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| OLD | NEW |