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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 | 78 |
79 private: | 79 private: |
80 // Helper functions to handle media player IPC messages. Returns whether the | 80 // Helper functions to handle media player IPC messages. Returns whether the |
81 // |message| is handled in the function. | 81 // |message| is handled in the function. |
82 bool OnMediaPlayerMessageReceived(const IPC::Message& message, | 82 bool OnMediaPlayerMessageReceived(const IPC::Message& message, |
83 RenderFrameHost* render_frame_host); | 83 RenderFrameHost* render_frame_host); |
84 | 84 |
85 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, | 85 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, |
86 RenderFrameHost* render_frame_host); | 86 RenderFrameHost* render_frame_host); |
87 | 87 |
88 bool OnMediaSessionMessageReceived(const IPC::Message& message, | |
89 RenderFrameHost* render_frame_host); | |
90 | |
91 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message, | 88 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message, |
92 RenderFrameHost* render_frame_host); | 89 RenderFrameHost* render_frame_host); |
93 | 90 |
94 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); | 91 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); |
95 | 92 |
96 // Map from RenderFrameHost* to BrowserMediaPlayerManager. | 93 // Map from RenderFrameHost* to BrowserMediaPlayerManager. |
97 using MediaPlayerManagerMap = | 94 using MediaPlayerManagerMap = |
98 base::ScopedPtrHashMap<RenderFrameHost*, | 95 base::ScopedPtrHashMap<RenderFrameHost*, |
99 std::unique_ptr<BrowserMediaPlayerManager>>; | 96 std::unique_ptr<BrowserMediaPlayerManager>>; |
100 MediaPlayerManagerMap media_player_managers_; | 97 MediaPlayerManagerMap media_player_managers_; |
101 | 98 |
102 // Map from RenderFrameHost* to BrowserMediaSessionManager. | |
103 using MediaSessionManagerMap = | 99 using MediaSessionManagerMap = |
104 base::ScopedPtrHashMap<RenderFrameHost*, | 100 base::ScopedPtrHashMap<RenderFrameHost*, |
mlamouri (slow - plz ping)
2016/09/29 10:26:40
Why are you removing the comment but not the rest?
Zhiqiang Zhang (Slow)
2016/09/30 19:56:15
Undone this change.
| |
105 std::unique_ptr<BrowserMediaSessionManager>>; | 101 std::unique_ptr<BrowserMediaSessionManager>>; |
106 MediaSessionManagerMap media_session_managers_; | 102 MediaSessionManagerMap media_session_managers_; |
107 | 103 |
108 using SurfaceViewManagerMap = | 104 using SurfaceViewManagerMap = |
109 base::ScopedPtrHashMap<RenderFrameHost*, | 105 base::ScopedPtrHashMap<RenderFrameHost*, |
110 std::unique_ptr<BrowserSurfaceViewManager>>; | 106 std::unique_ptr<BrowserSurfaceViewManager>>; |
111 SurfaceViewManagerMap surface_view_managers_; | 107 SurfaceViewManagerMap surface_view_managers_; |
112 | 108 |
113 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); | 109 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); |
114 }; | 110 }; |
115 | 111 |
116 } // namespace content | 112 } // namespace content |
117 | 113 |
118 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 114 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
OLD | NEW |