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

Side by Side Diff: content/renderer/media/android/renderer_media_player_manager.h

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 const std::string& web_session_id); 168 const std::string& web_session_id);
169 void OnSessionMessage(int cdm_id, 169 void OnSessionMessage(int cdm_id,
170 uint32 session_id, 170 uint32 session_id,
171 const std::vector<uint8>& message, 171 const std::vector<uint8>& message,
172 const GURL& destination_url); 172 const GURL& destination_url);
173 void OnSessionReady(int cdm_id, uint32 session_id); 173 void OnSessionReady(int cdm_id, uint32 session_id);
174 void OnSessionClosed(int cdm_id, uint32 session_id); 174 void OnSessionClosed(int cdm_id, uint32 session_id);
175 void OnSessionError(int cdm_id, 175 void OnSessionError(int cdm_id,
176 uint32 session_id, 176 uint32 session_id,
177 media::MediaKeys::KeyError error_code, 177 media::MediaKeys::KeyError error_code,
178 int system_code); 178 uint32 system_code);
179 179
180 // Info for all available WebMediaPlayerAndroid on a page; kept so that 180 // Info for all available WebMediaPlayerAndroid on a page; kept so that
181 // we can enumerate them to send updates about tab focus and visibility. 181 // we can enumerate them to send updates about tab focus and visibility.
182 std::map<int, WebMediaPlayerAndroid*> media_players_; 182 std::map<int, WebMediaPlayerAndroid*> media_players_;
183 183
184 // Info for all available ProxyMediaKeys. There must be at most one 184 // Info for all available ProxyMediaKeys. There must be at most one
185 // ProxyMediaKeys for each available WebMediaPlayerAndroid. 185 // ProxyMediaKeys for each available WebMediaPlayerAndroid.
186 std::map<int, ProxyMediaKeys*> media_keys_; 186 std::map<int, ProxyMediaKeys*> media_keys_;
187 187
188 int next_media_player_id_; 188 int next_media_player_id_;
189 189
190 // WebFrame of the fullscreen video. 190 // WebFrame of the fullscreen video.
191 blink::WebFrame* fullscreen_frame_; 191 blink::WebFrame* fullscreen_frame_;
192 192
193 // WebFrame of pending fullscreen request. 193 // WebFrame of pending fullscreen request.
194 blink::WebFrame* pending_fullscreen_frame_; 194 blink::WebFrame* pending_fullscreen_frame_;
195 195
196 DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager); 196 DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
197 }; 197 };
198 198
199 } // namespace content 199 } // namespace content
200 200
201 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_ 201 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698