| 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 "base/containers/scoped_ptr_hash_map.h" | 10 #include "base/containers/scoped_ptr_hash_map.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 // Initiates a synchronous MediaSession request for browser side players. | 51 // Initiates a synchronous MediaSession request for browser side players. |
| 52 // | 52 // |
| 53 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and | 53 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and |
| 54 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 | 54 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 |
| 55 bool RequestPlay(RenderFrameHost* render_frame_host, | 55 bool RequestPlay(RenderFrameHost* render_frame_host, |
| 56 int delegate_id, | 56 int delegate_id, |
| 57 bool has_audio, | 57 bool has_audio, |
| 58 bool is_remote, | 58 bool is_remote, |
| 59 base::TimeDelta duration); | 59 base::TimeDelta duration); |
| 60 | 60 |
| 61 void DisconnectMediaSession(RenderFrameHost* render_frame_host, |
| 62 int delegate_id); |
| 63 |
| 61 #if defined(VIDEO_HOLE) | 64 #if defined(VIDEO_HOLE) |
| 62 void OnFrameInfoUpdated(); | 65 void OnFrameInfoUpdated(); |
| 63 #endif // defined(VIDEO_HOLE) | 66 #endif // defined(VIDEO_HOLE) |
| 64 | 67 |
| 65 // MediaWebContentsObserver overrides. | 68 // MediaWebContentsObserver overrides. |
| 66 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; | 69 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; |
| 67 bool OnMessageReceived(const IPC::Message& message, | 70 bool OnMessageReceived(const IPC::Message& message, |
| 68 RenderFrameHost* render_frame_host) override; | 71 RenderFrameHost* render_frame_host) override; |
| 69 | 72 |
| 70 private: | 73 private: |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 base::ScopedPtrHashMap<RenderFrameHost*, | 123 base::ScopedPtrHashMap<RenderFrameHost*, |
| 121 scoped_ptr<BrowserSurfaceViewManager>>; | 124 scoped_ptr<BrowserSurfaceViewManager>>; |
| 122 SurfaceViewManagerMap surface_view_managers_; | 125 SurfaceViewManagerMap surface_view_managers_; |
| 123 | 126 |
| 124 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); | 127 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); |
| 125 }; | 128 }; |
| 126 | 129 |
| 127 } // namespace content | 130 } // namespace content |
| 128 | 131 |
| 129 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 132 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| OLD | NEW |